diff --git a/.gitignore b/.gitignore index ca2b43dd..be917aa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,12 @@ -# everything -/* - -.gradle # IntelliJ -/build -/run -/out -.idea +.idea/ *.iml *.ipr *.iws -classes/ - # folders -!/gradle/wrapper -!/src - -# files -!/.gitignore -!/LICENSE.txt -!/license-header.txt -!/README.md -!/gradle.properties -!/build.gradle -!/gradlew -!/gradlew.bat +.gradle/ +classes/ +build/ +run/ +out/ diff --git a/all/build.gradle b/all/build.gradle new file mode 100644 index 00000000..8bd824da --- /dev/null +++ b/all/build.gradle @@ -0,0 +1,10 @@ +archivesBaseName = 'all-' + mcversion + +dependencies { + compile project(":api") + compile project(":botany") + compile project(":core") + compile project(":extrabees") + compile project(":extratrees") + compile project(":genetics") +} diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..9dac3e85 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1 @@ +archivesBaseName = 'api-' + mcversion diff --git a/src/main/java/binnie/botany/api/BotanyAPI.java b/api/src/main/java/binnie/botany/api/BotanyAPI.java similarity index 100% rename from src/main/java/binnie/botany/api/BotanyAPI.java rename to api/src/main/java/binnie/botany/api/BotanyAPI.java diff --git a/src/main/java/binnie/botany/api/gardening/EnumAcidity.java b/api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java similarity index 87% rename from src/main/java/binnie/botany/api/gardening/EnumAcidity.java rename to api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java index 4d1a1f0b..50343997 100644 --- a/src/main/java/binnie/botany/api/gardening/EnumAcidity.java +++ b/api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java @@ -4,8 +4,7 @@ import javax.annotation.Nullable; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; - -import binnie.core.util.I18N; +import net.minecraft.util.text.translation.I18n; public enum EnumAcidity implements IStringSerializable { ACID(TextFormatting.RED), @@ -25,7 +24,7 @@ public enum EnumAcidity implements IStringSerializable { } public String getLocalisedName(boolean withColor) { - String localisedName = I18N.localise("botany.ph." + getName()); + String localisedName = I18n.translateToLocal("botany.ph." + getName()); if (withColor && color != null) { localisedName = color + localisedName; } diff --git a/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java b/api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java similarity index 100% rename from src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java rename to api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java diff --git a/src/main/java/binnie/botany/api/gardening/EnumMoisture.java b/api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java similarity index 87% rename from src/main/java/binnie/botany/api/gardening/EnumMoisture.java rename to api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java index 5973912b..aa8f154a 100644 --- a/src/main/java/binnie/botany/api/gardening/EnumMoisture.java +++ b/api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import binnie.core.util.I18N; +import net.minecraft.util.text.translation.I18n; public enum EnumMoisture implements IStringSerializable { DRY(TextFormatting.YELLOW), @@ -25,7 +25,7 @@ public enum EnumMoisture implements IStringSerializable { } public String getLocalisedName(boolean withColor) { - String localisedName = I18N.localise("botany.moisture." + getName()); + String localisedName = I18n.translateToLocal("botany.moisture." + getName()); if (withColor && color != null) { localisedName = color + localisedName + TextFormatting.GRAY; } diff --git a/src/main/java/binnie/botany/api/gardening/EnumSoilType.java b/api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java similarity index 82% rename from src/main/java/binnie/botany/api/gardening/EnumSoilType.java rename to api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java index 974832a8..6ce49e1f 100644 --- a/src/main/java/binnie/botany/api/gardening/EnumSoilType.java +++ b/api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java @@ -5,7 +5,7 @@ import java.util.Locale; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import binnie.core.util.I18N; +import net.minecraft.util.text.translation.I18n; public enum EnumSoilType implements IStringSerializable { SOIL(TextFormatting.DARK_GRAY), @@ -24,6 +24,6 @@ public enum EnumSoilType implements IStringSerializable { } public String getTranslated() { - return color + I18N.localise("botany.soil." + getName()); + return color + I18n.translateToLocal("botany.soil." + getName()); } } diff --git a/src/main/java/binnie/botany/api/gardening/IBlockSoil.java b/api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java similarity index 100% rename from src/main/java/binnie/botany/api/gardening/IBlockSoil.java rename to api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java diff --git a/src/main/java/binnie/botany/api/gardening/IGardeningManager.java b/api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java similarity index 100% rename from src/main/java/binnie/botany/api/gardening/IGardeningManager.java rename to api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java diff --git a/src/main/java/binnie/botany/api/gardening/package-info.java b/api/src/main/java/binnie/botany/api/gardening/package-info.java similarity index 100% rename from src/main/java/binnie/botany/api/gardening/package-info.java rename to api/src/main/java/binnie/botany/api/gardening/package-info.java diff --git a/src/main/java/binnie/botany/genetics/allele/AlleleFlowerColor.java b/api/src/main/java/binnie/botany/api/genetics/AlleleFlowerColor.java similarity index 82% rename from src/main/java/binnie/botany/genetics/allele/AlleleFlowerColor.java rename to api/src/main/java/binnie/botany/api/genetics/AlleleFlowerColor.java index f51b865a..06ef40c6 100644 --- a/src/main/java/binnie/botany/genetics/allele/AlleleFlowerColor.java +++ b/api/src/main/java/binnie/botany/api/genetics/AlleleFlowerColor.java @@ -1,11 +1,10 @@ -package binnie.botany.genetics.allele; +package binnie.botany.api.genetics; import forestry.api.genetics.IAlleleInteger; +import net.minecraft.util.text.translation.I18n; -import binnie.botany.api.genetics.IFlowerColor; -import binnie.core.util.I18N; - -public class AlleleFlowerColor implements IFlowerColor, IAlleleInteger { +// TODO: move out of API +public class AlleleFlowerColor implements IAlleleFlowerColor { private int color; private String uid; private boolean isDominant; @@ -71,6 +70,6 @@ public class AlleleFlowerColor implements IFlowerColor, IAlleleInteger { @Override public String getColorName() { - return I18N.localise("botany.color." + getAlleleName()); + return I18n.translateToLocal("botany.color." + getAlleleName()); } } \ No newline at end of file diff --git a/src/main/java/binnie/botany/genetics/ColorMix.java b/api/src/main/java/binnie/botany/api/genetics/ColorMix.java similarity index 74% rename from src/main/java/binnie/botany/genetics/ColorMix.java rename to api/src/main/java/binnie/botany/api/genetics/ColorMix.java index 2fe79c38..49f5db1e 100644 --- a/src/main/java/binnie/botany/genetics/ColorMix.java +++ b/api/src/main/java/binnie/botany/api/genetics/ColorMix.java @@ -1,13 +1,10 @@ -package binnie.botany.genetics; +package binnie.botany.api.genetics; -import binnie.botany.api.genetics.IColorMix; -import binnie.botany.api.genetics.IFlowerColor; - -public class ColorMix implements IColorMix { - IFlowerColor colorFirst; - IFlowerColor colorSecond; - IFlowerColor result; - int chance; +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; diff --git a/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java b/api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java rename to api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java diff --git a/api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java b/api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java new file mode 100644 index 00000000..77e8c7f3 --- /dev/null +++ b/api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java @@ -0,0 +1,2959 @@ +package binnie.botany.api.genetics; + +import binnie.botany.api.BotanyAPI; +import net.minecraft.util.IStringSerializable; + +import forestry.api.genetics.AlleleManager; + +import net.minecraft.util.text.translation.I18n; + +//TODO: Clean Up, move out of API +public enum EnumFlowerColor implements IStringSerializable { + Aquamarine("aquamarine", 8388564), + Black("black", 2631720), + Blue("blue", 255), + Brown("brown", 10824234), + CadetBlue("cadetBlue", 6266528), + Chocolate("chocolate", 13789470), + Coral("coral", 16744272), + Crimson("crimson", 14423100), + Cyan("cyan", 65535), + DarkGoldenrod("darkGoldenrod", 12092939), + DarkGray("darkGray", 11119017), + DarkGreen("darkGreen", 25600), + DarkKhaki("darkKhaki", 12433259), + DarkOliveGreen("darkOliveGreen", 5597999), + DarkOrange("darkOrange", 16747520), + DarkSalmon("darkSalmon", 15308410), + DarkSeaGreen("darkSeaGreen", 9419915), + DarkSlateBlue("darkSlateBlue", 4734347), + DarkSlateGray("darkSlateGray", 3100495), + DarkTurquoise("darkTurquoise", 52945), + DarkViolet("darkViolet", 9699539), + DeepPink("deepPink", 16716947), + DeepSkyBlue("deepSkyBlue", 49151), + DimGray("dimGray", 6908265), + DodgerBlue("dodgerBlue", 2003199), + Gold("gold", 16766720), + Goldenrod("goldenrod", 14329120), + Gray("gray", 8421504), + Green("green", 32768), + HotPink("hotPink", 16738740), + IndianRed("indianRed", 13458524), + Indigo("indigo", 4915330), + Khaki("khaki", 15787660), + Lavender("lavender", 15132410), + LemonChiffon("lemonChiffon", 16775885), + LightGray("lightGray", 13882323), + LightSeaGreen("lightSeaGreen", 2142890), + LightSteelBlue("lightSteelBlue", 11584734), + Lime("lime", 65280), + LimeGreen("limeGreen", 3329330), + Magenta("magenta", 16711935), + Maroon("maroon", 8388608), + MediumAquamarine("mediumAquamarine", 6737322), + MediumOrchid("mediumOrchid", 12211667), + MediumPurple("mediumPurple", 9662683), + MediumSeaGreen("mediumSeaGreen", 3978097), + MediumVioletRed("mediumVioletRed", 13047173), + MistyRose("mistyRose", 16770273), + Navy("navy", 128), + Olive("olive", 8421376), + OliveDrab("oliveDrab", 7048739), + Orange("orange", 16753920), + PaleGreen("paleGreen", 10025880), + PaleTurquoise("paleTurquoise", 11529966), + PaleVioletRed("paleVioletRed", 14381203), + Peru("peru", 13468991), + Pink("pink", 16761035), + Plum("plum", 14524637), + Purple("purple", 8388736), + Red("red", 16711680), + RosyBrown("rosyBrown", 12357519), + RoyalBlue("royalBlue", 4286945), + Salmon("salmon", 16416882), + SandyBrown("sandyBrown", 16032864), + SeaGreen("seaGreen", 3050327), + Sienna("sienna", 10506797), + SkyBlue("skyBlue", 8900331), + SlateBlue("slateBlue", 6970061), + SlateGray("slateGray", 7372944), + SpringGreen("springGreen", 65407), + SteelBlue("steelBlue", 4620980), + Tan("tan", 13808780), + Teal("teal", 32896), + Thistle("thistle", 14204888), + Turquoise("turquoise", 4251856), + Violet("violet", 15631086), + Wheat("wheat", 16113331), + White("white", 16777215), + Yellow("yellow", 16776960), + YellowGreen("yellowGreen", 10145074); + + public static final EnumFlowerColor[] VALUES = values(); + + private final String ident; + private IAlleleFlowerColor allele; + + EnumFlowerColor(String ident, int color) { + this.ident = ident; + int r = color >> 16 & 0xFF; + int g = color >> 8 & 0xFF; + int b = color & 0xFF; + r = (int) (0.45 * (r + 214)); + g = (int) (0.45 * (g + 174)); + b = (int) (0.45 * (b + 131)); + int colorDis = (r << 16) + (g << 8) + b; + String uid = "botany.color" + name(); + allele = new AlleleFlowerColor(uid, ordinal(), color, colorDis, name().toLowerCase(), uid, true); + } + + public String getIdent() { + return ident; + } + + public static void addMix(EnumFlowerColor start1, EnumFlowerColor start2, EnumFlowerColor result, int chance) { + BotanyAPI.flowerRoot.registerColourMix(new ColorMix(start1.allele, start2.allele, result.allele, chance)); + } + + public static void setupMutations() { + addMix(Blue, Aquamarine, SteelBlue, 55); + addMix(Blue, Black, Navy, 85); + addMix(Brown, Aquamarine, Gray, 50); + addMix(Brown, Black, Maroon, 90); + addMix(Brown, Blue, Indigo, 85); + addMix(CadetBlue, Aquamarine, MediumAquamarine, 100); + addMix(CadetBlue, Black, DarkSlateGray, 75); + addMix(CadetBlue, Blue, SlateBlue, 85); + addMix(Chocolate, Aquamarine, DarkKhaki, 65); + addMix(Chocolate, Blue, DarkSlateBlue, 65); + addMix(Chocolate, Brown, Sienna, 100); + addMix(Coral, Aquamarine, DarkKhaki, 65); + addMix(Coral, Black, Sienna, 65); + addMix(Coral, Blue, DarkViolet, 65); + addMix(Coral, Brown, IndianRed, 95); + addMix(Coral, CadetBlue, RosyBrown, 80); + addMix(Coral, Chocolate, Peru, 115); + addMix(Crimson, Aquamarine, RosyBrown, 45); + addMix(Crimson, Black, Maroon, 80); + addMix(Crimson, Blue, Indigo, 85); + addMix(Crimson, Brown, IndianRed, 115); + addMix(Crimson, Chocolate, Red, 100); + addMix(Crimson, Coral, IndianRed, 105); + addMix(Cyan, Aquamarine, Turquoise, 115); + addMix(Cyan, Blue, DodgerBlue, 60); + addMix(Cyan, Brown, CadetBlue, 50); + addMix(Cyan, CadetBlue, DarkTurquoise, 100); + addMix(Cyan, Chocolate, MediumAquamarine, 65); + addMix(Cyan, Coral, MediumAquamarine, 65); + addMix(Cyan, Crimson, SlateGray, 50); + addMix(DarkGoldenrod, Aquamarine, DarkSeaGreen, 80); + addMix(DarkGoldenrod, Blue, DarkSlateBlue, 55); + addMix(DarkGoldenrod, Brown, Sienna, 85); + addMix(DarkGoldenrod, CadetBlue, OliveDrab, 90); + addMix(DarkGoldenrod, Chocolate, Peru, 110); + addMix(DarkGoldenrod, Coral, Peru, 100); + addMix(DarkGoldenrod, Crimson, Sienna, 85); + addMix(DarkGoldenrod, Cyan, MediumSeaGreen, 75); + addMix(DarkGray, Aquamarine, MediumAquamarine, 95); + addMix(DarkGray, Black, DimGray, 70); + addMix(DarkGray, Blue, SlateBlue, 75); + addMix(DarkGray, Brown, IndianRed, 85); + addMix(DarkGray, Chocolate, Peru, 95); + addMix(DarkGray, Coral, DarkSalmon, 100); + addMix(DarkGray, Crimson, IndianRed, 90); + addMix(DarkGray, Cyan, DarkTurquoise, 95); + addMix(DarkGray, DarkGoldenrod, DarkKhaki, 100); + addMix(DarkGreen, Aquamarine, MediumSeaGreen, 75); + addMix(DarkGreen, Blue, DarkSlateBlue, 65); + addMix(DarkGreen, CadetBlue, SeaGreen, 90); + addMix(DarkGreen, Chocolate, DarkOliveGreen, 70); + addMix(DarkGreen, Coral, Olive, 60); + addMix(DarkGreen, Crimson, Sienna, 55); + addMix(DarkGreen, Cyan, MediumSeaGreen, 70); + addMix(DarkGreen, DarkGoldenrod, DarkOliveGreen, 85); + addMix(DarkGreen, DarkGray, SeaGreen, 85); + addMix(DarkKhaki, Aquamarine, DarkSeaGreen, 100); + addMix(DarkKhaki, Black, DarkOliveGreen, 60); + addMix(DarkKhaki, Brown, Chocolate, 75); + addMix(DarkKhaki, CadetBlue, DarkSeaGreen, 95); + addMix(DarkKhaki, Chocolate, Peru, 95); + addMix(DarkKhaki, Coral, SandyBrown, 90); + addMix(DarkKhaki, Crimson, IndianRed, 75); + addMix(DarkKhaki, Cyan, MediumAquamarine, 90); + addMix(DarkKhaki, DarkGoldenrod, Goldenrod, 110); + addMix(DarkKhaki, DarkGray, Tan, 105); + addMix(DarkKhaki, DarkGreen, OliveDrab, 85); + addMix(DarkOliveGreen, Aquamarine, MediumSeaGreen, 80); + addMix(DarkOliveGreen, Blue, DarkSlateBlue, 50); + addMix(DarkOliveGreen, Brown, Sienna, 80); + addMix(DarkOliveGreen, CadetBlue, SeaGreen, 95); + addMix(DarkOliveGreen, Chocolate, DarkGoldenrod, 85); + addMix(DarkOliveGreen, Coral, Peru, 75); + addMix(DarkOliveGreen, Crimson, Brown, 70); + addMix(DarkOliveGreen, Cyan, LightSeaGreen, 75); + addMix(DarkOliveGreen, DarkGoldenrod, Olive, 100); + addMix(DarkOliveGreen, DarkGreen, Green, 115); + addMix(DarkOliveGreen, DarkKhaki, OliveDrab, 95); + addMix(DarkOrange, Aquamarine, DarkKhaki, 70); + addMix(DarkOrange, Black, Sienna, 60); + addMix(DarkOrange, Blue, Violet, 55); + addMix(DarkOrange, Brown, Chocolate, 85); + addMix(DarkOrange, CadetBlue, DarkGoldenrod, 80); + addMix(DarkOrange, Chocolate, Peru, 115); + addMix(DarkOrange, Coral, SandyBrown, 115); + addMix(DarkOrange, Crimson, Red, 90); + addMix(DarkOrange, Cyan, DarkSeaGreen, 70); + addMix(DarkOrange, DarkGoldenrod, Peru, 110); + addMix(DarkOrange, DarkGray, Peru, 95); + addMix(DarkOrange, DarkGreen, Olive, 70); + addMix(DarkOrange, DarkKhaki, Goldenrod, 100); + addMix(DarkOrange, DarkOliveGreen, DarkGoldenrod, 80); + addMix(DarkSalmon, Aquamarine, DarkSeaGreen, 75); + addMix(DarkSalmon, Black, Sienna, 65); + addMix(DarkSalmon, Blue, SlateBlue, 70); + addMix(DarkSalmon, Brown, IndianRed, 95); + addMix(DarkSalmon, CadetBlue, DarkGray, 85); + addMix(DarkSalmon, Chocolate, Coral, 110); + addMix(DarkSalmon, Coral, Salmon, 120); + addMix(DarkSalmon, Crimson, IndianRed, 100); + addMix(DarkSalmon, Cyan, MediumAquamarine, 75); + addMix(DarkSalmon, DarkGoldenrod, Peru, 100); + addMix(DarkSalmon, DarkGray, RosyBrown, 105); + addMix(DarkSalmon, DarkGreen, Olive, 65); + addMix(DarkSalmon, DarkKhaki, Tan, 95); + addMix(DarkSalmon, DarkOliveGreen, Peru, 80); + addMix(DarkSalmon, DarkOrange, SandyBrown, 110); + addMix(DarkSeaGreen, Aquamarine, MediumAquamarine, 110); + addMix(DarkSeaGreen, Black, DarkOliveGreen, 60); + addMix(DarkSeaGreen, Blue, RoyalBlue, 60); + addMix(DarkSeaGreen, Brown, Sienna, 65); + addMix(DarkSeaGreen, CadetBlue, MediumAquamarine, 105); + addMix(DarkSeaGreen, Chocolate, DarkGoldenrod, 80); + addMix(DarkSeaGreen, Coral, Tan, 80); + addMix(DarkSeaGreen, Crimson, IndianRed, 60); + addMix(DarkSeaGreen, Cyan, Turquoise, 100); + addMix(DarkSeaGreen, DarkGoldenrod, DarkKhaki, 95); + addMix(DarkSeaGreen, DarkGreen, SeaGreen, 90); + addMix(DarkSeaGreen, DarkKhaki, YellowGreen, 110); + addMix(DarkSeaGreen, DarkOliveGreen, OliveDrab, 100); + addMix(DarkSeaGreen, DarkOrange, Goldenrod, 85); + addMix(DarkSeaGreen, DarkSalmon, Tan, 85); + addMix(DarkSlateBlue, Aquamarine, CadetBlue, 60); + addMix(DarkSlateBlue, Blue, Indigo, 110); + addMix(DarkSlateBlue, Brown, Purple, 90); + addMix(DarkSlateBlue, CadetBlue, RoyalBlue, 85); + addMix(DarkSlateBlue, Chocolate, Brown, 75); + addMix(DarkSlateBlue, Coral, IndianRed, 70); + addMix(DarkSlateBlue, Crimson, MediumVioletRed, 90); + addMix(DarkSlateBlue, Cyan, DeepSkyBlue, 60); + addMix(DarkSlateBlue, DarkGoldenrod, Sienna, 65); + addMix(DarkSlateBlue, DarkGreen, DarkSlateGray, 75); + addMix(DarkSlateBlue, DarkKhaki, Gray, 55); + addMix(DarkSlateBlue, DarkOliveGreen, DimGray, 70); + addMix(DarkSlateBlue, DarkOrange, Sienna, 60); + addMix(DarkSlateBlue, DarkSeaGreen, SlateGray, 65); + addMix(DarkSlateGray, Aquamarine, LightSeaGreen, 70); + addMix(DarkSlateGray, Blue, Navy, 95); + addMix(DarkSlateGray, CadetBlue, Teal, 95); + addMix(DarkSlateGray, Chocolate, Sienna, 80); + addMix(DarkSlateGray, Coral, Sienna, 75); + addMix(DarkSlateGray, Crimson, Brown, 80); + addMix(DarkSlateGray, Cyan, LightSeaGreen, 70); + addMix(DarkSlateGray, DarkGoldenrod, DarkOliveGreen, 85); + addMix(DarkSlateGray, DarkGray, Gray, 85); + addMix(DarkSlateGray, DarkGreen, DarkOliveGreen, 100); + addMix(DarkSlateGray, DarkKhaki, DarkOliveGreen, 75); + addMix(DarkSlateGray, DarkOrange, DarkGoldenrod, 70); + addMix(DarkSlateGray, DarkSalmon, Gray, 75); + addMix(DarkSlateGray, DarkSeaGreen, SeaGreen, 80); + addMix(DarkTurquoise, Aquamarine, Turquoise, 110); + addMix(DarkTurquoise, Black, Teal, 55); + addMix(DarkTurquoise, Blue, RoyalBlue, 65); + addMix(DarkTurquoise, Brown, Teal, 60); + addMix(DarkTurquoise, CadetBlue, LightSeaGreen, 115); + addMix(DarkTurquoise, Chocolate, SeaGreen, 70); + addMix(DarkTurquoise, Coral, DarkSeaGreen, 70); + addMix(DarkTurquoise, Crimson, SlateGray, 55); + addMix(DarkTurquoise, Cyan, Turquoise, 115); + addMix(DarkTurquoise, DarkGoldenrod, MediumSeaGreen, 80); + addMix(DarkTurquoise, DarkGray, LightSeaGreen, 100); + addMix(DarkTurquoise, DarkGreen, SeaGreen, 80); + addMix(DarkTurquoise, DarkKhaki, MediumAquamarine, 95); + addMix(DarkTurquoise, DarkOliveGreen, SeaGreen, 85); + addMix(DarkTurquoise, DarkOrange, DarkSeaGreen, 75); + addMix(DarkTurquoise, DarkSalmon, LightSeaGreen, 80); + addMix(DarkTurquoise, DarkSeaGreen, MediumAquamarine, 105); + addMix(DarkTurquoise, DarkSlateBlue, SteelBlue, 70); + addMix(DarkTurquoise, DarkSlateGray, Teal, 80); + addMix(DarkViolet, Aquamarine, MediumPurple, 60); + addMix(DarkViolet, Black, Indigo, 85); + addMix(DarkViolet, Brown, Purple, 90); + addMix(DarkViolet, CadetBlue, SlateBlue, 90); + addMix(DarkViolet, Chocolate, MediumVioletRed, 70); + addMix(DarkViolet, Coral, MediumVioletRed, 75); + addMix(DarkViolet, Crimson, MediumVioletRed, 90); + addMix(DarkViolet, Cyan, SteelBlue, 60); + addMix(DarkViolet, DarkGoldenrod, MediumVioletRed, 55); + addMix(DarkViolet, DarkGray, MediumOrchid, 85); + addMix(DarkViolet, DarkKhaki, MediumOrchid, 50); + addMix(DarkViolet, DarkOliveGreen, Purple, 55); + addMix(DarkViolet, DarkOrange, IndianRed, 60); + addMix(DarkViolet, DarkSalmon, MediumOrchid, 75); + addMix(DarkViolet, DarkSeaGreen, MediumOrchid, 70); + addMix(DarkViolet, DarkSlateBlue, Indigo, 110); + addMix(DarkViolet, DarkSlateGray, Indigo, 100); + addMix(DarkViolet, DarkTurquoise, RoyalBlue, 70); + addMix(DeepPink, Blue, DarkViolet, 90); + addMix(DeepPink, Brown, Crimson, 100); + addMix(DeepPink, CadetBlue, MediumVioletRed, 80); + addMix(DeepPink, Chocolate, IndianRed, 85); + addMix(DeepPink, Coral, IndianRed, 95); + addMix(DeepPink, Crimson, IndianRed, 105); + addMix(DeepPink, Cyan, MediumPurple, 45); + addMix(DeepPink, DarkGoldenrod, IndianRed, 70); + addMix(DeepPink, DarkGray, PaleVioletRed, 95); + addMix(DeepPink, DarkKhaki, PaleVioletRed, 65); + addMix(DeepPink, DarkOliveGreen, MediumVioletRed, 60); + addMix(DeepPink, DarkOrange, Salmon, 80); + addMix(DeepPink, DarkSalmon, PaleVioletRed, 95); + addMix(DeepPink, DarkSeaGreen, PaleVioletRed, 55); + addMix(DeepPink, DarkSlateBlue, MediumVioletRed, 90); + addMix(DeepPink, DarkSlateGray, MediumVioletRed, 90); + addMix(DeepPink, DarkTurquoise, MediumPurple, 55); + addMix(DeepPink, DarkViolet, MediumVioletRed, 100); + addMix(DeepSkyBlue, Aquamarine, DarkTurquoise, 90); + addMix(DeepSkyBlue, Blue, RoyalBlue, 75); + addMix(DeepSkyBlue, Brown, SteelBlue, 60); + addMix(DeepSkyBlue, CadetBlue, SkyBlue, 105); + addMix(DeepSkyBlue, Chocolate, CadetBlue, 70); + addMix(DeepSkyBlue, Coral, CadetBlue, 70); + addMix(DeepSkyBlue, Crimson, SlateBlue, 60); + addMix(DeepSkyBlue, Cyan, SkyBlue, 105); + addMix(DeepSkyBlue, DarkGoldenrod, MediumSeaGreen, 70); + addMix(DeepSkyBlue, DarkGray, SkyBlue, 105); + addMix(DeepSkyBlue, DarkGreen, Teal, 65); + addMix(DeepSkyBlue, DarkKhaki, LightSeaGreen, 75); + addMix(DeepSkyBlue, DarkOliveGreen, CadetBlue, 70); + addMix(DeepSkyBlue, DarkOrange, DarkSeaGreen, 70); + addMix(DeepSkyBlue, DarkSalmon, CadetBlue, 80); + addMix(DeepSkyBlue, DarkSeaGreen, DarkTurquoise, 85); + addMix(DeepSkyBlue, DarkSlateBlue, SteelBlue, 75); + addMix(DeepSkyBlue, DarkSlateGray, SteelBlue, 80); + addMix(DeepSkyBlue, DarkTurquoise, SkyBlue, 110); + addMix(DeepSkyBlue, DarkViolet, RoyalBlue, 70); + addMix(DeepSkyBlue, DeepPink, MediumPurple, 55); + addMix(DimGray, Aquamarine, MediumAquamarine, 80); + addMix(DimGray, Blue, DarkSlateBlue, 90); + addMix(DimGray, CadetBlue, SlateGray, 100); + addMix(DimGray, Chocolate, Sienna, 95); + addMix(DimGray, Coral, IndianRed, 90); + addMix(DimGray, Crimson, Brown, 100); + addMix(DimGray, Cyan, LightSeaGreen, 80); + addMix(DimGray, DarkGoldenrod, Olive, 95); + addMix(DimGray, DarkGray, Gray, 105); + addMix(DimGray, DarkGreen, DarkOliveGreen, 100); + addMix(DimGray, DarkOrange, Peru, 90); + addMix(DimGray, DarkSalmon, RosyBrown, 95); + addMix(DimGray, DarkTurquoise, CadetBlue, 90); + addMix(DimGray, DarkViolet, Purple, 95); + addMix(DimGray, DeepPink, MediumVioletRed, 95); + addMix(DimGray, DeepSkyBlue, SteelBlue, 90); + addMix(DodgerBlue, Aquamarine, SkyBlue, 80); + addMix(DodgerBlue, Black, DarkSlateBlue, 75); + addMix(DodgerBlue, Blue, SlateBlue, 90); + addMix(DodgerBlue, Brown, SlateBlue, 75); + addMix(DodgerBlue, CadetBlue, SteelBlue, 100); + addMix(DodgerBlue, Chocolate, SlateGray, 75); + addMix(DodgerBlue, Crimson, SlateBlue, 75); + addMix(DodgerBlue, Cyan, DeepSkyBlue, 85); + addMix(DodgerBlue, DarkGoldenrod, CadetBlue, 70); + addMix(DodgerBlue, DarkGray, SteelBlue, 100); + addMix(DodgerBlue, DarkGreen, Teal, 65); + addMix(DodgerBlue, DarkKhaki, CadetBlue, 65); + addMix(DodgerBlue, DarkOliveGreen, SteelBlue, 70); + addMix(DodgerBlue, DarkOrange, Gray, 70); + addMix(DodgerBlue, DarkSalmon, SlateGray, 80); + addMix(DodgerBlue, DarkSeaGreen, DeepSkyBlue, 80); + addMix(DodgerBlue, DarkSlateBlue, RoyalBlue, 90); + addMix(DodgerBlue, DarkSlateGray, SteelBlue, 90); + addMix(DodgerBlue, DarkTurquoise, DeepSkyBlue, 95); + addMix(DodgerBlue, DarkViolet, SlateBlue, 90); + addMix(DodgerBlue, DeepPink, SlateBlue, 80); + addMix(DodgerBlue, DimGray, SteelBlue, 95); + addMix(Gold, Aquamarine, YellowGreen, 90); + addMix(Gold, Brown, Peru, 65); + addMix(Gold, CadetBlue, DarkKhaki, 85); + addMix(Gold, Chocolate, Orange, 90); + addMix(Gold, Coral, Orange, 90); + addMix(Gold, Crimson, Chocolate, 65); + addMix(Gold, Cyan, PaleGreen, 80); + addMix(Gold, DarkGoldenrod, Goldenrod, 105); + addMix(Gold, DarkGray, DarkKhaki, 95); + addMix(Gold, DarkGreen, OliveDrab, 75); + addMix(Gold, DarkKhaki, Khaki, 110); + addMix(Gold, DarkOliveGreen, DarkKhaki, 85); + addMix(Gold, DarkOrange, Orange, 100); + addMix(Gold, DarkSalmon, Goldenrod, 90); + addMix(Gold, DarkSeaGreen, DarkKhaki, 95); + addMix(Gold, DarkSlateGray, Olive, 65); + addMix(Gold, DarkTurquoise, LimeGreen, 80); + addMix(Gold, DeepPink, Coral, 55); + addMix(Gold, DeepSkyBlue, DarkSeaGreen, 65); + addMix(Gold, DimGray, DarkKhaki, 80); + addMix(Gold, DodgerBlue, DarkSeaGreen, 60); + addMix(Goldenrod, Aquamarine, YellowGreen, 85); + addMix(Goldenrod, Blue, DarkSlateBlue, 45); + addMix(Goldenrod, Brown, Chocolate, 80); + addMix(Goldenrod, CadetBlue, DarkKhaki, 90); + addMix(Goldenrod, Chocolate, Peru, 105); + addMix(Goldenrod, Coral, DarkOrange, 100); + addMix(Goldenrod, Crimson, Chocolate, 80); + addMix(Goldenrod, Cyan, MediumAquamarine, 80); + addMix(Goldenrod, DarkGoldenrod, Orange, 115); + addMix(Goldenrod, DarkGray, DarkKhaki, 100); + addMix(Goldenrod, DarkGreen, OliveDrab, 80); + addMix(Goldenrod, DarkKhaki, DarkGoldenrod, 110); + addMix(Goldenrod, DarkOliveGreen, Olive, 90); + addMix(Goldenrod, DarkOrange, Orange, 110); + addMix(Goldenrod, DarkSalmon, SandyBrown, 100); + addMix(Goldenrod, DarkSeaGreen, DarkKhaki, 95); + addMix(Goldenrod, DarkSlateGray, Olive, 75); + addMix(Goldenrod, DarkTurquoise, MediumSeaGreen, 80); + addMix(Goldenrod, DarkViolet, MediumVioletRed, 50); + addMix(Goldenrod, DeepPink, IndianRed, 65); + addMix(Goldenrod, DeepSkyBlue, DarkSeaGreen, 70); + addMix(Goldenrod, DimGray, DarkGoldenrod, 90); + addMix(Goldenrod, DodgerBlue, CadetBlue, 65); + addMix(Goldenrod, Gold, Orange, 115); + addMix(Gray, Aquamarine, MediumAquamarine, 90); + addMix(Gray, Blue, DarkSlateBlue, 85); + addMix(Gray, CadetBlue, SlateGray, 105); + addMix(Gray, Chocolate, Peru, 100); + addMix(Gray, Coral, DarkSalmon, 95); + addMix(Gray, Crimson, IndianRed, 95); + addMix(Gray, Cyan, DarkTurquoise, 90); + addMix(Gray, DarkGoldenrod, Olive, 100); + addMix(Gray, DarkGray, SlateGray, 115); + addMix(Gray, DarkGreen, DarkOliveGreen, 95); + addMix(Gray, DarkOrange, Peru, 95); + addMix(Gray, DarkSalmon, RosyBrown, 100); + addMix(Gray, DarkSlateGray, DimGray, 100); + addMix(Gray, DarkTurquoise, CadetBlue, 95); + addMix(Gray, DarkViolet, Purple, 90); + addMix(Gray, DeepPink, MediumVioletRed, 95); + addMix(Gray, DeepSkyBlue, CadetBlue, 100); + addMix(Gray, DimGray, SlateGray, 120); + addMix(Gray, DodgerBlue, SteelBlue, 100); + addMix(Gray, Gold, DarkKhaki, 85); + addMix(Gray, Goldenrod, DarkGoldenrod, 95); + addMix(Green, Aquamarine, MediumSeaGreen, 85); + addMix(Green, Black, DarkGreen, 85); + addMix(Green, Blue, DarkSlateBlue, 60); + addMix(Green, Brown, DarkOliveGreen, 60); + addMix(Green, CadetBlue, SeaGreen, 95); + addMix(Green, Chocolate, Olive, 70); + addMix(Green, Coral, Olive, 65); + addMix(Green, Cyan, MediumSeaGreen, 80); + addMix(Green, DarkGoldenrod, OliveDrab, 90); + addMix(Green, DarkGray, SeaGreen, 90); + addMix(Green, DarkGreen, DarkOliveGreen, 120); + addMix(Green, DarkKhaki, OliveDrab, 95); + addMix(Green, DarkOliveGreen, DarkGreen, 115); + addMix(Green, DarkOrange, Olive, 70); + addMix(Green, DarkSalmon, OliveDrab, 70); + addMix(Green, DarkSeaGreen, MediumSeaGreen, 100); + addMix(Green, DarkSlateBlue, DarkSlateGray, 70); + addMix(Green, DarkSlateGray, DarkGreen, 95); + addMix(Green, DarkTurquoise, MediumSeaGreen, 85); + addMix(Green, DeepSkyBlue, SeaGreen, 70); + addMix(Green, DimGray, DarkGreen, 100); + addMix(Green, DodgerBlue, Teal, 65); + addMix(Green, Gold, YellowGreen, 80); + addMix(Green, Goldenrod, OliveDrab, 85); + addMix(Green, Gray, SeaGreen, 100); + addMix(HotPink, Aquamarine, Thistle, 50); + addMix(HotPink, Blue, DarkViolet, 80); + addMix(HotPink, Brown, IndianRed, 90); + addMix(HotPink, CadetBlue, Plum, 85); + addMix(HotPink, Chocolate, IndianRed, 85); + addMix(HotPink, Coral, Salmon, 95); + addMix(HotPink, Crimson, DeepPink, 100); + addMix(HotPink, Cyan, SkyBlue, 55); + addMix(HotPink, DarkGoldenrod, Salmon, 70); + addMix(HotPink, DarkGray, PaleVioletRed, 100); + addMix(HotPink, DarkKhaki, RosyBrown, 70); + addMix(HotPink, DarkOliveGreen, IndianRed, 60); + addMix(HotPink, DarkOrange, Coral, 80); + addMix(HotPink, DarkSalmon, PaleVioletRed, 100); + addMix(HotPink, DarkSeaGreen, RosyBrown, 60); + addMix(HotPink, DarkSlateBlue, MediumOrchid, 85); + addMix(HotPink, DarkTurquoise, DodgerBlue, 60); + addMix(HotPink, DarkViolet, MediumOrchid, 95); + addMix(HotPink, DeepPink, PaleVioletRed, 115); + addMix(HotPink, DeepSkyBlue, DodgerBlue, 65); + addMix(HotPink, DimGray, PaleVioletRed, 95); + addMix(HotPink, DodgerBlue, MediumPurple, 85); + addMix(HotPink, Gold, SandyBrown, 60); + addMix(HotPink, Goldenrod, DarkSalmon, 70); + addMix(HotPink, Gray, PaleVioletRed, 100); + addMix(IndianRed, Aquamarine, DarkGray, 55); + addMix(IndianRed, Black, Maroon, 80); + addMix(IndianRed, Blue, DarkViolet, 80); + addMix(IndianRed, Brown, Crimson, 110); + addMix(IndianRed, CadetBlue, RosyBrown, 80); + addMix(IndianRed, Chocolate, Red, 105); + addMix(IndianRed, Coral, Salmon, 110); + addMix(IndianRed, Crimson, Brown, 115); + addMix(IndianRed, Cyan, CadetBlue, 60); + addMix(IndianRed, DarkGoldenrod, Chocolate, 90); + addMix(IndianRed, DarkGray, RosyBrown, 100); + addMix(IndianRed, DarkGreen, DarkOliveGreen, 60); + addMix(IndianRed, DarkKhaki, Peru, 85); + addMix(IndianRed, DarkOliveGreen, Sienna, 80); + addMix(IndianRed, DarkOrange, Chocolate, 95); + addMix(IndianRed, DarkSalmon, Salmon, 110); + addMix(IndianRed, DarkSeaGreen, Peru, 75); + addMix(IndianRed, DarkSlateBlue, MediumVioletRed, 90); + addMix(IndianRed, DarkTurquoise, CadetBlue, 65); + addMix(IndianRed, DarkViolet, MediumVioletRed, 90); + addMix(IndianRed, DeepPink, PaleVioletRed, 110); + addMix(IndianRed, DeepSkyBlue, SteelBlue, 70); + addMix(IndianRed, DodgerBlue, MediumPurple, 80); + addMix(IndianRed, Gold, Orange, 75); + addMix(IndianRed, Goldenrod, Peru, 85); + addMix(IndianRed, Gray, RosyBrown, 100); + addMix(IndianRed, Green, DarkOliveGreen, 60); + addMix(IndianRed, HotPink, PaleVioletRed, 105); + addMix(Indigo, Black, Navy, 95); + addMix(Indigo, Blue, Navy, 110); + addMix(Indigo, Brown, Purple, 90); + addMix(Indigo, CadetBlue, DarkSlateBlue, 80); + addMix(Indigo, Coral, MediumVioletRed, 65); + addMix(Indigo, Crimson, Purple, 85); + addMix(Indigo, DarkGoldenrod, Brown, 55); + addMix(Indigo, DarkGray, SlateBlue, 70); + addMix(Indigo, DarkOrange, Brown, 55); + addMix(Indigo, DarkSalmon, MediumVioletRed, 65); + addMix(Indigo, DarkSlateBlue, Navy, 115); + addMix(Indigo, DarkSlateGray, DarkSlateBlue, 100); + addMix(Indigo, DarkTurquoise, RoyalBlue, 55); + addMix(Indigo, DarkViolet, Purple, 110); + addMix(Indigo, DeepPink, Purple, 90); + addMix(Indigo, DeepSkyBlue, RoyalBlue, 60); + addMix(Indigo, DimGray, DarkSlateBlue, 90); + addMix(Indigo, DodgerBlue, SlateBlue, 80); + addMix(Indigo, Goldenrod, Brown, 45); + addMix(Indigo, Gray, DarkSlateBlue, 85); + addMix(Indigo, Green, DarkSlateGray, 65); + addMix(Indigo, HotPink, MediumVioletRed, 80); + addMix(Indigo, IndianRed, Purple, 85); + addMix(Khaki, Aquamarine, PaleGreen, 100); + addMix(Khaki, Brown, Peru, 65); + addMix(Khaki, CadetBlue, DarkSeaGreen, 90); + addMix(Khaki, Chocolate, Goldenrod, 85); + addMix(Khaki, Coral, SandyBrown, 90); + addMix(Khaki, Crimson, Salmon, 65); + addMix(Khaki, Cyan, Aquamarine, 90); + addMix(Khaki, DarkGoldenrod, Goldenrod, 100); + addMix(Khaki, DarkGray, DarkKhaki, 100); + addMix(Khaki, DarkGreen, OliveDrab, 75); + addMix(Khaki, DarkKhaki, Wheat, 115); + addMix(Khaki, DarkOliveGreen, DarkKhaki, 85); + addMix(Khaki, DarkOrange, Goldenrod, 95); + addMix(Khaki, DarkSalmon, Tan, 95); + addMix(Khaki, DarkSeaGreen, DarkKhaki, 105); + addMix(Khaki, DarkSlateBlue, Gray, 50); + addMix(Khaki, DarkSlateGray, DarkSeaGreen, 65); + addMix(Khaki, DarkTurquoise, MediumAquamarine, 90); + addMix(Khaki, DeepPink, PaleVioletRed, 60); + addMix(Khaki, DeepSkyBlue, Turquoise, 75); + addMix(Khaki, DimGray, DarkKhaki, 85); + addMix(Khaki, DodgerBlue, SkyBlue, 60); + addMix(Khaki, Gold, Yellow, 115); + addMix(Khaki, Goldenrod, Gold, 110); + addMix(Khaki, Gray, DarkKhaki, 90); + addMix(Khaki, Green, YellowGreen, 85); + addMix(Khaki, HotPink, DarkSalmon, 65); + addMix(Khaki, IndianRed, SandyBrown, 75); + addMix(Lavender, Aquamarine, PaleTurquoise, 95); + addMix(Lavender, Blue, MediumPurple, 65); + addMix(Lavender, Brown, RosyBrown, 70); + addMix(Lavender, CadetBlue, SkyBlue, 95); + addMix(Lavender, Chocolate, DarkSalmon, 85); + addMix(Lavender, Coral, DarkSalmon, 90); + addMix(Lavender, Crimson, PaleVioletRed, 80); + addMix(Lavender, Cyan, PaleTurquoise, 95); + addMix(Lavender, DarkGoldenrod, Tan, 85); + addMix(Lavender, DarkGray, LightGray, 110); + addMix(Lavender, DarkGreen, DarkSeaGreen, 65); + addMix(Lavender, DarkKhaki, Wheat, 90); + addMix(Lavender, DarkOliveGreen, DarkGray, 75); + addMix(Lavender, DarkOrange, SandyBrown, 85); + addMix(Lavender, DarkSalmon, Pink, 95); + addMix(Lavender, DarkSeaGreen, PaleTurquoise, 95); + addMix(Lavender, DarkSlateBlue, MediumPurple, 70); + addMix(Lavender, DarkSlateGray, DarkGray, 70); + addMix(Lavender, DarkTurquoise, PaleTurquoise, 95); + addMix(Lavender, DarkViolet, MediumOrchid, 75); + addMix(Lavender, DeepPink, HotPink, 85); + addMix(Lavender, DeepSkyBlue, SkyBlue, 95); + addMix(Lavender, DimGray, DarkGray, 85); + addMix(Lavender, DodgerBlue, LightSteelBlue, 95); + addMix(Lavender, Gold, Khaki, 85); + addMix(Lavender, Goldenrod, Tan, 85); + addMix(Lavender, Gray, DarkGray, 95); + addMix(Lavender, Green, DarkSeaGreen, 75); + addMix(Lavender, HotPink, Plum, 95); + addMix(Lavender, IndianRed, RosyBrown, 85); + addMix(Lavender, Indigo, MediumPurple, 55); + addMix(Lavender, Khaki, LemonChiffon, 90); + addMix(LemonChiffon, Aquamarine, PaleGreen, 105); + addMix(LemonChiffon, Blue, MediumPurple, 45); + addMix(LemonChiffon, Brown, DarkSalmon, 65); + addMix(LemonChiffon, CadetBlue, DarkSeaGreen, 90); + addMix(LemonChiffon, Chocolate, SandyBrown, 85); + addMix(LemonChiffon, Coral, SandyBrown, 90); + addMix(LemonChiffon, Crimson, Salmon, 70); + addMix(LemonChiffon, Cyan, Aquamarine, 95); + addMix(LemonChiffon, DarkGoldenrod, DarkKhaki, 95); + addMix(LemonChiffon, DarkGray, LightGray, 100); + addMix(LemonChiffon, DarkGreen, DarkSeaGreen, 75); + addMix(LemonChiffon, DarkKhaki, Khaki, 110); + addMix(LemonChiffon, DarkOliveGreen, DarkKhaki, 80); + addMix(LemonChiffon, DarkOrange, Orange, 95); + addMix(LemonChiffon, DarkSalmon, Tan, 95); + addMix(LemonChiffon, DarkSeaGreen, Khaki, 105); + addMix(LemonChiffon, DarkSlateBlue, DarkGray, 55); + addMix(LemonChiffon, DarkSlateGray, DarkSeaGreen, 65); + addMix(LemonChiffon, DarkTurquoise, Turquoise, 95); + addMix(LemonChiffon, DarkViolet, Violet, 50); + addMix(LemonChiffon, DeepPink, HotPink, 65); + addMix(LemonChiffon, DeepSkyBlue, PaleTurquoise, 80); + addMix(LemonChiffon, DimGray, DarkGray, 80); + addMix(LemonChiffon, DodgerBlue, SkyBlue, 70); + addMix(LemonChiffon, Gold, Khaki, 105); + addMix(LemonChiffon, Goldenrod, Khaki, 100); + addMix(LemonChiffon, Gray, DarkGray, 90); + addMix(LemonChiffon, Green, DarkSeaGreen, 80); + addMix(LemonChiffon, HotPink, Pink, 75); + addMix(LemonChiffon, IndianRed, DarkSalmon, 80); + addMix(LemonChiffon, Khaki, Wheat, 115); + addMix(LightGray, Aquamarine, PaleTurquoise, 100); + addMix(LightGray, Black, DimGray, 45); + addMix(LightGray, Blue, RoyalBlue, 65); + addMix(LightGray, Brown, RosyBrown, 75); + addMix(LightGray, CadetBlue, SkyBlue, 100); + addMix(LightGray, Chocolate, SandyBrown, 90); + addMix(LightGray, Coral, DarkSalmon, 95); + addMix(LightGray, Crimson, PaleVioletRed, 85); + addMix(LightGray, Cyan, Turquoise, 100); + addMix(LightGray, DarkGoldenrod, Tan, 95); + addMix(LightGray, DarkGray, LightSteelBlue, 115); + addMix(LightGray, DarkGreen, SeaGreen, 75); + addMix(LightGray, DarkKhaki, Wheat, 105); + addMix(LightGray, DarkOliveGreen, DarkSeaGreen, 85); + addMix(LightGray, DarkOrange, SandyBrown, 95); + addMix(LightGray, DarkSalmon, RosyBrown, 100); + addMix(LightGray, DarkSlateGray, Gray, 75); + addMix(LightGray, DarkTurquoise, Turquoise, 100); + addMix(LightGray, DarkViolet, MediumOrchid, 75); + addMix(LightGray, DeepPink, HotPink, 90); + addMix(LightGray, DeepSkyBlue, SkyBlue, 100); + addMix(LightGray, DimGray, DarkGray, 95); + addMix(LightGray, DodgerBlue, DeepSkyBlue, 95); + addMix(LightGray, Gold, Khaki, 95); + addMix(LightGray, Goldenrod, DarkKhaki, 100); + addMix(LightGray, Gray, DarkGray, 100); + addMix(LightGray, Green, MediumSeaGreen, 85); + addMix(LightGray, HotPink, Plum, 95); + addMix(LightGray, IndianRed, RosyBrown, 90); + addMix(LightGray, Indigo, MediumPurple, 55); + addMix(LightGray, Khaki, LemonChiffon, 105); + addMix(LightGray, LemonChiffon, Wheat, 110); + addMix(LightSeaGreen, Aquamarine, Turquoise, 105); + addMix(LightSeaGreen, Black, DarkSlateGray, 65); + addMix(LightSeaGreen, Blue, RoyalBlue, 70); + addMix(LightSeaGreen, Brown, DimGray, 60); + addMix(LightSeaGreen, CadetBlue, DarkTurquoise, 120); + addMix(LightSeaGreen, Chocolate, OliveDrab, 75); + addMix(LightSeaGreen, Cyan, DarkTurquoise, 110); + addMix(LightSeaGreen, DarkGoldenrod, OliveDrab, 85); + addMix(LightSeaGreen, DarkGray, CadetBlue, 105); + addMix(LightSeaGreen, DarkGreen, SeaGreen, 90); + addMix(LightSeaGreen, DarkKhaki, DarkSeaGreen, 95); + addMix(LightSeaGreen, DarkOliveGreen, SeaGreen, 95); + addMix(LightSeaGreen, DarkOrange, OliveDrab, 75); + addMix(LightSeaGreen, DarkSalmon, CadetBlue, 80); + addMix(LightSeaGreen, DarkSeaGreen, MediumAquamarine, 110); + addMix(LightSeaGreen, DarkSlateBlue, SteelBlue, 75); + addMix(LightSeaGreen, DarkSlateGray, Teal, 90); + addMix(LightSeaGreen, DarkTurquoise, Turquoise, 120); + addMix(LightSeaGreen, DarkViolet, SlateBlue, 75); + addMix(LightSeaGreen, DeepPink, MediumOrchid, 65); + addMix(LightSeaGreen, DeepSkyBlue, SkyBlue, 105); + addMix(LightSeaGreen, DimGray, Teal, 95); + addMix(LightSeaGreen, DodgerBlue, DeepSkyBlue, 95); + addMix(LightSeaGreen, Gold, YellowGreen, 85); + addMix(LightSeaGreen, Goldenrod, DarkSeaGreen, 85); + addMix(LightSeaGreen, Gray, CadetBlue, 100); + addMix(LightSeaGreen, Green, SeaGreen, 95); + addMix(LightSeaGreen, IndianRed, Gray, 70); + addMix(LightSeaGreen, Indigo, RoyalBlue, 65); + addMix(LightSeaGreen, Khaki, DarkSeaGreen, 90); + addMix(LightSeaGreen, Lavender, DarkTurquoise, 95); + addMix(LightSeaGreen, LemonChiffon, MediumAquamarine, 95); + addMix(LightSeaGreen, LightGray, DarkTurquoise, 100); + addMix(LightSteelBlue, Aquamarine, PaleTurquoise, 95); + addMix(LightSteelBlue, Black, DimGray, 55); + addMix(LightSteelBlue, Blue, RoyalBlue, 80); + addMix(LightSteelBlue, Brown, RosyBrown, 75); + addMix(LightSteelBlue, CadetBlue, SkyBlue, 105); + addMix(LightSteelBlue, Chocolate, DarkSalmon, 85); + addMix(LightSteelBlue, Coral, RosyBrown, 90); + addMix(LightSteelBlue, Crimson, PaleVioletRed, 80); + addMix(LightSteelBlue, Cyan, DarkTurquoise, 100); + addMix(LightSteelBlue, DarkGoldenrod, DarkKhaki, 85); + addMix(LightSteelBlue, DarkGray, LightGray, 115); + addMix(LightSteelBlue, DarkGreen, SeaGreen, 70); + addMix(LightSteelBlue, DarkKhaki, DarkSeaGreen, 90); + addMix(LightSteelBlue, DarkOliveGreen, CadetBlue, 80); + addMix(LightSteelBlue, DarkOrange, Tan, 85); + addMix(LightSteelBlue, DarkSalmon, RosyBrown, 95); + addMix(LightSteelBlue, DarkSeaGreen, MediumAquamarine, 95); + addMix(LightSteelBlue, DarkSlateBlue, MediumPurple, 80); + addMix(LightSteelBlue, DarkSlateGray, SlateGray, 80); + addMix(LightSteelBlue, DarkTurquoise, SkyBlue, 105); + addMix(LightSteelBlue, DarkViolet, MediumPurple, 85); + addMix(LightSteelBlue, DeepPink, HotPink, 85); + addMix(LightSteelBlue, DeepSkyBlue, SkyBlue, 110); + addMix(LightSteelBlue, DimGray, SlateGray, 95); + addMix(LightSteelBlue, DodgerBlue, DeepSkyBlue, 105); + addMix(LightSteelBlue, Gold, Khaki, 80); + addMix(LightSteelBlue, Goldenrod, DarkKhaki, 85); + addMix(LightSteelBlue, Gray, DarkGray, 105); + addMix(LightSteelBlue, Green, MediumSeaGreen, 75); + addMix(LightSteelBlue, HotPink, Plum, 90); + addMix(LightSteelBlue, IndianRed, RosyBrown, 85); + addMix(LightSteelBlue, Indigo, SlateBlue, 65); + addMix(LightSteelBlue, Khaki, LemonChiffon, 85); + addMix(LightSteelBlue, Lavender, LightGray, 115); + addMix(LightSteelBlue, LemonChiffon, LightGray, 95); + addMix(LightSteelBlue, LightGray, Lavender, 115); + addMix(LightSteelBlue, LightSeaGreen, DarkTurquoise, 100); + addMix(Lime, Aquamarine, SpringGreen, 105); + addMix(Lime, CadetBlue, LimeGreen, 85); + addMix(Lime, Chocolate, YellowGreen, 60); + addMix(Lime, Coral, YellowGreen, 55); + addMix(Lime, Cyan, SpringGreen, 90); + addMix(Lime, DarkGoldenrod, LimeGreen, 80); + addMix(Lime, DarkGray, LimeGreen, 90); + addMix(Lime, DarkGreen, LimeGreen, 80); + addMix(Lime, DarkKhaki, LimeGreen, 100); + addMix(Lime, DarkOliveGreen, LimeGreen, 85); + addMix(Lime, DarkOrange, YellowGreen, 65); + addMix(Lime, DarkSalmon, LimeGreen, 65); + addMix(Lime, DarkSeaGreen, LimeGreen, 105); + addMix(Lime, DarkSlateBlue, MediumSeaGreen, 50); + addMix(Lime, DarkSlateGray, MediumSeaGreen, 65); + addMix(Lime, DarkTurquoise, SpringGreen, 90); + addMix(Lime, DeepSkyBlue, SpringGreen, 65); + addMix(Lime, DimGray, LimeGreen, 80); + addMix(Lime, DodgerBlue, MediumSeaGreen, 55); + addMix(Lime, Gold, YellowGreen, 95); + addMix(Lime, Goldenrod, LimeGreen, 85); + addMix(Lime, Gray, LimeGreen, 85); + addMix(Lime, Green, LimeGreen, 90); + addMix(Lime, IndianRed, LimeGreen, 45); + addMix(Lime, Khaki, PaleGreen, 100); + addMix(Lime, Lavender, PaleGreen, 85); + addMix(Lime, LemonChiffon, PaleGreen, 100); + addMix(Lime, LightGray, SpringGreen, 95); + addMix(Lime, LightSeaGreen, LimeGreen, 90); + addMix(Lime, LightSteelBlue, SpringGreen, 80); + addMix(LimeGreen, Aquamarine, SpringGreen, 105); + addMix(LimeGreen, Black, DarkGreen, 55); + addMix(LimeGreen, Blue, SteelBlue, 50); + addMix(LimeGreen, Brown, DarkOliveGreen, 45); + addMix(LimeGreen, CadetBlue, MediumSeaGreen, 95); + addMix(LimeGreen, Chocolate, OliveDrab, 65); + addMix(LimeGreen, Coral, DarkKhaki, 60); + addMix(LimeGreen, Cyan, SpringGreen, 90); + addMix(LimeGreen, DarkGoldenrod, OliveDrab, 90); + addMix(LimeGreen, DarkGray, MediumSeaGreen, 95); + addMix(LimeGreen, DarkGreen, Green, 90); + addMix(LimeGreen, DarkKhaki, YellowGreen, 105); + addMix(LimeGreen, DarkOliveGreen, OliveDrab, 95); + addMix(LimeGreen, DarkOrange, YellowGreen, 70); + addMix(LimeGreen, DarkSalmon, YellowGreen, 70); + addMix(LimeGreen, DarkSeaGreen, MediumSeaGreen, 110); + addMix(LimeGreen, DarkSlateBlue, SeaGreen, 55); + addMix(LimeGreen, DarkSlateGray, SeaGreen, 75); + addMix(LimeGreen, DarkTurquoise, MediumSeaGreen, 95); + addMix(LimeGreen, DarkViolet, DimGray, 55); + addMix(LimeGreen, DeepSkyBlue, MediumAquamarine, 70); + addMix(LimeGreen, DimGray, SeaGreen, 85); + addMix(LimeGreen, DodgerBlue, LightSeaGreen, 65); + addMix(LimeGreen, Gold, YellowGreen, 95); + addMix(LimeGreen, Goldenrod, YellowGreen, 90); + addMix(LimeGreen, Gray, MediumSeaGreen, 90); + addMix(LimeGreen, Green, MediumSeaGreen, 105); + addMix(LimeGreen, IndianRed, OliveDrab, 55); + addMix(LimeGreen, Indigo, DarkSlateGray, 50); + addMix(LimeGreen, Khaki, YellowGreen, 100); + addMix(LimeGreen, Lavender, DarkSeaGreen, 85); + addMix(LimeGreen, LemonChiffon, PaleGreen, 100); + addMix(LimeGreen, LightGray, DarkSeaGreen, 95); + addMix(LimeGreen, LightSeaGreen, MediumSeaGreen, 100); + addMix(LimeGreen, LightSteelBlue, DarkSeaGreen, 85); + addMix(LimeGreen, Lime, SpringGreen, 115); + addMix(Magenta, Aquamarine, Violet, 70); + addMix(Magenta, Black, Purple, 70); + addMix(Magenta, Blue, DarkViolet, 95); + addMix(Magenta, Brown, MediumVioletRed, 85); + addMix(Magenta, CadetBlue, MediumOrchid, 95); + addMix(Magenta, Chocolate, DeepPink, 75); + addMix(Magenta, Coral, DeepPink, 80); + addMix(Magenta, Crimson, DeepPink, 90); + addMix(Magenta, Cyan, MediumPurple, 65); + addMix(Magenta, DarkGoldenrod, DeepPink, 60); + addMix(Magenta, DarkGray, MediumOrchid, 95); + addMix(Magenta, DarkKhaki, HotPink, 55); + addMix(Magenta, DarkOliveGreen, MediumVioletRed, 50); + addMix(Magenta, DarkOrange, DeepPink, 65); + addMix(Magenta, DarkSalmon, HotPink, 85); + addMix(Magenta, DarkSeaGreen, MediumOrchid, 50); + addMix(Magenta, DarkSlateBlue, DarkViolet, 90); + addMix(Magenta, DarkSlateGray, DarkViolet, 90); + addMix(Magenta, DarkTurquoise, MediumPurple, 75); + addMix(Magenta, DarkViolet, MediumOrchid, 105); + addMix(Magenta, DeepPink, HotPink, 110); + addMix(Magenta, DeepSkyBlue, MediumPurple, 70); + addMix(Magenta, DimGray, MediumOrchid, 90); + addMix(Magenta, DodgerBlue, SlateBlue, 85); + addMix(Magenta, Goldenrod, DeepPink, 55); + addMix(Magenta, Gray, MediumOrchid, 95); + addMix(Magenta, HotPink, Violet, 110); + addMix(Magenta, IndianRed, DeepPink, 95); + addMix(Magenta, Indigo, DarkViolet, 90); + addMix(Magenta, Khaki, HotPink, 50); + addMix(Magenta, Lavender, Violet, 90); + addMix(Magenta, LemonChiffon, Violet, 60); + addMix(Magenta, LightGray, Violet, 90); + addMix(Magenta, LightSeaGreen, MediumPurple, 80); + addMix(Magenta, LightSteelBlue, MediumOrchid, 95); + addMix(Maroon, Blue, Indigo, 80); + addMix(Maroon, Chocolate, Sienna, 95); + addMix(Maroon, Coral, Sienna, 85); + addMix(Maroon, Crimson, Brown, 105); + addMix(Maroon, DarkGoldenrod, Sienna, 85); + addMix(Maroon, DarkGray, Brown, 75); + addMix(Maroon, DarkKhaki, Sienna, 65); + addMix(Maroon, DarkOrange, Sienna, 80); + addMix(Maroon, DarkSalmon, Brown, 80); + addMix(Maroon, DarkSeaGreen, Sienna, 55); + addMix(Maroon, DarkTurquoise, DarkSlateGray, 50); + addMix(Maroon, DarkViolet, Purple, 85); + addMix(Maroon, DeepPink, Crimson, 90); + addMix(Maroon, DeepSkyBlue, RoyalBlue, 50); + addMix(Maroon, DimGray, Brown, 95); + addMix(Maroon, DodgerBlue, DarkSlateBlue, 70); + addMix(Maroon, Gold, Chocolate, 55); + addMix(Maroon, Goldenrod, Sienna, 70); + addMix(Maroon, Gray, Brown, 90); + addMix(Maroon, Green, Olive, 60); + addMix(Maroon, HotPink, Crimson, 80); + addMix(Maroon, IndianRed, Brown, 100); + addMix(Maroon, Indigo, Purple, 90); + addMix(Maroon, Khaki, Chocolate, 55); + addMix(Maroon, Lavender, RosyBrown, 60); + addMix(Maroon, LemonChiffon, DarkSalmon, 55); + addMix(Maroon, LightGray, IndianRed, 65); + addMix(Maroon, LightSeaGreen, DimGray, 60); + addMix(Maroon, Magenta, MediumVioletRed, 75); + addMix(MediumAquamarine, Aquamarine, Turquoise, 115); + addMix(MediumAquamarine, Black, DarkSlateGray, 55); + addMix(MediumAquamarine, Blue, RoyalBlue, 60); + addMix(MediumAquamarine, Brown, Gray, 55); + addMix(MediumAquamarine, CadetBlue, LightSeaGreen, 110); + addMix(MediumAquamarine, Chocolate, DarkKhaki, 75); + addMix(MediumAquamarine, Coral, Tan, 70); + addMix(MediumAquamarine, Crimson, RosyBrown, 55); + addMix(MediumAquamarine, Cyan, Turquoise, 110); + addMix(MediumAquamarine, DarkGoldenrod, DarkSeaGreen, 85); + addMix(MediumAquamarine, DarkGray, DarkSeaGreen, 100); + addMix(MediumAquamarine, DarkGreen, SeaGreen, 85); + addMix(MediumAquamarine, DarkKhaki, DarkSeaGreen, 105); + addMix(MediumAquamarine, DarkOliveGreen, SeaGreen, 90); + addMix(MediumAquamarine, DarkOrange, DarkKhaki, 75); + addMix(MediumAquamarine, DarkSalmon, DarkSeaGreen, 80); + addMix(MediumAquamarine, DarkSeaGreen, MediumSeaGreen, 115); + addMix(MediumAquamarine, DarkSlateBlue, SlateGray, 65); + addMix(MediumAquamarine, DarkSlateGray, Teal, 80); + addMix(MediumAquamarine, DarkTurquoise, Turquoise, 115); + addMix(MediumAquamarine, DarkViolet, SlateBlue, 70); + addMix(MediumAquamarine, DeepPink, PaleVioletRed, 45); + addMix(MediumAquamarine, DeepSkyBlue, DarkTurquoise, 95); + addMix(MediumAquamarine, DimGray, CadetBlue, 90); + addMix(MediumAquamarine, DodgerBlue, DeepSkyBlue, 85); + addMix(MediumAquamarine, Gold, YellowGreen, 90); + addMix(MediumAquamarine, Goldenrod, DarkKhaki, 90); + addMix(MediumAquamarine, Gray, CadetBlue, 95); + addMix(MediumAquamarine, Green, MediumSeaGreen, 95); + addMix(MediumAquamarine, HotPink, Thistle, 55); + addMix(MediumAquamarine, IndianRed, DarkGray, 65); + addMix(MediumAquamarine, Indigo, SlateBlue, 55); + addMix(MediumAquamarine, Khaki, DarkSeaGreen, 100); + addMix(MediumAquamarine, Lavender, PaleTurquoise, 95); + addMix(MediumAquamarine, LemonChiffon, DarkSeaGreen, 100); + addMix(MediumAquamarine, LightGray, PaleTurquoise, 100); + addMix(MediumAquamarine, LightSeaGreen, Turquoise, 115); + addMix(MediumAquamarine, LightSteelBlue, PaleTurquoise, 100); + addMix(MediumAquamarine, Lime, LimeGreen, 100); + addMix(MediumAquamarine, LimeGreen, MediumSeaGreen, 110); + addMix(MediumAquamarine, Magenta, MediumOrchid, 75); + addMix(MediumAquamarine, Maroon, DimGray, 50); + addMix(MediumOrchid, Aquamarine, LightSteelBlue, 70); + addMix(MediumOrchid, Black, Purple, 75); + addMix(MediumOrchid, Blue, DarkViolet, 100); + addMix(MediumOrchid, Brown, MediumVioletRed, 90); + addMix(MediumOrchid, CadetBlue, MediumPurple, 95); + addMix(MediumOrchid, Chocolate, PaleVioletRed, 80); + addMix(MediumOrchid, Coral, PaleVioletRed, 85); + addMix(MediumOrchid, Crimson, MediumVioletRed, 95); + addMix(MediumOrchid, Cyan, DodgerBlue, 70); + addMix(MediumOrchid, DarkGoldenrod, IndianRed, 65); + addMix(MediumOrchid, DarkGray, Plum, 95); + addMix(MediumOrchid, DarkKhaki, RosyBrown, 60); + addMix(MediumOrchid, DarkOrange, IndianRed, 70); + addMix(MediumOrchid, DarkSalmon, PaleVioletRed, 85); + addMix(MediumOrchid, DarkSeaGreen, Plum, 55); + addMix(MediumOrchid, DarkSlateBlue, SlateBlue, 100); + addMix(MediumOrchid, DarkSlateGray, DarkSlateBlue, 95); + addMix(MediumOrchid, DarkTurquoise, DodgerBlue, 75); + addMix(MediumOrchid, DeepPink, MediumVioletRed, 110); + addMix(MediumOrchid, DeepSkyBlue, DodgerBlue, 75); + addMix(MediumOrchid, DimGray, MediumPurple, 95); + addMix(MediumOrchid, DodgerBlue, RoyalBlue, 95); + addMix(MediumOrchid, Gold, SandyBrown, 50); + addMix(MediumOrchid, Goldenrod, RosyBrown, 60); + addMix(MediumOrchid, Gray, MediumPurple, 100); + addMix(MediumOrchid, HotPink, Violet, 110); + addMix(MediumOrchid, IndianRed, MediumVioletRed, 95); + addMix(MediumOrchid, Indigo, DarkViolet, 100); + addMix(MediumOrchid, Khaki, RosyBrown, 55); + addMix(MediumOrchid, Lavender, Plum, 90); + addMix(MediumOrchid, LemonChiffon, Plum, 65); + addMix(MediumOrchid, LightGray, Plum, 90); + addMix(MediumOrchid, LightSeaGreen, SteelBlue, 80); + addMix(MediumOrchid, LightSteelBlue, Plum, 95); + addMix(MediumOrchid, Maroon, MediumVioletRed, 80); + addMix(MediumPurple, Aquamarine, SkyBlue, 75); + addMix(MediumPurple, Black, DarkSlateBlue, 75); + addMix(MediumPurple, Blue, SlateBlue, 100); + addMix(MediumPurple, Brown, MediumVioletRed, 85); + addMix(MediumPurple, CadetBlue, SlateGray, 95); + addMix(MediumPurple, Chocolate, PaleVioletRed, 80); + addMix(MediumPurple, Coral, PaleVioletRed, 80); + addMix(MediumPurple, Crimson, MediumVioletRed, 90); + addMix(MediumPurple, Cyan, DeepSkyBlue, 75); + addMix(MediumPurple, DarkGoldenrod, RosyBrown, 65); + addMix(MediumPurple, DarkGreen, DarkSlateGray, 70); + addMix(MediumPurple, DarkKhaki, RosyBrown, 65); + addMix(MediumPurple, DarkOliveGreen, DimGray, 65); + addMix(MediumPurple, DarkOrange, DarkSalmon, 70); + addMix(MediumPurple, DarkSalmon, PaleVioletRed, 85); + addMix(MediumPurple, DarkSeaGreen, SlateGray, 80); + addMix(MediumPurple, DarkSlateBlue, SlateBlue, 105); + addMix(MediumPurple, DarkSlateGray, SlateBlue, 95); + addMix(MediumPurple, DarkTurquoise, DodgerBlue, 85); + addMix(MediumPurple, DarkViolet, SlateBlue, 110); + addMix(MediumPurple, DeepPink, MediumOrchid, 100); + addMix(MediumPurple, DeepSkyBlue, DodgerBlue, 90); + addMix(MediumPurple, DimGray, SlateBlue, 100); + addMix(MediumPurple, DodgerBlue, RoyalBlue, 105); + addMix(MediumPurple, Gold, Tan, 55); + addMix(MediumPurple, Goldenrod, RosyBrown, 65); + addMix(MediumPurple, Green, Teal, 70); + addMix(MediumPurple, HotPink, MediumOrchid, 105); + addMix(MediumPurple, IndianRed, PaleVioletRed, 95); + addMix(MediumPurple, Indigo, DarkViolet, 95); + addMix(MediumPurple, Khaki, Thistle, 60); + addMix(MediumPurple, Lavender, Plum, 95); + addMix(MediumPurple, LemonChiffon, Thistle, 65); + addMix(MediumPurple, LightGray, Plum, 90); + addMix(MediumPurple, LightSeaGreen, SteelBlue, 85); + addMix(MediumPurple, Lime, MediumSeaGreen, 60); + addMix(MediumPurple, LimeGreen, CadetBlue, 65); + addMix(MediumPurple, Magenta, MediumOrchid, 110); + addMix(MediumPurple, Maroon, Purple, 80); + addMix(MediumPurple, MediumAquamarine, DodgerBlue, 80); + addMix(MediumPurple, MediumOrchid, SlateBlue, 115); + addMix(MediumSeaGreen, Aquamarine, MediumAquamarine, 105); + addMix(MediumSeaGreen, Black, DarkGreen, 65); + addMix(MediumSeaGreen, Blue, RoyalBlue, 60); + addMix(MediumSeaGreen, Brown, DarkOliveGreen, 55); + addMix(MediumSeaGreen, CadetBlue, LightSeaGreen, 105); + addMix(MediumSeaGreen, Chocolate, OliveDrab, 70); + addMix(MediumSeaGreen, Coral, DarkKhaki, 65); + addMix(MediumSeaGreen, Crimson, Sienna, 50); + addMix(MediumSeaGreen, Cyan, MediumAquamarine, 100); + addMix(MediumSeaGreen, DarkGoldenrod, OliveDrab, 90); + addMix(MediumSeaGreen, DarkGray, DarkSeaGreen, 100); + addMix(MediumSeaGreen, DarkGreen, SeaGreen, 95); + addMix(MediumSeaGreen, DarkKhaki, DarkSeaGreen, 105); + addMix(MediumSeaGreen, DarkOliveGreen, SeaGreen, 100); + addMix(MediumSeaGreen, DarkOrange, DarkKhaki, 75); + addMix(MediumSeaGreen, DarkSalmon, DarkSeaGreen, 75); + addMix(MediumSeaGreen, DarkSeaGreen, MediumAquamarine, 115); + addMix(MediumSeaGreen, DarkSlateBlue, Teal, 70); + addMix(MediumSeaGreen, DarkSlateGray, SeaGreen, 85); + addMix(MediumSeaGreen, DarkTurquoise, MediumAquamarine, 105); + addMix(MediumSeaGreen, DarkViolet, SlateBlue, 65); + addMix(MediumSeaGreen, DeepSkyBlue, LightSeaGreen, 85); + addMix(MediumSeaGreen, DimGray, SeaGreen, 95); + addMix(MediumSeaGreen, DodgerBlue, CadetBlue, 75); + addMix(MediumSeaGreen, Gold, YellowGreen, 90); + addMix(MediumSeaGreen, Goldenrod, YellowGreen, 90); + addMix(MediumSeaGreen, Gray, SeaGreen, 100); + addMix(MediumSeaGreen, Green, SeaGreen, 105); + addMix(MediumSeaGreen, HotPink, Gray, 45); + addMix(MediumSeaGreen, Indigo, DarkSlateBlue, 60); + addMix(MediumSeaGreen, Khaki, DarkSeaGreen, 95); + addMix(MediumSeaGreen, Lavender, MediumAquamarine, 90); + addMix(MediumSeaGreen, LemonChiffon, DarkSeaGreen, 95); + addMix(MediumSeaGreen, LightGray, MediumAquamarine, 95); + addMix(MediumSeaGreen, LightSeaGreen, MediumAquamarine, 110); + addMix(MediumSeaGreen, LightSteelBlue, MediumAquamarine, 90); + addMix(MediumSeaGreen, Lime, LimeGreen, 105); + addMix(MediumSeaGreen, Magenta, MediumOrchid, 70); + addMix(MediumSeaGreen, Maroon, DarkOliveGreen, 50); + addMix(MediumSeaGreen, MediumAquamarine, DarkSeaGreen, 115); + addMix(MediumSeaGreen, MediumOrchid, SlateGray, 75); + addMix(MediumSeaGreen, MediumPurple, SlateGray, 75); + addMix(MediumVioletRed, Black, Purple, 85); + addMix(MediumVioletRed, Blue, DarkViolet, 95); + addMix(MediumVioletRed, Chocolate, Crimson, 85); + addMix(MediumVioletRed, Coral, IndianRed, 85); + addMix(MediumVioletRed, Crimson, DeepPink, 105); + addMix(MediumVioletRed, Cyan, SteelBlue, 45); + addMix(MediumVioletRed, DarkGoldenrod, IndianRed, 70); + addMix(MediumVioletRed, DarkGray, PaleVioletRed, 90); + addMix(MediumVioletRed, DarkKhaki, PaleVioletRed, 60); + addMix(MediumVioletRed, DarkOrange, IndianRed, 70); + addMix(MediumVioletRed, DarkSalmon, PaleVioletRed, 90); + addMix(MediumVioletRed, DarkSeaGreen, PaleVioletRed, 55); + addMix(MediumVioletRed, DarkSlateBlue, Purple, 100); + addMix(MediumVioletRed, DarkSlateGray, Purple, 100); + addMix(MediumVioletRed, DarkTurquoise, RoyalBlue, 55); + addMix(MediumVioletRed, DarkViolet, Purple, 110); + addMix(MediumVioletRed, DeepSkyBlue, SlateBlue, 60); + addMix(MediumVioletRed, DimGray, Purple, 100); + addMix(MediumVioletRed, DodgerBlue, SlateBlue, 80); + addMix(MediumVioletRed, Gold, Coral, 50); + addMix(MediumVioletRed, Goldenrod, IndianRed, 60); + addMix(MediumVioletRed, HotPink, DeepPink, 105); + addMix(MediumVioletRed, IndianRed, DeepPink, 105); + addMix(MediumVioletRed, Indigo, Purple, 100); + addMix(MediumVioletRed, Khaki, PaleVioletRed, 55); + addMix(MediumVioletRed, Lavender, Violet, 80); + addMix(MediumVioletRed, LemonChiffon, PaleVioletRed, 60); + addMix(MediumVioletRed, LightGray, PaleVioletRed, 85); + addMix(MediumVioletRed, LightSeaGreen, SlateBlue, 65); + addMix(MediumVioletRed, LightSteelBlue, MediumOrchid, 80); + addMix(MediumVioletRed, Magenta, MediumOrchid, 105); + addMix(MediumVioletRed, Maroon, Brown, 95); + addMix(MediumVioletRed, MediumPurple, MediumOrchid, 105); + addMix(MistyRose, Aquamarine, PaleTurquoise, 90); + addMix(MistyRose, Blue, MediumPurple, 65); + addMix(MistyRose, Brown, RosyBrown, 75); + addMix(MistyRose, CadetBlue, LightGray, 85); + addMix(MistyRose, Chocolate, DarkSalmon, 90); + addMix(MistyRose, Coral, DarkSalmon, 100); + addMix(MistyRose, Crimson, PaleVioletRed, 85); + addMix(MistyRose, Cyan, PaleTurquoise, 90); + addMix(MistyRose, DarkGoldenrod, Tan, 90); + addMix(MistyRose, DarkGray, LightGray, 105); + addMix(MistyRose, DarkGreen, DarkSeaGreen, 65); + addMix(MistyRose, DarkKhaki, Wheat, 100); + addMix(MistyRose, DarkOliveGreen, DarkKhaki, 75); + addMix(MistyRose, DarkOrange, SandyBrown, 95); + addMix(MistyRose, DarkSalmon, Pink, 105); + addMix(MistyRose, DarkSeaGreen, LemonChiffon, 90); + addMix(MistyRose, DarkSlateBlue, Plum, 65); + addMix(MistyRose, DarkSlateGray, DarkGray, 65); + addMix(MistyRose, DarkTurquoise, PaleTurquoise, 90); + addMix(MistyRose, DarkViolet, Violet, 70); + addMix(MistyRose, DeepPink, HotPink, 90); + addMix(MistyRose, DeepSkyBlue, SkyBlue, 90); + addMix(MistyRose, DimGray, DarkGray, 85); + addMix(MistyRose, DodgerBlue, LightSteelBlue, 85); + addMix(MistyRose, Gold, Khaki, 95); + addMix(MistyRose, Goldenrod, Tan, 95); + addMix(MistyRose, Gray, DarkGray, 95); + addMix(MistyRose, Green, DarkSeaGreen, 70); + addMix(MistyRose, HotPink, Pink, 95); + addMix(MistyRose, IndianRed, RosyBrown, 90); + addMix(MistyRose, Indigo, MediumOrchid, 50); + addMix(MistyRose, Khaki, Wheat, 100); + addMix(MistyRose, LemonChiffon, Wheat, 105); + addMix(MistyRose, LightSeaGreen, PaleTurquoise, 85); + addMix(MistyRose, LightSteelBlue, Lavender, 105); + addMix(MistyRose, Lime, PaleGreen, 80); + addMix(MistyRose, LimeGreen, PaleGreen, 80); + addMix(MistyRose, Magenta, Violet, 85); + addMix(MistyRose, Maroon, IndianRed, 60); + addMix(MistyRose, MediumAquamarine, PaleTurquoise, 90); + addMix(MistyRose, MediumOrchid, Plum, 85); + addMix(MistyRose, MediumPurple, Plum, 85); + addMix(MistyRose, MediumSeaGreen, DarkSeaGreen, 85); + addMix(MistyRose, MediumVioletRed, HotPink, 80); + addMix(Navy, Blue, Indigo, 110); + addMix(Navy, Brown, Purple, 85); + addMix(Navy, CadetBlue, DarkSlateBlue, 75); + addMix(Navy, Coral, Purple, 60); + addMix(Navy, Crimson, Purple, 80); + addMix(Navy, DarkGray, DarkSlateBlue, 65); + addMix(Navy, DarkGreen, DarkSlateGray, 65); + addMix(Navy, DarkOliveGreen, DarkSlateBlue, 55); + addMix(Navy, DarkOrange, Brown, 50); + addMix(Navy, DarkSeaGreen, RoyalBlue, 55); + addMix(Navy, DarkSlateBlue, Indigo, 110); + addMix(Navy, DarkSlateGray, DarkSlateBlue, 95); + addMix(Navy, DarkTurquoise, SteelBlue, 55); + addMix(Navy, DarkViolet, Indigo, 105); + addMix(Navy, DeepPink, Purple, 80); + addMix(Navy, DeepSkyBlue, RoyalBlue, 60); + addMix(Navy, DimGray, DarkSlateBlue, 90); + addMix(Navy, DodgerBlue, DarkSlateBlue, 80); + addMix(Navy, Gray, DarkSlateBlue, 80); + addMix(Navy, Green, Teal, 60); + addMix(Navy, HotPink, Purple, 75); + addMix(Navy, IndianRed, Purple, 80); + addMix(Navy, LightGray, SlateBlue, 50); + addMix(Navy, LightSeaGreen, RoyalBlue, 65); + addMix(Navy, LightSteelBlue, SlateBlue, 60); + addMix(Navy, Magenta, DarkViolet, 85); + addMix(Navy, Maroon, Purple, 85); + addMix(Navy, MediumAquamarine, RoyalBlue, 50); + addMix(Navy, MediumOrchid, DarkSlateBlue, 90); + addMix(Navy, MediumPurple, DarkSlateBlue, 90); + addMix(Navy, MediumVioletRed, Indigo, 95); + addMix(Olive, Aquamarine, DarkSeaGreen, 85); + addMix(Olive, Blue, DarkSlateBlue, 45); + addMix(Olive, Brown, Sienna, 80); + addMix(Olive, CadetBlue, OliveDrab, 95); + addMix(Olive, Chocolate, DarkGoldenrod, 95); + addMix(Olive, Coral, Peru, 85); + addMix(Olive, Crimson, Sienna, 75); + addMix(Olive, Cyan, MediumSeaGreen, 80); + addMix(Olive, DarkGray, OliveDrab, 95); + addMix(Olive, DarkGreen, Green, 105); + addMix(Olive, DarkKhaki, OliveDrab, 110); + addMix(Olive, DarkOliveGreen, OliveDrab, 110); + addMix(Olive, DarkOrange, DarkGoldenrod, 95); + addMix(Olive, DarkSalmon, DarkGoldenrod, 90); + addMix(Olive, DarkSeaGreen, OliveDrab, 100); + addMix(Olive, DarkSlateBlue, DimGray, 60); + addMix(Olive, DarkSlateGray, DarkOliveGreen, 90); + addMix(Olive, DarkTurquoise, MediumSeaGreen, 85); + addMix(Olive, DarkViolet, MediumVioletRed, 50); + addMix(Olive, DeepPink, IndianRed, 60); + addMix(Olive, DeepSkyBlue, MediumSeaGreen, 70); + addMix(Olive, DimGray, DarkOliveGreen, 100); + addMix(Olive, DodgerBlue, Teal, 60); + addMix(Olive, Gold, Goldenrod, 95); + addMix(Olive, Goldenrod, DarkGoldenrod, 105); + addMix(Olive, Gray, OliveDrab, 100); + addMix(Olive, Green, OliveDrab, 110); + addMix(Olive, HotPink, IndianRed, 60); + addMix(Olive, IndianRed, Peru, 80); + addMix(Olive, Khaki, DarkKhaki, 95); + addMix(Olive, Lavender, DarkKhaki, 75); + addMix(Olive, LemonChiffon, DarkKhaki, 90); + addMix(Olive, LightGray, DarkKhaki, 90); + addMix(Olive, LightSeaGreen, SeaGreen, 90); + addMix(Olive, LightSteelBlue, DarkKhaki, 80); + addMix(Olive, Lime, LimeGreen, 90); + addMix(Olive, LimeGreen, OliveDrab, 100); + addMix(Olive, Magenta, MediumVioletRed, 45); + addMix(Olive, Maroon, Sienna, 80); + addMix(Olive, MediumAquamarine, OliveDrab, 95); + addMix(Olive, MediumOrchid, IndianRed, 55); + addMix(Olive, MediumPurple, Gray, 60); + addMix(Olive, MediumSeaGreen, OliveDrab, 100); + addMix(Olive, MediumVioletRed, Brown, 60); + addMix(Olive, MistyRose, DarkKhaki, 85); + addMix(Olive, Navy, Gray, 50); + addMix(OliveDrab, Aquamarine, DarkSeaGreen, 90); + addMix(OliveDrab, Black, DarkOliveGreen, 75); + addMix(OliveDrab, Brown, Sienna, 70); + addMix(OliveDrab, CadetBlue, SeaGreen, 95); + addMix(OliveDrab, Chocolate, DarkGoldenrod, 85); + addMix(OliveDrab, Coral, DarkGoldenrod, 75); + addMix(OliveDrab, Crimson, Sienna, 65); + addMix(OliveDrab, Cyan, MediumAquamarine, 85); + addMix(OliveDrab, DarkGoldenrod, Olive, 100); + addMix(OliveDrab, DarkGray, DarkSeaGreen, 100); + addMix(OliveDrab, DarkGreen, Green, 105); + addMix(OliveDrab, DarkKhaki, Olive, 110); + addMix(OliveDrab, DarkOliveGreen, Olive, 115); + addMix(OliveDrab, DarkOrange, DarkGoldenrod, 85); + addMix(OliveDrab, DarkSalmon, DarkGoldenrod, 85); + addMix(OliveDrab, DarkSeaGreen, MediumSeaGreen, 110); + addMix(OliveDrab, DarkSlateBlue, DimGray, 55); + addMix(OliveDrab, DarkSlateGray, DarkOliveGreen, 90); + addMix(OliveDrab, DarkTurquoise, MediumSeaGreen, 90); + addMix(OliveDrab, DeepPink, IndianRed, 50); + addMix(OliveDrab, DeepSkyBlue, LightSeaGreen, 70); + addMix(OliveDrab, DimGray, DarkOliveGreen, 100); + addMix(OliveDrab, DodgerBlue, CadetBlue, 65); + addMix(OliveDrab, Gold, DarkKhaki, 95); + addMix(OliveDrab, Goldenrod, Olive, 100); + addMix(OliveDrab, Gray, DarkOliveGreen, 100); + addMix(OliveDrab, Green, SeaGreen, 115); + addMix(OliveDrab, HotPink, RosyBrown, 55); + addMix(OliveDrab, IndianRed, DarkGoldenrod, 70); + addMix(OliveDrab, Khaki, DarkKhaki, 100); + addMix(OliveDrab, Lavender, DarkSeaGreen, 80); + addMix(OliveDrab, LemonChiffon, DarkKhaki, 90); + addMix(OliveDrab, LightGray, DarkSeaGreen, 90); + addMix(OliveDrab, LightSeaGreen, MediumSeaGreen, 95); + addMix(OliveDrab, LightSteelBlue, DarkSeaGreen, 80); + addMix(OliveDrab, Lime, LimeGreen, 95); + addMix(OliveDrab, LimeGreen, MediumSeaGreen, 105); + addMix(OliveDrab, Maroon, Sienna, 70); + addMix(OliveDrab, MediumAquamarine, MediumSeaGreen, 100); + addMix(OliveDrab, MediumOrchid, RosyBrown, 50); + addMix(OliveDrab, MediumPurple, Gray, 55); + addMix(OliveDrab, MediumSeaGreen, SeaGreen, 110); + addMix(OliveDrab, MediumVioletRed, Brown, 50); + addMix(OliveDrab, MistyRose, DarkKhaki, 80); + addMix(Orange, Aquamarine, YellowGreen, 80); + addMix(Orange, Blue, Plum, 45); + addMix(Orange, Brown, Chocolate, 80); + addMix(Orange, CadetBlue, DarkKhaki, 85); + addMix(Orange, Chocolate, DarkOrange, 105); + addMix(Orange, Coral, DarkOrange, 105); + addMix(Orange, Crimson, Chocolate, 80); + addMix(Orange, Cyan, DarkSeaGreen, 75); + addMix(Orange, DarkGoldenrod, Goldenrod, 110); + addMix(Orange, DarkGray, Goldenrod, 95); + addMix(Orange, DarkGreen, Olive, 70); + addMix(Orange, DarkKhaki, Goldenrod, 105); + addMix(Orange, DarkOliveGreen, DarkGoldenrod, 85); + addMix(Orange, DarkOrange, SandyBrown, 120); + addMix(Orange, DarkSalmon, SandyBrown, 105); + addMix(Orange, DarkSeaGreen, DarkKhaki, 90); + addMix(Orange, DarkSlateBlue, Peru, 55); + addMix(Orange, DarkSlateGray, DarkGoldenrod, 70); + addMix(Orange, DarkTurquoise, DarkSeaGreen, 80); + addMix(Orange, DarkViolet, IndianRed, 55); + addMix(Orange, DeepPink, Salmon, 70); + addMix(Orange, DeepSkyBlue, DarkSeaGreen, 70); + addMix(Orange, DimGray, DarkGoldenrod, 85); + addMix(Orange, DodgerBlue, DarkSeaGreen, 65); + addMix(Orange, Gold, Goldenrod, 110); + addMix(Orange, Goldenrod, DarkGoldenrod, 120); + addMix(Orange, Gray, DarkGoldenrod, 90); + addMix(Orange, Green, OliveDrab, 75); + addMix(Orange, HotPink, Coral, 75); + addMix(Orange, IndianRed, Peru, 90); + addMix(Orange, Khaki, Gold, 105); + addMix(Orange, Lavender, Tan, 85); + addMix(Orange, LemonChiffon, Gold, 100); + addMix(Orange, LightGray, Goldenrod, 95); + addMix(Orange, LightSeaGreen, DarkKhaki, 80); + addMix(Orange, LightSteelBlue, Tan, 85); + addMix(Orange, Lime, YellowGreen, 75); + addMix(Orange, LimeGreen, YellowGreen, 80); + addMix(Orange, Magenta, PaleVioletRed, 60); + addMix(Orange, Maroon, Chocolate, 70); + addMix(Orange, MediumAquamarine, DarkKhaki, 80); + addMix(Orange, MediumOrchid, Salmon, 65); + addMix(Orange, MediumPurple, DarkSalmon, 65); + addMix(Orange, MediumSeaGreen, DarkKhaki, 80); + addMix(Orange, MediumVioletRed, Red, 65); + addMix(Orange, MistyRose, SandyBrown, 95); + addMix(Orange, Olive, DarkGoldenrod, 95); + addMix(Orange, OliveDrab, Goldenrod, 90); + addMix(PaleGreen, Aquamarine, SpringGreen, 115); + addMix(PaleGreen, Blue, SteelBlue, 50); + addMix(PaleGreen, Brown, DarkKhaki, 45); + addMix(PaleGreen, CadetBlue, MediumAquamarine, 95); + addMix(PaleGreen, Chocolate, DarkKhaki, 65); + addMix(PaleGreen, Coral, DarkKhaki, 65); + addMix(PaleGreen, Cyan, Aquamarine, 100); + addMix(PaleGreen, DarkGoldenrod, YellowGreen, 85); + addMix(PaleGreen, DarkGray, DarkSeaGreen, 95); + addMix(PaleGreen, DarkGreen, MediumSeaGreen, 80); + addMix(PaleGreen, DarkKhaki, YellowGreen, 105); + addMix(PaleGreen, DarkOliveGreen, DarkSeaGreen, 85); + addMix(PaleGreen, DarkOrange, DarkKhaki, 75); + addMix(PaleGreen, DarkSalmon, DarkKhaki, 75); + addMix(PaleGreen, DarkSeaGreen, MediumAquamarine, 110); + addMix(PaleGreen, DarkSlateBlue, CadetBlue, 55); + addMix(PaleGreen, DarkSlateGray, MediumSeaGreen, 70); + addMix(PaleGreen, DarkTurquoise, MediumAquamarine, 95); + addMix(PaleGreen, DarkViolet, MediumPurple, 55); + addMix(PaleGreen, DeepSkyBlue, Turquoise, 75); + addMix(PaleGreen, DimGray, DarkSeaGreen, 80); + addMix(PaleGreen, DodgerBlue, DarkTurquoise, 65); + addMix(PaleGreen, Gold, YellowGreen, 95); + addMix(PaleGreen, Goldenrod, YellowGreen, 90); + addMix(PaleGreen, Gray, DarkSeaGreen, 90); + addMix(PaleGreen, Green, LimeGreen, 90); + addMix(PaleGreen, IndianRed, DarkKhaki, 55); + addMix(PaleGreen, Khaki, YellowGreen, 105); + addMix(PaleGreen, Lavender, Aquamarine, 90); + addMix(PaleGreen, LightGray, DarkSeaGreen, 100); + addMix(PaleGreen, LightSeaGreen, MediumAquamarine, 100); + addMix(PaleGreen, LightSteelBlue, MediumAquamarine, 90); + addMix(PaleGreen, Lime, SpringGreen, 115); + addMix(PaleGreen, LimeGreen, SpringGreen, 115); + addMix(PaleGreen, MediumAquamarine, Aquamarine, 110); + addMix(PaleGreen, MediumOrchid, DarkGray, 65); + addMix(PaleGreen, MediumPurple, CadetBlue, 65); + addMix(PaleGreen, MediumSeaGreen, LimeGreen, 110); + addMix(PaleGreen, MistyRose, LemonChiffon, 90); + addMix(PaleGreen, Olive, YellowGreen, 90); + addMix(PaleGreen, OliveDrab, LimeGreen, 95); + addMix(PaleGreen, Orange, Khaki, 80); + addMix(PaleTurquoise, Aquamarine, Turquoise, 110); + addMix(PaleTurquoise, Blue, RoyalBlue, 65); + addMix(PaleTurquoise, Brown, RosyBrown, 60); + addMix(PaleTurquoise, CadetBlue, DarkTurquoise, 105); + addMix(PaleTurquoise, Chocolate, Tan, 75); + addMix(PaleTurquoise, Coral, Tan, 80); + addMix(PaleTurquoise, Crimson, PaleVioletRed, 65); + addMix(PaleTurquoise, Cyan, Turquoise, 115); + addMix(PaleTurquoise, DarkGoldenrod, DarkKhaki, 85); + addMix(PaleTurquoise, DarkGray, SkyBlue, 105); + addMix(PaleTurquoise, DarkGreen, MediumSeaGreen, 75); + addMix(PaleTurquoise, DarkKhaki, DarkSeaGreen, 95); + addMix(PaleTurquoise, DarkOliveGreen, DarkSeaGreen, 80); + addMix(PaleTurquoise, DarkOrange, DarkKhaki, 80); + addMix(PaleTurquoise, DarkSalmon, LightGray, 85); + addMix(PaleTurquoise, DarkSeaGreen, MediumAquamarine, 105); + addMix(PaleTurquoise, DarkSlateBlue, SteelBlue, 65); + addMix(PaleTurquoise, DarkSlateGray, CadetBlue, 75); + addMix(PaleTurquoise, DarkTurquoise, Turquoise, 115); + addMix(PaleTurquoise, DarkViolet, MediumPurple, 75); + addMix(PaleTurquoise, DeepPink, Plum, 75); + addMix(PaleTurquoise, DeepSkyBlue, SkyBlue, 105); + addMix(PaleTurquoise, DimGray, CadetBlue, 85); + addMix(PaleTurquoise, DodgerBlue, DeepSkyBlue, 90); + addMix(PaleTurquoise, Gold, Khaki, 90); + addMix(PaleTurquoise, Goldenrod, DarkKhaki, 85); + addMix(PaleTurquoise, Gray, CadetBlue, 95); + addMix(PaleTurquoise, Green, MediumSeaGreen, 80); + addMix(PaleTurquoise, HotPink, Plum, 80); + addMix(PaleTurquoise, IndianRed, RosyBrown, 70); + addMix(PaleTurquoise, Indigo, MediumPurple, 50); + addMix(PaleTurquoise, Khaki, LemonChiffon, 95); + addMix(PaleTurquoise, Lavender, SkyBlue, 105); + addMix(PaleTurquoise, LightGray, SkyBlue, 110); + addMix(PaleTurquoise, LightSeaGreen, DarkTurquoise, 110); + addMix(PaleTurquoise, LightSteelBlue, SkyBlue, 110); + addMix(PaleTurquoise, Lime, SpringGreen, 95); + addMix(PaleTurquoise, LimeGreen, PaleGreen, 95); + addMix(PaleTurquoise, Magenta, Violet, 85); + addMix(PaleTurquoise, Maroon, RosyBrown, 50); + addMix(PaleTurquoise, MediumAquamarine, Turquoise, 110); + addMix(PaleTurquoise, MediumOrchid, Plum, 85); + addMix(PaleTurquoise, MediumPurple, LightSteelBlue, 85); + addMix(PaleTurquoise, MediumSeaGreen, MediumAquamarine, 100); + addMix(PaleTurquoise, MediumVioletRed, Plum, 70); + addMix(PaleTurquoise, MistyRose, LightGray, 95); + addMix(PaleTurquoise, Olive, DarkSeaGreen, 85); + addMix(PaleTurquoise, OliveDrab, DarkSeaGreen, 85); + addMix(PaleTurquoise, Orange, DarkKhaki, 85); + addMix(PaleTurquoise, PaleGreen, Aquamarine, 100); + addMix(PaleVioletRed, Aquamarine, DarkGray, 55); + addMix(PaleVioletRed, Blue, DarkViolet, 85); + addMix(PaleVioletRed, Brown, IndianRed, 100); + addMix(PaleVioletRed, CadetBlue, RosyBrown, 80); + addMix(PaleVioletRed, Chocolate, IndianRed, 95); + addMix(PaleVioletRed, Coral, Salmon, 100); + addMix(PaleVioletRed, Crimson, IndianRed, 105); + addMix(PaleVioletRed, Cyan, SkyBlue, 50); + addMix(PaleVioletRed, DarkGoldenrod, Chocolate, 80); + addMix(PaleVioletRed, DarkGray, RosyBrown, 100); + addMix(PaleVioletRed, DarkGreen, DarkOliveGreen, 55); + addMix(PaleVioletRed, DarkKhaki, DarkSalmon, 75); + addMix(PaleVioletRed, DarkOliveGreen, Sienna, 70); + addMix(PaleVioletRed, DarkOrange, Coral, 85); + addMix(PaleVioletRed, DarkSalmon, Salmon, 105); + addMix(PaleVioletRed, DarkSeaGreen, RosyBrown, 70); + addMix(PaleVioletRed, DarkSlateBlue, MediumVioletRed, 90); + addMix(PaleVioletRed, DarkTurquoise, CadetBlue, 60); + addMix(PaleVioletRed, DarkViolet, MediumOrchid, 95); + addMix(PaleVioletRed, DeepPink, HotPink, 115); + addMix(PaleVioletRed, DeepSkyBlue, DodgerBlue, 70); + addMix(PaleVioletRed, DodgerBlue, MediumPurple, 85); + addMix(PaleVioletRed, Gold, SandyBrown, 65); + addMix(PaleVioletRed, Goldenrod, Peru, 80); + addMix(PaleVioletRed, Gray, RosyBrown, 100); + addMix(PaleVioletRed, Green, DarkOliveGreen, 55); + addMix(PaleVioletRed, HotPink, DeepPink, 120); + addMix(PaleVioletRed, Indigo, Purple, 85); + addMix(PaleVioletRed, Khaki, DarkSalmon, 70); + addMix(PaleVioletRed, Lavender, Thistle, 95); + addMix(PaleVioletRed, LemonChiffon, Pink, 80); + addMix(PaleVioletRed, LightGray, Pink, 95); + addMix(PaleVioletRed, LightSeaGreen, SlateGray, 65); + addMix(PaleVioletRed, LightSteelBlue, Plum, 90); + addMix(PaleVioletRed, LimeGreen, DarkSeaGreen, 50); + addMix(PaleVioletRed, Magenta, MediumOrchid, 105); + addMix(PaleVioletRed, Maroon, Brown, 90); + addMix(PaleVioletRed, MediumAquamarine, DarkGray, 60); + addMix(PaleVioletRed, MediumOrchid, HotPink, 105); + addMix(PaleVioletRed, MediumPurple, MediumOrchid, 100); + addMix(PaleVioletRed, MediumSeaGreen, Gray, 55); + addMix(PaleVioletRed, MediumVioletRed, DeepPink, 110); + addMix(PaleVioletRed, MistyRose, Pink, 95); + addMix(PaleVioletRed, Navy, Purple, 80); + addMix(PaleVioletRed, Olive, Peru, 70); + addMix(PaleVioletRed, OliveDrab, Peru, 65); + addMix(PaleVioletRed, Orange, SandyBrown, 80); + addMix(PaleVioletRed, PaleGreen, DarkKhaki, 55); + addMix(PaleVioletRed, PaleTurquoise, Thistle, 80); + addMix(Peru, Aquamarine, DarkSeaGreen, 75); + addMix(Peru, Blue, DarkSlateBlue, 60); + addMix(Peru, Brown, Sienna, 95); + addMix(Peru, Chocolate, DarkOrange, 120); + addMix(Peru, Coral, Chocolate, 115); + addMix(Peru, Crimson, IndianRed, 95); + addMix(Peru, Cyan, MediumAquamarine, 75); + addMix(Peru, DarkGoldenrod, Goldenrod, 115); + addMix(Peru, DarkGray, Tan, 100); + addMix(Peru, DarkGreen, DarkOliveGreen, 80); + addMix(Peru, DarkKhaki, Goldenrod, 105); + addMix(Peru, DarkOliveGreen, Olive, 90); + addMix(Peru, DarkOrange, SandyBrown, 115); + addMix(Peru, DarkSalmon, SandyBrown, 115); + addMix(Peru, DarkSeaGreen, DarkKhaki, 90); + addMix(Peru, DarkTurquoise, MediumSeaGreen, 80); + addMix(Peru, DarkViolet, MediumVioletRed, 65); + addMix(Peru, DeepPink, IndianRed, 85); + addMix(Peru, DeepSkyBlue, CadetBlue, 75); + addMix(Peru, DodgerBlue, SlateGray, 75); + addMix(Peru, Gold, Goldenrod, 100); + addMix(Peru, Goldenrod, DarkGoldenrod, 110); + addMix(Peru, Green, OliveDrab, 80); + addMix(Peru, HotPink, Salmon, 85); + addMix(Peru, IndianRed, Chocolate, 100); + addMix(Peru, Indigo, MediumVioletRed, 65); + addMix(Peru, Khaki, Goldenrod, 95); + addMix(Peru, Lavender, Tan, 90); + addMix(Peru, LemonChiffon, Tan, 95); + addMix(Peru, LightGray, Tan, 95); + addMix(Peru, LightSeaGreen, DarkSeaGreen, 80); + addMix(Peru, LightSteelBlue, Tan, 90); + addMix(Peru, Lime, LimeGreen, 75); + addMix(Peru, LimeGreen, OliveDrab, 80); + addMix(Peru, Magenta, DeepPink, 70); + addMix(Peru, Maroon, Sienna, 90); + addMix(Peru, MediumAquamarine, DarkSeaGreen, 85); + addMix(Peru, MediumOrchid, PaleVioletRed, 75); + addMix(Peru, MediumPurple, PaleVioletRed, 75); + addMix(Peru, MediumSeaGreen, OliveDrab, 80); + addMix(Peru, MediumVioletRed, IndianRed, 80); + addMix(Peru, MistyRose, Tan, 95); + addMix(Peru, Olive, DarkGoldenrod, 100); + addMix(Peru, OliveDrab, Olive, 95); + addMix(Peru, Orange, DarkOrange, 115); + addMix(Peru, PaleGreen, DarkKhaki, 80); + addMix(Peru, PaleTurquoise, DarkKhaki, 85); + addMix(Peru, PaleVioletRed, Salmon, 90); + addMix(Pink, Aquamarine, PaleTurquoise, 75); + addMix(Pink, Blue, SlateBlue, 70); + addMix(Pink, Brown, IndianRed, 85); + addMix(Pink, CadetBlue, DarkGray, 80); + addMix(Pink, Chocolate, DarkSalmon, 90); + addMix(Pink, Coral, DarkSalmon, 100); + addMix(Pink, Crimson, PaleVioletRed, 90); + addMix(Pink, Cyan, PaleTurquoise, 60); + addMix(Pink, DarkGoldenrod, SandyBrown, 85); + addMix(Pink, DarkGray, Thistle, 105); + addMix(Pink, DarkGreen, OliveDrab, 60); + addMix(Pink, DarkKhaki, Tan, 90); + addMix(Pink, DarkOliveGreen, Tan, 70); + addMix(Pink, DarkOrange, SandyBrown, 95); + addMix(Pink, DarkSalmon, Salmon, 110); + addMix(Pink, DarkSeaGreen, Tan, 80); + addMix(Pink, DarkSlateGray, Gray, 65); + addMix(Pink, DarkTurquoise, SkyBlue, 65); + addMix(Pink, DarkViolet, MediumOrchid, 80); + addMix(Pink, DeepPink, HotPink, 100); + addMix(Pink, DeepSkyBlue, SkyBlue, 80); + addMix(Pink, DimGray, RosyBrown, 90); + addMix(Pink, DodgerBlue, LightSteelBlue, 85); + addMix(Pink, Gold, Goldenrod, 80); + addMix(Pink, Goldenrod, SandyBrown, 90); + addMix(Pink, Gray, RosyBrown, 95); + addMix(Pink, Green, DarkSeaGreen, 60); + addMix(Pink, HotPink, PaleVioletRed, 105); + addMix(Pink, IndianRed, Salmon, 100); + addMix(Pink, Indigo, MediumOrchid, 60); + addMix(Pink, Khaki, Wheat, 90); + addMix(Pink, Lavender, Thistle, 105); + addMix(Pink, LemonChiffon, MistyRose, 95); + addMix(Pink, LightGray, MistyRose, 105); + addMix(Pink, LightSeaGreen, CadetBlue, 70); + addMix(Pink, LightSteelBlue, Thistle, 100); + addMix(Pink, Lime, LimeGreen, 60); + addMix(Pink, LimeGreen, DarkSeaGreen, 65); + addMix(Pink, Magenta, Violet, 95); + addMix(Pink, Maroon, IndianRed, 65); + addMix(Pink, MediumAquamarine, LightGray, 75); + addMix(Pink, MediumOrchid, Plum, 95); + addMix(Pink, MediumPurple, Plum, 95); + addMix(Pink, MediumSeaGreen, DarkSeaGreen, 70); + addMix(Pink, MediumVioletRed, HotPink, 90); + addMix(Pink, MistyRose, Thistle, 115); + addMix(Pink, Navy, SlateBlue, 50); + addMix(Pink, Olive, Tan, 75); + addMix(Pink, OliveDrab, DarkKhaki, 75); + addMix(Pink, Orange, SandyBrown, 90); + addMix(Pink, PaleGreen, LemonChiffon, 70); + addMix(Pink, PaleTurquoise, LightGray, 80); + addMix(Pink, PaleVioletRed, HotPink, 105); + addMix(Pink, Peru, DarkSalmon, 95); + addMix(Plum, Aquamarine, SkyBlue, 80); + addMix(Plum, Blue, SlateBlue, 80); + addMix(Plum, Brown, PaleVioletRed, 85); + addMix(Plum, CadetBlue, LightSteelBlue, 90); + addMix(Plum, Chocolate, Salmon, 85); + addMix(Plum, Coral, Salmon, 90); + addMix(Plum, Crimson, PaleVioletRed, 90); + addMix(Plum, Cyan, SkyBlue, 75); + addMix(Plum, DarkGoldenrod, DarkSalmon, 75); + addMix(Plum, DarkGray, Thistle, 105); + addMix(Plum, DarkKhaki, RosyBrown, 75); + addMix(Plum, DarkOliveGreen, RosyBrown, 65); + addMix(Plum, DarkOrange, DarkSalmon, 80); + addMix(Plum, DarkSalmon, Pink, 95); + addMix(Plum, DarkSeaGreen, DarkGray, 70); + addMix(Plum, DarkSlateBlue, MediumPurple, 80); + addMix(Plum, DarkTurquoise, SkyBlue, 80); + addMix(Plum, DarkViolet, MediumOrchid, 90); + addMix(Plum, DeepPink, HotPink, 105); + addMix(Plum, DeepSkyBlue, DodgerBlue, 80); + addMix(Plum, Gold, Tan, 65); + addMix(Plum, Goldenrod, DarkSalmon, 75); + addMix(Plum, Gray, RosyBrown, 100); + addMix(Plum, Green, SeaGreen, 50); + addMix(Plum, HotPink, Violet, 115); + addMix(Plum, IndianRed, PaleVioletRed, 95); + addMix(Plum, Indigo, MediumOrchid, 70); + addMix(Plum, Khaki, MistyRose, 70); + addMix(Plum, Lavender, Thistle, 105); + addMix(Plum, LemonChiffon, MistyRose, 80); + addMix(Plum, LightGray, Thistle, 100); + addMix(Plum, LightSeaGreen, SkyBlue, 80); + addMix(Plum, LightSteelBlue, Thistle, 105); + addMix(Plum, Lime, LimeGreen, 45); + addMix(Plum, LimeGreen, DarkSeaGreen, 50); + addMix(Plum, Magenta, Violet, 105); + addMix(Plum, Maroon, MediumVioletRed, 70); + addMix(Plum, MediumAquamarine, LightSteelBlue, 85); + addMix(Plum, MediumOrchid, Violet, 105); + addMix(Plum, MediumPurple, Violet, 105); + addMix(Plum, MediumSeaGreen, CadetBlue, 80); + addMix(Plum, MediumVioletRed, MediumOrchid, 100); + addMix(Plum, MistyRose, Thistle, 105); + addMix(Plum, Navy, SlateBlue, 65); + addMix(Plum, Olive, Tan, 65); + addMix(Plum, OliveDrab, Tan, 60); + addMix(Plum, Orange, SandyBrown, 75); + addMix(Plum, PaleGreen, DarkSeaGreen, 55); + addMix(Plum, PaleTurquoise, Lavender, 90); + addMix(Plum, PaleVioletRed, HotPink, 110); + addMix(Plum, Peru, RosyBrown, 85); + addMix(Plum, Pink, Thistle, 110); + addMix(Purple, Aquamarine, MediumPurple, 50); + addMix(Purple, Black, Indigo, 95); + addMix(Purple, Blue, Indigo, 105); + addMix(Purple, Brown, MediumVioletRed, 95); + addMix(Purple, CadetBlue, DarkSlateBlue, 80); + addMix(Purple, Chocolate, Brown, 75); + addMix(Purple, Coral, MediumVioletRed, 70); + addMix(Purple, Crimson, MediumVioletRed, 95); + addMix(Purple, Cyan, SteelBlue, 50); + addMix(Purple, DarkGoldenrod, Brown, 60); + addMix(Purple, DarkGray, MediumVioletRed, 80); + addMix(Purple, DarkOrange, Crimson, 60); + addMix(Purple, DarkSalmon, MediumVioletRed, 75); + addMix(Purple, DarkSlateBlue, Indigo, 110); + addMix(Purple, DarkSlateGray, Indigo, 105); + addMix(Purple, DarkTurquoise, RoyalBlue, 60); + addMix(Purple, DarkViolet, Indigo, 115); + addMix(Purple, DeepPink, MediumVioletRed, 100); + addMix(Purple, DeepSkyBlue, RoyalBlue, 60); + addMix(Purple, DodgerBlue, SlateBlue, 80); + addMix(Purple, Goldenrod, IndianRed, 50); + addMix(Purple, HotPink, MediumVioletRed, 90); + addMix(Purple, IndianRed, MediumVioletRed, 90); + addMix(Purple, Lavender, MediumOrchid, 65); + addMix(Purple, LemonChiffon, PaleVioletRed, 50); + addMix(Purple, LightGray, MediumOrchid, 70); + addMix(Purple, LightSeaGreen, DarkSlateBlue, 65); + addMix(Purple, LightSteelBlue, MediumOrchid, 70); + addMix(Purple, Magenta, DarkViolet, 95); + addMix(Purple, MediumAquamarine, SlateBlue, 60); + addMix(Purple, MediumOrchid, DarkViolet, 105); + addMix(Purple, MediumPurple, DarkViolet, 100); + addMix(Purple, MistyRose, PaleVioletRed, 65); + addMix(Purple, Navy, Indigo, 110); + addMix(Purple, Olive, Brown, 55); + addMix(Purple, Orange, IndianRed, 50); + addMix(Purple, PaleTurquoise, MediumPurple, 65); + addMix(Purple, PaleVioletRed, MediumVioletRed, 95); + addMix(Purple, Peru, MediumVioletRed, 70); + addMix(Purple, Pink, MediumOrchid, 70); + addMix(Purple, Plum, MediumOrchid, 80); + addMix(Red, Aquamarine, DarkSalmon, 50); + addMix(Red, Black, Maroon, 75); + addMix(Red, Blue, Magenta, 70); + addMix(Red, Brown, Crimson, 110); + addMix(Red, CadetBlue, IndianRed, 75); + addMix(Red, Crimson, IndianRed, 115); + addMix(Red, DarkGoldenrod, Chocolate, 90); + addMix(Red, DarkGray, IndianRed, 90); + addMix(Red, DarkGreen, Maroon, 55); + addMix(Red, DarkKhaki, Chocolate, 80); + addMix(Red, DarkOliveGreen, Brown, 70); + addMix(Red, DarkOrange, Coral, 100); + addMix(Red, DarkSalmon, IndianRed, 105); + addMix(Red, DarkSeaGreen, IndianRed, 65); + addMix(Red, DarkSlateBlue, Brown, 80); + addMix(Red, DarkSlateGray, Brown, 75); + addMix(Red, DarkTurquoise, DimGray, 60); + addMix(Red, DarkViolet, MediumVioletRed, 80); + addMix(Red, DeepPink, Crimson, 95); + addMix(Red, DeepSkyBlue, Plum, 60); + addMix(Red, DimGray, Brown, 95); + addMix(Red, DodgerBlue, MediumVioletRed, 75); + addMix(Red, Gold, Chocolate, 75); + addMix(Red, Goldenrod, Chocolate, 85); + addMix(Red, Gray, Crimson, 95); + addMix(Red, Green, Sienna, 50); + addMix(Red, HotPink, IndianRed, 95); + addMix(Red, IndianRed, Crimson, 110); + addMix(Red, Indigo, Brown, 75); + addMix(Red, Khaki, Coral, 75); + addMix(Red, Lavender, Salmon, 80); + addMix(Red, LemonChiffon, Salmon, 75); + addMix(Red, LightGray, IndianRed, 85); + addMix(Red, LightSeaGreen, Sienna, 60); + addMix(Red, LightSteelBlue, IndianRed, 80); + addMix(Red, Magenta, DeepPink, 85); + addMix(Red, Maroon, Brown, 100); + addMix(Red, MediumAquamarine, IndianRed, 60); + addMix(Red, MediumOrchid, DeepPink, 85); + addMix(Red, MediumPurple, MediumVioletRed, 80); + addMix(Red, MediumSeaGreen, Sienna, 55); + addMix(Red, MediumVioletRed, Crimson, 95); + addMix(Red, MistyRose, Salmon, 85); + addMix(Red, Olive, Sienna, 75); + addMix(Red, OliveDrab, Sienna, 65); + addMix(Red, Orange, Coral, 90); + addMix(Red, PaleGreen, Peru, 50); + addMix(Red, PaleTurquoise, IndianRed, 65); + addMix(Red, PaleVioletRed, Crimson, 100); + addMix(Red, Peru, Chocolate, 105); + addMix(Red, Pink, Salmon, 90); + addMix(Red, Plum, IndianRed, 85); + addMix(Red, Purple, Crimson, 80); + addMix(RosyBrown, Aquamarine, DarkSeaGreen, 75); + addMix(RosyBrown, Blue, SlateBlue, 80); + addMix(RosyBrown, Brown, IndianRed, 95); + addMix(RosyBrown, CadetBlue, DarkGray, 90); + addMix(RosyBrown, Chocolate, Peru, 105); + addMix(RosyBrown, Coral, DarkSalmon, 105); + addMix(RosyBrown, Crimson, IndianRed, 100); + addMix(RosyBrown, Cyan, DarkTurquoise, 75); + addMix(RosyBrown, DarkGoldenrod, Peru, 95); + addMix(RosyBrown, DarkGreen, DarkOliveGreen, 75); + addMix(RosyBrown, DarkKhaki, Tan, 95); + addMix(RosyBrown, DarkOrange, Peru, 100); + addMix(RosyBrown, DarkSalmon, Salmon, 115); + addMix(RosyBrown, DarkSeaGreen, DarkGray, 85); + addMix(RosyBrown, DarkSlateGray, DimGray, 80); + addMix(RosyBrown, DarkTurquoise, CadetBlue, 80); + addMix(RosyBrown, DarkViolet, MediumOrchid, 85); + addMix(RosyBrown, DeepPink, PaleVioletRed, 105); + addMix(RosyBrown, DeepSkyBlue, SkyBlue, 85); + addMix(RosyBrown, DimGray, Gray, 100); + addMix(RosyBrown, DodgerBlue, SteelBlue, 90); + addMix(RosyBrown, Gold, Goldenrod, 85); + addMix(RosyBrown, Goldenrod, Peru, 95); + addMix(RosyBrown, Green, OliveDrab, 75); + addMix(RosyBrown, HotPink, PaleVioletRed, 105); + addMix(RosyBrown, IndianRed, PaleVioletRed, 110); + addMix(RosyBrown, Indigo, Purple, 80); + addMix(RosyBrown, Khaki, Tan, 90); + addMix(RosyBrown, Lavender, Thistle, 100); + addMix(RosyBrown, LemonChiffon, Tan, 90); + addMix(RosyBrown, LightGray, DarkGray, 105); + addMix(RosyBrown, LightSeaGreen, CadetBlue, 85); + addMix(RosyBrown, LightSteelBlue, Thistle, 100); + addMix(RosyBrown, Lime, LimeGreen, 65); + addMix(RosyBrown, LimeGreen, DarkSeaGreen, 75); + addMix(RosyBrown, Magenta, MediumOrchid, 95); + addMix(RosyBrown, Maroon, Brown, 85); + addMix(RosyBrown, MediumAquamarine, DarkSeaGreen, 80); + addMix(RosyBrown, MediumOrchid, PaleVioletRed, 100); + addMix(RosyBrown, MediumPurple, Plum, 100); + addMix(RosyBrown, MediumSeaGreen, DarkSeaGreen, 80); + addMix(RosyBrown, MediumVioletRed, DeepPink, 100); + addMix(RosyBrown, MistyRose, Pink, 105); + addMix(RosyBrown, Navy, DarkSlateBlue, 75); + addMix(RosyBrown, Olive, DarkGoldenrod, 90); + addMix(RosyBrown, OliveDrab, Olive, 85); + addMix(RosyBrown, Orange, SandyBrown, 95); + addMix(RosyBrown, PaleGreen, DarkSeaGreen, 75); + addMix(RosyBrown, PaleTurquoise, DarkGray, 85); + addMix(RosyBrown, PaleVioletRed, HotPink, 115); + addMix(RosyBrown, Peru, DarkSalmon, 105); + addMix(RosyBrown, Pink, Thistle, 110); + addMix(RosyBrown, Plum, Thistle, 105); + addMix(RosyBrown, Purple, MediumVioletRed, 85); + addMix(RosyBrown, Red, IndianRed, 100); + addMix(RoyalBlue, Aquamarine, DeepSkyBlue, 70); + addMix(RoyalBlue, Black, DarkSlateBlue, 80); + addMix(RoyalBlue, Blue, SlateBlue, 105); + addMix(RoyalBlue, Brown, DarkSlateBlue, 85); + addMix(RoyalBlue, CadetBlue, SteelBlue, 95); + addMix(RoyalBlue, Crimson, Purple, 85); + addMix(RoyalBlue, Cyan, DeepSkyBlue, 75); + addMix(RoyalBlue, DarkGoldenrod, Gray, 65); + addMix(RoyalBlue, DarkGray, SteelBlue, 95); + addMix(RoyalBlue, DarkGreen, DarkSlateGray, 70); + addMix(RoyalBlue, DarkKhaki, SlateGray, 60); + addMix(RoyalBlue, DarkOliveGreen, SteelBlue, 70); + addMix(RoyalBlue, DarkOrange, RosyBrown, 65); + addMix(RoyalBlue, DarkSalmon, MediumPurple, 80); + addMix(RoyalBlue, DarkSeaGreen, SteelBlue, 75); + addMix(RoyalBlue, DarkSlateBlue, SlateBlue, 110); + addMix(RoyalBlue, DarkSlateGray, SlateBlue, 95); + addMix(RoyalBlue, DarkTurquoise, DodgerBlue, 85); + addMix(RoyalBlue, DarkViolet, Blue, 105); + addMix(RoyalBlue, DeepPink, DarkViolet, 90); + addMix(RoyalBlue, DeepSkyBlue, DodgerBlue, 95); + addMix(RoyalBlue, DimGray, SlateBlue, 100); + addMix(RoyalBlue, DodgerBlue, SteelBlue, 110); + addMix(RoyalBlue, Gold, DarkKhaki, 50); + addMix(RoyalBlue, Goldenrod, Gray, 60); + addMix(RoyalBlue, Gray, SteelBlue, 100); + addMix(RoyalBlue, Green, Teal, 65); + addMix(RoyalBlue, HotPink, MediumPurple, 90); + addMix(RoyalBlue, IndianRed, MediumPurple, 85); + addMix(RoyalBlue, Indigo, DarkSlateBlue, 100); + addMix(RoyalBlue, Khaki, DarkGray, 55); + addMix(RoyalBlue, Lavender, LightSteelBlue, 85); + addMix(RoyalBlue, LemonChiffon, LightSteelBlue, 65); + addMix(RoyalBlue, LightGray, LightSteelBlue, 85); + addMix(RoyalBlue, LightSeaGreen, SteelBlue, 85); + addMix(RoyalBlue, LightSteelBlue, DodgerBlue, 100); + addMix(RoyalBlue, Lime, MediumSeaGreen, 55); + addMix(RoyalBlue, LimeGreen, LightSeaGreen, 60); + addMix(RoyalBlue, Magenta, DarkViolet, 95); + addMix(RoyalBlue, Maroon, Purple, 80); + addMix(RoyalBlue, MediumAquamarine, DodgerBlue, 80); + addMix(RoyalBlue, MediumOrchid, SlateBlue, 105); + addMix(RoyalBlue, MediumPurple, SlateBlue, 115); + addMix(RoyalBlue, MediumSeaGreen, SteelBlue, 75); + addMix(RoyalBlue, MediumVioletRed, DarkViolet, 95); + addMix(RoyalBlue, MistyRose, LightSteelBlue, 80); + addMix(RoyalBlue, Navy, DarkSlateBlue, 95); + addMix(RoyalBlue, Olive, DimGray, 60); + addMix(RoyalBlue, OliveDrab, SlateGray, 65); + addMix(RoyalBlue, PaleGreen, CadetBlue, 60); + addMix(RoyalBlue, PaleTurquoise, DodgerBlue, 80); + addMix(RoyalBlue, PaleVioletRed, MediumPurple, 90); + addMix(RoyalBlue, Pink, MediumPurple, 85); + addMix(RoyalBlue, Plum, MediumPurple, 95); + addMix(RoyalBlue, Purple, DarkSlateBlue, 95); + addMix(RoyalBlue, Red, MediumVioletRed, 75); + addMix(RoyalBlue, RosyBrown, MediumPurple, 90); + addMix(Salmon, Aquamarine, DarkKhaki, 60); + addMix(Salmon, Black, Brown, 65); + addMix(Salmon, Blue, DarkViolet, 70); + addMix(Salmon, Brown, IndianRed, 95); + addMix(Salmon, CadetBlue, RosyBrown, 80); + addMix(Salmon, Chocolate, Coral, 110); + addMix(Salmon, Coral, DarkSalmon, 120); + addMix(Salmon, Crimson, IndianRed, 105); + addMix(Salmon, Cyan, LightSeaGreen, 65); + addMix(Salmon, DarkGoldenrod, Peru, 95); + addMix(Salmon, DarkGray, RosyBrown, 100); + addMix(Salmon, DarkGreen, Olive, 60); + addMix(Salmon, DarkKhaki, SandyBrown, 90); + addMix(Salmon, DarkOliveGreen, Peru, 75); + addMix(Salmon, DarkOrange, Coral, 105); + addMix(Salmon, DarkSalmon, Coral, 120); + addMix(Salmon, DarkSeaGreen, Tan, 75); + addMix(Salmon, DarkSlateBlue, MediumVioletRed, 75); + addMix(Salmon, DarkTurquoise, CadetBlue, 70); + addMix(Salmon, DarkViolet, MediumVioletRed, 80); + addMix(Salmon, DeepPink, PaleVioletRed, 105); + addMix(Salmon, DeepSkyBlue, SlateGray, 70); + addMix(Salmon, DimGray, IndianRed, 95); + addMix(Salmon, DodgerBlue, MediumPurple, 80); + addMix(Salmon, Gold, Orange, 80); + addMix(Salmon, Goldenrod, SandyBrown, 95); + addMix(Salmon, Gray, RosyBrown, 100); + addMix(Salmon, Green, Olive, 60); + addMix(Salmon, HotPink, PaleVioletRed, 105); + addMix(Salmon, IndianRed, DarkSalmon, 115); + addMix(Salmon, Indigo, MediumVioletRed, 70); + addMix(Salmon, Khaki, SandyBrown, 85); + addMix(Salmon, Lavender, Pink, 95); + addMix(Salmon, LemonChiffon, DarkSalmon, 85); + addMix(Salmon, LightGray, DarkSalmon, 100); + addMix(Salmon, LightSeaGreen, DarkGray, 70); + addMix(Salmon, LightSteelBlue, RosyBrown, 90); + addMix(Salmon, Lime, YellowGreen, 50); + addMix(Salmon, LimeGreen, DarkKhaki, 55); + addMix(Salmon, Magenta, HotPink, 90); + addMix(Salmon, Maroon, Crimson, 85); + addMix(Salmon, MediumAquamarine, Tan, 70); + addMix(Salmon, MediumOrchid, PaleVioletRed, 90); + addMix(Salmon, MediumPurple, PaleVioletRed, 90); + addMix(Salmon, MediumSeaGreen, DarkKhaki, 65); + addMix(Salmon, MediumVioletRed, DeepPink, 95); + addMix(Salmon, MistyRose, Pink, 100); + addMix(Salmon, Navy, Purple, 65); + addMix(Salmon, Olive, Peru, 80); + addMix(Salmon, OliveDrab, Peru, 75); + addMix(Salmon, Orange, DarkOrange, 95); + addMix(Salmon, PaleGreen, DarkKhaki, 60); + addMix(Salmon, PaleTurquoise, MistyRose, 80); + addMix(Salmon, PaleVioletRed, IndianRed, 110); + addMix(Salmon, Peru, Coral, 105); + addMix(Salmon, Pink, DarkSalmon, 110); + addMix(Salmon, Plum, PaleVioletRed, 100); + addMix(Salmon, Purple, MediumVioletRed, 80); + addMix(Salmon, Red, IndianRed, 110); + addMix(Salmon, RosyBrown, DarkSalmon, 110); + addMix(Salmon, RoyalBlue, MediumPurple, 80); + addMix(SandyBrown, Aquamarine, DarkSeaGreen, 80); + addMix(SandyBrown, Black, Sienna, 60); + addMix(SandyBrown, Blue, SlateBlue, 55); + addMix(SandyBrown, Brown, Chocolate, 85); + addMix(SandyBrown, CadetBlue, Tan, 85); + addMix(SandyBrown, Chocolate, Peru, 110); + addMix(SandyBrown, Coral, DarkSalmon, 115); + addMix(SandyBrown, Crimson, IndianRed, 90); + addMix(SandyBrown, Cyan, MediumAquamarine, 75); + addMix(SandyBrown, DarkGoldenrod, Peru, 110); + addMix(SandyBrown, DarkGray, Tan, 100); + addMix(SandyBrown, DarkGreen, Olive, 70); + addMix(SandyBrown, DarkKhaki, Tan, 105); + addMix(SandyBrown, DarkOliveGreen, DarkGoldenrod, 85); + addMix(SandyBrown, DarkOrange, Orange, 120); + addMix(SandyBrown, DarkSalmon, Coral, 115); + addMix(SandyBrown, DarkSeaGreen, DarkKhaki, 90); + addMix(SandyBrown, DarkSlateBlue, RosyBrown, 65); + addMix(SandyBrown, DarkTurquoise, DarkSeaGreen, 80); + addMix(SandyBrown, DarkViolet, MediumVioletRed, 65); + addMix(SandyBrown, DeepPink, PaleVioletRed, 80); + addMix(SandyBrown, DeepSkyBlue, CadetBlue, 75); + addMix(SandyBrown, DimGray, Peru, 90); + addMix(SandyBrown, DodgerBlue, SlateGray, 75); + addMix(SandyBrown, Gold, Goldenrod, 105); + addMix(SandyBrown, Goldenrod, Orange, 115); + addMix(SandyBrown, Gray, Peru, 95); + addMix(SandyBrown, Green, OliveDrab, 75); + addMix(SandyBrown, HotPink, Salmon, 85); + addMix(SandyBrown, IndianRed, Coral, 100); + addMix(SandyBrown, Indigo, MediumVioletRed, 55); + addMix(SandyBrown, Khaki, Tan, 100); + addMix(SandyBrown, Lavender, Tan, 95); + addMix(SandyBrown, LemonChiffon, Wheat, 100); + addMix(SandyBrown, LightGray, Tan, 100); + addMix(SandyBrown, LightSeaGreen, DarkSeaGreen, 80); + addMix(SandyBrown, LightSteelBlue, Tan, 90); + addMix(SandyBrown, Lime, YellowGreen, 75); + addMix(SandyBrown, LimeGreen, YellowGreen, 80); + addMix(SandyBrown, Magenta, HotPink, 70); + addMix(SandyBrown, Maroon, Sienna, 75); + addMix(SandyBrown, MediumAquamarine, DarkKhaki, 85); + addMix(SandyBrown, MediumOrchid, PaleVioletRed, 75); + addMix(SandyBrown, MediumPurple, RosyBrown, 75); + addMix(SandyBrown, MediumSeaGreen, DarkKhaki, 80); + addMix(SandyBrown, MediumVioletRed, IndianRed, 75); + addMix(SandyBrown, MistyRose, Tan, 105); + addMix(SandyBrown, Olive, DarkGoldenrod, 95); + addMix(SandyBrown, OliveDrab, DarkGoldenrod, 90); + addMix(SandyBrown, Orange, DarkOrange, 115); + addMix(SandyBrown, PaleGreen, DarkKhaki, 80); + addMix(SandyBrown, PaleTurquoise, Wheat, 85); + addMix(SandyBrown, PaleVioletRed, Salmon, 90); + addMix(SandyBrown, Peru, DarkOrange, 115); + addMix(SandyBrown, Pink, DarkSalmon, 100); + addMix(SandyBrown, Plum, DarkSalmon, 85); + addMix(SandyBrown, Purple, PaleVioletRed, 60); + addMix(SandyBrown, Red, Coral, 100); + addMix(SandyBrown, RosyBrown, DarkSalmon, 105); + addMix(SandyBrown, Salmon, DarkSalmon, 105); + addMix(SeaGreen, Aquamarine, MediumAquamarine, 95); + addMix(SeaGreen, Blue, DarkSlateBlue, 70); + addMix(SeaGreen, CadetBlue, LightSeaGreen, 105); + addMix(SeaGreen, Chocolate, Olive, 75); + addMix(SeaGreen, Coral, Olive, 70); + addMix(SeaGreen, Crimson, Brown, 55); + addMix(SeaGreen, Cyan, MediumAquamarine, 90); + addMix(SeaGreen, DarkGoldenrod, OliveDrab, 90); + addMix(SeaGreen, DarkGray, CadetBlue, 100); + addMix(SeaGreen, DarkGreen, Green, 110); + addMix(SeaGreen, DarkKhaki, DarkSeaGreen, 100); + addMix(SeaGreen, DarkOliveGreen, Green, 110); + addMix(SeaGreen, DarkOrange, Olive, 75); + addMix(SeaGreen, DarkSeaGreen, MediumSeaGreen, 110); + addMix(SeaGreen, DarkSlateBlue, DarkSlateGray, 80); + addMix(SeaGreen, DarkTurquoise, LightSeaGreen, 100); + addMix(SeaGreen, DarkViolet, DarkSlateBlue, 75); + addMix(SeaGreen, DeepPink, MediumVioletRed, 45); + addMix(SeaGreen, DeepSkyBlue, CadetBlue, 85); + addMix(SeaGreen, DimGray, Teal, 100); + addMix(SeaGreen, DodgerBlue, SteelBlue, 80); + addMix(SeaGreen, Gold, YellowGreen, 85); + addMix(SeaGreen, Goldenrod, OliveDrab, 90); + addMix(SeaGreen, Green, DarkGreen, 115); + addMix(SeaGreen, HotPink, RosyBrown, 50); + addMix(SeaGreen, IndianRed, DimGray, 65); + addMix(SeaGreen, Indigo, DarkSlateBlue, 70); + addMix(SeaGreen, Khaki, DarkSeaGreen, 90); + addMix(SeaGreen, Lavender, MediumAquamarine, 85); + addMix(SeaGreen, LemonChiffon, DarkSeaGreen, 85); + addMix(SeaGreen, LightGray, DarkSeaGreen, 90); + addMix(SeaGreen, LightSeaGreen, MediumSeaGreen, 105); + addMix(SeaGreen, LightSteelBlue, CadetBlue, 90); + addMix(SeaGreen, Lime, LimeGreen, 95); + addMix(SeaGreen, LimeGreen, MediumSeaGreen, 105); + addMix(SeaGreen, Magenta, DarkViolet, 75); + addMix(SeaGreen, MediumAquamarine, MediumSeaGreen, 105); + addMix(SeaGreen, MediumPurple, SlateGray, 80); + addMix(SeaGreen, MistyRose, DarkSeaGreen, 80); + addMix(SeaGreen, Navy, DarkSlateBlue, 70); + addMix(SeaGreen, Olive, OliveDrab, 105); + addMix(SeaGreen, OliveDrab, Green, 110); + addMix(SeaGreen, Orange, Olive, 80); + addMix(SeaGreen, PaleGreen, MediumSeaGreen, 95); + addMix(SeaGreen, PaleTurquoise, MediumAquamarine, 90); + addMix(SeaGreen, PaleVioletRed, Gray, 60); + addMix(SeaGreen, Peru, OliveDrab, 85); + addMix(SeaGreen, Pink, DarkSeaGreen, 70); + addMix(SeaGreen, Plum, SlateGray, 80); + addMix(SeaGreen, Purple, DarkSlateBlue, 75); + addMix(SeaGreen, Red, Sienna, 60); + addMix(SeaGreen, RoyalBlue, SteelBlue, 80); + addMix(SeaGreen, SandyBrown, OliveDrab, 80); + addMix(Sienna, Aquamarine, DarkSeaGreen, 60); + addMix(Sienna, Blue, DarkSlateBlue, 75); + addMix(Sienna, Brown, Maroon, 115); + addMix(Sienna, CadetBlue, Gray, 85); + addMix(Sienna, Coral, Chocolate, 105); + addMix(Sienna, Crimson, Brown, 110); + addMix(Sienna, Cyan, LightSeaGreen, 60); + addMix(Sienna, DarkGoldenrod, Peru, 100); + addMix(Sienna, DarkGray, RosyBrown, 95); + addMix(Sienna, DarkGreen, DarkOliveGreen, 80); + addMix(Sienna, DarkKhaki, Peru, 90); + addMix(Sienna, DarkOrange, Chocolate, 100); + addMix(Sienna, DarkSalmon, Chocolate, 100); + addMix(Sienna, DarkTurquoise, CadetBlue, 70); + addMix(Sienna, DarkViolet, Purple, 80); + addMix(Sienna, DeepPink, Crimson, 90); + addMix(Sienna, DeepSkyBlue, CadetBlue, 70); + addMix(Sienna, DodgerBlue, SlateGray, 75); + addMix(Sienna, Gold, Goldenrod, 80); + addMix(Sienna, Goldenrod, Peru, 95); + addMix(Sienna, Green, DarkOliveGreen, 75); + addMix(Sienna, HotPink, IndianRed, 90); + addMix(Sienna, IndianRed, Brown, 110); + addMix(Sienna, Indigo, Purple, 80); + addMix(Sienna, Khaki, Tan, 80); + addMix(Sienna, Lavender, RosyBrown, 80); + addMix(Sienna, LemonChiffon, Tan, 75); + addMix(Sienna, LightGray, RosyBrown, 85); + addMix(Sienna, LightSeaGreen, SeaGreen, 75); + addMix(Sienna, LightSteelBlue, RosyBrown, 80); + addMix(Sienna, Lime, OliveDrab, 55); + addMix(Sienna, LimeGreen, OliveDrab, 65); + addMix(Sienna, Magenta, MediumVioletRed, 80); + addMix(Sienna, Maroon, Brown, 110); + addMix(Sienna, MediumOrchid, MediumVioletRed, 85); + addMix(Sienna, MediumSeaGreen, DarkOliveGreen, 70); + addMix(Sienna, MediumVioletRed, Crimson, 95); + addMix(Sienna, MistyRose, DarkSalmon, 85); + addMix(Sienna, Navy, Purple, 75); + addMix(Sienna, Olive, DarkGoldenrod, 95); + addMix(Sienna, OliveDrab, Olive, 85); + addMix(Sienna, Orange, Peru, 95); + addMix(Sienna, PaleGreen, DarkKhaki, 65); + addMix(Sienna, PaleTurquoise, DarkGray, 70); + addMix(Sienna, PaleVioletRed, IndianRed, 95); + addMix(Sienna, Peru, Chocolate, 105); + addMix(Sienna, Pink, DarkSalmon, 90); + addMix(Sienna, Plum, PaleVioletRed, 85); + addMix(Sienna, Purple, MediumVioletRed, 85); + addMix(Sienna, Red, Crimson, 110); + addMix(Sienna, RosyBrown, IndianRed, 100); + addMix(Sienna, Salmon, IndianRed, 100); + addMix(Sienna, SandyBrown, Peru, 100); + addMix(Sienna, SeaGreen, DarkOliveGreen, 80); + addMix(SkyBlue, Aquamarine, Turquoise, 100); + addMix(SkyBlue, Black, DarkSlateGray, 55); + addMix(SkyBlue, Blue, RoyalBlue, 75); + addMix(SkyBlue, Brown, RosyBrown, 60); + addMix(SkyBlue, CadetBlue, DarkTurquoise, 110); + addMix(SkyBlue, Chocolate, Tan, 75); + addMix(SkyBlue, Coral, RosyBrown, 75); + addMix(SkyBlue, Crimson, PaleVioletRed, 60); + addMix(SkyBlue, Cyan, DarkTurquoise, 110); + addMix(SkyBlue, DarkGoldenrod, DarkSeaGreen, 80); + addMix(SkyBlue, DarkGray, LightSteelBlue, 105); + addMix(SkyBlue, DarkGreen, SeaGreen, 70); + addMix(SkyBlue, DarkKhaki, DarkSeaGreen, 85); + addMix(SkyBlue, DarkOliveGreen, CadetBlue, 80); + addMix(SkyBlue, DarkOrange, Tan, 80); + addMix(SkyBlue, DarkSalmon, DarkGray, 80); + addMix(SkyBlue, DarkSeaGreen, MediumAquamarine, 95); + addMix(SkyBlue, DarkSlateBlue, SteelBlue, 75); + addMix(SkyBlue, DarkSlateGray, CadetBlue, 80); + addMix(SkyBlue, DarkTurquoise, Turquoise, 115); + addMix(SkyBlue, DarkViolet, MediumPurple, 80); + addMix(SkyBlue, DeepPink, MediumOrchid, 65); + addMix(SkyBlue, DimGray, CadetBlue, 90); + addMix(SkyBlue, DodgerBlue, DeepSkyBlue, 105); + addMix(SkyBlue, Gold, DarkKhaki, 75); + addMix(SkyBlue, Goldenrod, DarkKhaki, 80); + addMix(SkyBlue, Gray, CadetBlue, 100); + addMix(SkyBlue, Green, MediumSeaGreen, 75); + addMix(SkyBlue, HotPink, Plum, 75); + addMix(SkyBlue, IndianRed, RosyBrown, 70); + addMix(SkyBlue, Indigo, SlateBlue, 60); + addMix(SkyBlue, Khaki, DarkSeaGreen, 85); + addMix(SkyBlue, Lavender, LightSteelBlue, 105); + addMix(SkyBlue, LemonChiffon, PaleTurquoise, 95); + addMix(SkyBlue, LightGray, LightSteelBlue, 110); + addMix(SkyBlue, LightSeaGreen, DarkTurquoise, 110); + addMix(SkyBlue, LightSteelBlue, DeepSkyBlue, 115); + addMix(SkyBlue, Lime, SpringGreen, 80); + addMix(SkyBlue, LimeGreen, MediumAquamarine, 80); + addMix(SkyBlue, Magenta, MediumOrchid, 85); + addMix(SkyBlue, MediumAquamarine, DarkTurquoise, 100); + addMix(SkyBlue, MediumOrchid, MediumPurple, 90); + addMix(SkyBlue, MediumPurple, LightSteelBlue, 95); + addMix(SkyBlue, MediumSeaGreen, MediumAquamarine, 90); + addMix(SkyBlue, MediumVioletRed, MediumOrchid, 70); + addMix(SkyBlue, MistyRose, LightSteelBlue, 90); + addMix(SkyBlue, Navy, RoyalBlue, 55); + addMix(SkyBlue, Olive, DarkSeaGreen, 75); + addMix(SkyBlue, OliveDrab, DarkSeaGreen, 80); + addMix(SkyBlue, Orange, DarkKhaki, 80); + addMix(SkyBlue, PaleGreen, MediumAquamarine, 85); + addMix(SkyBlue, PaleTurquoise, DarkTurquoise, 115); + addMix(SkyBlue, PaleVioletRed, Thistle, 75); + addMix(SkyBlue, Peru, DarkGray, 80); + addMix(SkyBlue, Pink, LightSteelBlue, 85); + addMix(SkyBlue, Plum, LightSteelBlue, 90); + addMix(SkyBlue, Purple, MediumPurple, 65); + addMix(SkyBlue, Red, IndianRed, 65); + addMix(SkyBlue, RosyBrown, LightSteelBlue, 85); + addMix(SkyBlue, RoyalBlue, DodgerBlue, 95); + addMix(SkyBlue, Salmon, RosyBrown, 75); + addMix(SkyBlue, SandyBrown, DarkGray, 85); + addMix(SkyBlue, SeaGreen, LightSeaGreen, 90); + addMix(SkyBlue, Sienna, Gray, 70); + addMix(SlateBlue, Aquamarine, DeepSkyBlue, 70); + addMix(SlateBlue, Black, DarkSlateBlue, 85); + addMix(SlateBlue, Blue, DarkViolet, 110); + addMix(SlateBlue, Brown, Purple, 90); + addMix(SlateBlue, CadetBlue, SteelBlue, 95); + addMix(SlateBlue, Coral, PaleVioletRed, 75); + addMix(SlateBlue, Crimson, MediumVioletRed, 90); + addMix(SlateBlue, Cyan, DeepSkyBlue, 70); + addMix(SlateBlue, DarkGoldenrod, RosyBrown, 65); + addMix(SlateBlue, DarkGray, MediumPurple, 90); + addMix(SlateBlue, DarkGreen, DarkSlateGray, 70); + addMix(SlateBlue, DarkKhaki, Gray, 60); + addMix(SlateBlue, DarkOrange, IndianRed, 65); + addMix(SlateBlue, DarkSalmon, PaleVioletRed, 80); + addMix(SlateBlue, DarkSeaGreen, SlateGray, 75); + addMix(SlateBlue, DarkSlateGray, DarkSlateBlue, 100); + addMix(SlateBlue, DarkTurquoise, DodgerBlue, 80); + addMix(SlateBlue, DarkViolet, Blue, 115); + addMix(SlateBlue, DeepPink, MediumOrchid, 95); + addMix(SlateBlue, DeepSkyBlue, DodgerBlue, 90); + addMix(SlateBlue, DimGray, DarkSlateBlue, 100); + addMix(SlateBlue, DodgerBlue, RoyalBlue, 105); + addMix(SlateBlue, Gold, Tan, 50); + addMix(SlateBlue, Goldenrod, RosyBrown, 60); + addMix(SlateBlue, Gray, MediumPurple, 100); + addMix(SlateBlue, Green, Teal, 70); + addMix(SlateBlue, HotPink, MediumOrchid, 95); + addMix(SlateBlue, IndianRed, MediumOrchid, 90); + addMix(SlateBlue, Indigo, DarkSlateBlue, 105); + addMix(SlateBlue, Khaki, DarkGray, 55); + addMix(SlateBlue, Lavender, LightSteelBlue, 85); + addMix(SlateBlue, LemonChiffon, Thistle, 60); + addMix(SlateBlue, LightGray, MediumPurple, 85); + addMix(SlateBlue, LightSeaGreen, SteelBlue, 85); + addMix(SlateBlue, LightSteelBlue, MediumPurple, 95); + addMix(SlateBlue, Lime, MediumSeaGreen, 55); + addMix(SlateBlue, LimeGreen, CadetBlue, 60); + addMix(SlateBlue, Magenta, MediumOrchid, 100); + addMix(SlateBlue, Maroon, Purple, 80); + addMix(SlateBlue, MediumAquamarine, SteelBlue, 75); + addMix(SlateBlue, MediumOrchid, MediumPurple, 110); + addMix(SlateBlue, MediumPurple, RoyalBlue, 115); + addMix(SlateBlue, MediumSeaGreen, SteelBlue, 75); + addMix(SlateBlue, MediumVioletRed, DarkViolet, 100); + addMix(SlateBlue, MistyRose, Plum, 80); + addMix(SlateBlue, Navy, DarkSlateBlue, 100); + addMix(SlateBlue, Olive, DimGray, 60); + addMix(SlateBlue, OliveDrab, DimGray, 55); + addMix(SlateBlue, Orange, DarkSalmon, 60); + addMix(SlateBlue, PaleGreen, CadetBlue, 60); + addMix(SlateBlue, PaleTurquoise, LightSteelBlue, 80); + addMix(SlateBlue, PaleVioletRed, MediumOrchid, 95); + addMix(SlateBlue, Pink, Plum, 85); + addMix(SlateBlue, Plum, MediumPurple, 95); + addMix(SlateBlue, Purple, DarkViolet, 105); + addMix(SlateBlue, Red, MediumVioletRed, 80); + addMix(SlateBlue, RosyBrown, MediumPurple, 90); + addMix(SlateBlue, RoyalBlue, MediumPurple, 120); + addMix(SlateBlue, Salmon, PaleVioletRed, 85); + addMix(SlateBlue, SandyBrown, RosyBrown, 70); + addMix(SlateBlue, SeaGreen, SteelBlue, 80); + addMix(SlateBlue, SkyBlue, DodgerBlue, 90); + addMix(SlateGray, Aquamarine, MediumAquamarine, 85); + addMix(SlateGray, Black, DarkSlateGray, 85); + addMix(SlateGray, Blue, DarkSlateBlue, 100); + addMix(SlateGray, Chocolate, Sienna, 90); + addMix(SlateGray, Coral, RosyBrown, 90); + addMix(SlateGray, Crimson, MediumVioletRed, 90); + addMix(SlateGray, Cyan, DarkTurquoise, 90); + addMix(SlateGray, DarkGoldenrod, Olive, 90); + addMix(SlateGray, DarkGray, Gray, 110); + addMix(SlateGray, DarkGreen, SeaGreen, 90); + addMix(SlateGray, DarkOrange, Peru, 85); + addMix(SlateGray, DarkSalmon, RosyBrown, 90); + addMix(SlateGray, DarkSeaGreen, CadetBlue, 95); + addMix(SlateGray, DarkSlateBlue, SlateBlue, 105); + addMix(SlateGray, DarkSlateGray, DimGray, 105); + addMix(SlateGray, DarkTurquoise, CadetBlue, 100); + addMix(SlateGray, DarkViolet, SlateBlue, 105); + addMix(SlateGray, DeepPink, MediumVioletRed, 90); + addMix(SlateGray, DeepSkyBlue, SteelBlue, 105); + addMix(SlateGray, DimGray, Gray, 115); + addMix(SlateGray, DodgerBlue, SteelBlue, 110); + addMix(SlateGray, Gold, DarkKhaki, 75); + addMix(SlateGray, Goldenrod, DarkGoldenrod, 85); + addMix(SlateGray, Gray, DimGray, 120); + addMix(SlateGray, Green, SeaGreen, 90); + addMix(SlateGray, HotPink, PaleVioletRed, 95); + addMix(SlateGray, IndianRed, RosyBrown, 95); + addMix(SlateGray, Indigo, DarkSlateBlue, 95); + addMix(SlateGray, Khaki, DarkKhaki, 80); + addMix(SlateGray, Lavender, LightSteelBlue, 95); + addMix(SlateGray, LemonChiffon, DarkGray, 85); + addMix(SlateGray, LightGray, DarkGray, 100); + addMix(SlateGray, LightSeaGreen, CadetBlue, 100); + addMix(SlateGray, LightSteelBlue, DarkGray, 105); + addMix(SlateGray, Lime, LimeGreen, 75); + addMix(SlateGray, LimeGreen, MediumSeaGreen, 85); + addMix(SlateGray, Magenta, MediumOrchid, 100); + addMix(SlateGray, MediumAquamarine, CadetBlue, 95); + addMix(SlateGray, MediumOrchid, MediumPurple, 110); + addMix(SlateGray, MediumPurple, SlateBlue, 115); + addMix(SlateGray, MediumSeaGreen, SeaGreen, 95); + addMix(SlateGray, MistyRose, DarkGray, 90); + addMix(SlateGray, Navy, DarkSlateBlue, 90); + addMix(SlateGray, Olive, OliveDrab, 90); + addMix(SlateGray, OliveDrab, SeaGreen, 90); + addMix(SlateGray, Orange, DarkGoldenrod, 85); + addMix(SlateGray, PaleGreen, DarkSeaGreen, 80); + addMix(SlateGray, PaleTurquoise, SkyBlue, 95); + addMix(SlateGray, PaleVioletRed, RosyBrown, 95); + addMix(SlateGray, Pink, RosyBrown, 90); + addMix(SlateGray, Purple, DarkSlateBlue, 95); + addMix(SlateGray, Red, Crimson, 85); + addMix(SlateGray, RosyBrown, Gray, 100); + addMix(SlateGray, RoyalBlue, SteelBlue, 115); + addMix(SlateGray, Salmon, RosyBrown, 90); + addMix(SlateGray, SandyBrown, Tan, 90); + addMix(SlateGray, SeaGreen, Teal, 100); + addMix(SlateGray, SkyBlue, CadetBlue, 100); + addMix(SlateGray, SlateBlue, MediumPurple, 115); + addMix(SpringGreen, Aquamarine, PaleGreen, 110); + addMix(SpringGreen, Blue, SteelBlue, 45); + addMix(SpringGreen, CadetBlue, MediumAquamarine, 90); + addMix(SpringGreen, Chocolate, LimeGreen, 60); + addMix(SpringGreen, Coral, DarkSeaGreen, 55); + addMix(SpringGreen, Cyan, Aquamarine, 100); + addMix(SpringGreen, DarkGoldenrod, LimeGreen, 80); + addMix(SpringGreen, DarkGray, MediumAquamarine, 95); + addMix(SpringGreen, DarkGreen, MediumSeaGreen, 80); + addMix(SpringGreen, DarkKhaki, LimeGreen, 100); + addMix(SpringGreen, DarkOliveGreen, MediumSeaGreen, 85); + addMix(SpringGreen, DarkOrange, YellowGreen, 65); + addMix(SpringGreen, DarkSalmon, DarkSeaGreen, 65); + addMix(SpringGreen, DarkSeaGreen, PaleGreen, 105); + addMix(SpringGreen, DarkSlateBlue, LightSeaGreen, 50); + addMix(SpringGreen, DarkSlateGray, MediumSeaGreen, 65); + addMix(SpringGreen, DarkTurquoise, MediumAquamarine, 95); + addMix(SpringGreen, DarkViolet, SteelBlue, 55); + addMix(SpringGreen, DeepSkyBlue, Turquoise, 75); + addMix(SpringGreen, DimGray, MediumSeaGreen, 80); + addMix(SpringGreen, DodgerBlue, DarkTurquoise, 65); + addMix(SpringGreen, Gold, Lime, 90); + addMix(SpringGreen, Goldenrod, LimeGreen, 85); + addMix(SpringGreen, Gray, MediumSeaGreen, 85); + addMix(SpringGreen, Green, LimeGreen, 90); + addMix(SpringGreen, IndianRed, MediumSeaGreen, 45); + addMix(SpringGreen, Khaki, PaleGreen, 100); + addMix(SpringGreen, Lavender, Aquamarine, 90); + addMix(SpringGreen, LemonChiffon, PaleGreen, 100); + addMix(SpringGreen, LightGray, Aquamarine, 95); + addMix(SpringGreen, LightSeaGreen, MediumAquamarine, 95); + addMix(SpringGreen, LightSteelBlue, MediumAquamarine, 85); + addMix(SpringGreen, Lime, PaleGreen, 120); + addMix(SpringGreen, LimeGreen, Lime, 115); + addMix(SpringGreen, Magenta, MediumPurple, 60); + addMix(SpringGreen, MediumAquamarine, PaleGreen, 110); + addMix(SpringGreen, MediumOrchid, CadetBlue, 65); + addMix(SpringGreen, MediumPurple, LightSeaGreen, 65); + addMix(SpringGreen, MediumSeaGreen, LimeGreen, 110); + addMix(SpringGreen, MistyRose, Aquamarine, 80); + addMix(SpringGreen, Olive, LimeGreen, 90); + addMix(SpringGreen, OliveDrab, LimeGreen, 95); + addMix(SpringGreen, Orange, YellowGreen, 75); + addMix(SpringGreen, PaleGreen, Lime, 120); + addMix(SpringGreen, PaleTurquoise, Aquamarine, 100); + addMix(SpringGreen, Peru, LimeGreen, 75); + addMix(SpringGreen, Pink, MediumAquamarine, 65); + addMix(SpringGreen, Plum, MediumAquamarine, 75); + addMix(SpringGreen, Purple, Teal, 50); + addMix(SpringGreen, RosyBrown, MediumSeaGreen, 70); + addMix(SpringGreen, RoyalBlue, LightSeaGreen, 60); + addMix(SpringGreen, Salmon, DarkSeaGreen, 50); + addMix(SpringGreen, SandyBrown, LimeGreen, 75); + addMix(SpringGreen, SeaGreen, MediumSeaGreen, 95); + addMix(SpringGreen, Sienna, MediumSeaGreen, 55); + addMix(SpringGreen, SkyBlue, Aquamarine, 85); + addMix(SpringGreen, SlateBlue, LightSeaGreen, 60); + addMix(SpringGreen, SlateGray, MediumSeaGreen, 80); + addMix(SteelBlue, Aquamarine, DarkTurquoise, 80); + addMix(SteelBlue, Black, DarkSlateBlue, 85); + addMix(SteelBlue, Blue, SlateBlue, 100); + addMix(SteelBlue, CadetBlue, SlateGray, 105); + addMix(SteelBlue, Chocolate, Gray, 80); + addMix(SteelBlue, Coral, RosyBrown, 80); + addMix(SteelBlue, Crimson, MediumVioletRed, 80); + addMix(SteelBlue, Cyan, DarkTurquoise, 90); + addMix(SteelBlue, DarkGray, SlateGray, 105); + addMix(SteelBlue, DarkGreen, SeaGreen, 75); + addMix(SteelBlue, DarkKhaki, CadetBlue, 75); + addMix(SteelBlue, DarkOliveGreen, Teal, 80); + addMix(SteelBlue, DarkOrange, DarkGoldenrod, 75); + addMix(SteelBlue, DarkSalmon, Gray, 85); + addMix(SteelBlue, DarkSeaGreen, CadetBlue, 85); + addMix(SteelBlue, DarkSlateBlue, RoyalBlue, 100); + addMix(SteelBlue, DarkSlateGray, RoyalBlue, 100); + addMix(SteelBlue, DarkTurquoise, CadetBlue, 100); + addMix(SteelBlue, DarkViolet, SlateBlue, 95); + addMix(SteelBlue, DeepPink, MediumOrchid, 80); + addMix(SteelBlue, DeepSkyBlue, DodgerBlue, 105); + addMix(SteelBlue, DimGray, SlateGray, 105); + addMix(SteelBlue, Gold, DarkKhaki, 60); + addMix(SteelBlue, Gray, SlateGray, 110); + addMix(SteelBlue, Green, SeaGreen, 75); + addMix(SteelBlue, HotPink, MediumPurple, 80); + addMix(SteelBlue, Indigo, DarkSlateBlue, 90); + addMix(SteelBlue, Khaki, DarkSeaGreen, 70); + addMix(SteelBlue, Lavender, LightSteelBlue, 90); + addMix(SteelBlue, LemonChiffon, SkyBlue, 75); + addMix(SteelBlue, LightGray, LightSteelBlue, 95); + addMix(SteelBlue, LightSeaGreen, CadetBlue, 100); + addMix(SteelBlue, LightSteelBlue, DodgerBlue, 105); + addMix(SteelBlue, Lime, MediumSeaGreen, 65); + addMix(SteelBlue, LimeGreen, MediumSeaGreen, 70); + addMix(SteelBlue, Magenta, MediumOrchid, 85); + addMix(SteelBlue, MediumAquamarine, CadetBlue, 90); + addMix(SteelBlue, MediumOrchid, MediumPurple, 95); + addMix(SteelBlue, MediumPurple, RoyalBlue, 105); + addMix(SteelBlue, MediumSeaGreen, CadetBlue, 85); + addMix(SteelBlue, MediumVioletRed, DarkViolet, 80); + addMix(SteelBlue, MistyRose, LightSteelBlue, 85); + addMix(SteelBlue, Navy, DarkSlateBlue, 90); + addMix(SteelBlue, Olive, SeaGreen, 75); + addMix(SteelBlue, OliveDrab, SeaGreen, 75); + addMix(SteelBlue, Orange, DarkKhaki, 75); + addMix(SteelBlue, PaleGreen, MediumAquamarine, 70); + addMix(SteelBlue, PaleTurquoise, SkyBlue, 90); + addMix(SteelBlue, Peru, Gray, 80); + addMix(SteelBlue, Pink, LightSteelBlue, 85); + addMix(SteelBlue, Plum, MediumPurple, 90); + addMix(SteelBlue, Purple, DarkSlateBlue, 85); + addMix(SteelBlue, Red, MediumVioletRed, 75); + addMix(SteelBlue, RosyBrown, SlateGray, 95); + addMix(SteelBlue, RoyalBlue, DodgerBlue, 115); + addMix(SteelBlue, Salmon, RosyBrown, 80); + addMix(SteelBlue, SandyBrown, DarkGray, 80); + addMix(SteelBlue, SeaGreen, Teal, 90); + addMix(SteelBlue, Sienna, DimGray, 85); + addMix(SteelBlue, SkyBlue, DeepSkyBlue, 105); + addMix(SteelBlue, SlateBlue, RoyalBlue, 110); + addMix(SteelBlue, SlateGray, RoyalBlue, 115); + addMix(SteelBlue, SpringGreen, MediumAquamarine, 70); + addMix(Tan, Aquamarine, DarkSeaGreen, 95); + addMix(Tan, Black, DimGray, 60); + addMix(Tan, Blue, SlateBlue, 60); + addMix(Tan, Brown, IndianRed, 85); + addMix(Tan, CadetBlue, DarkSeaGreen, 95); + addMix(Tan, Chocolate, Peru, 105); + addMix(Tan, Coral, DarkSalmon, 105); + addMix(Tan, Crimson, IndianRed, 85); + addMix(Tan, Cyan, Turquoise, 90); + addMix(Tan, DarkGoldenrod, Goldenrod, 110); + addMix(Tan, DarkGreen, OliveDrab, 80); + addMix(Tan, DarkKhaki, Wheat, 115); + addMix(Tan, DarkOliveGreen, Olive, 90); + addMix(Tan, DarkOrange, SandyBrown, 105); + addMix(Tan, DarkSalmon, SandyBrown, 110); + addMix(Tan, DarkSeaGreen, DarkKhaki, 105); + addMix(Tan, DarkSlateGray, Gray, 75); + addMix(Tan, DarkTurquoise, MediumAquamarine, 90); + addMix(Tan, DarkViolet, MediumOrchid, 65); + addMix(Tan, DeepPink, PaleVioletRed, 80); + addMix(Tan, DeepSkyBlue, CadetBlue, 85); + addMix(Tan, DimGray, Gray, 95); + addMix(Tan, DodgerBlue, SteelBlue, 80); + addMix(Tan, Gold, Goldenrod, 105); + addMix(Tan, Goldenrod, DarkKhaki, 110); + addMix(Tan, Gray, DarkGray, 100); + addMix(Tan, Green, OliveDrab, 85); + addMix(Tan, HotPink, PaleVioletRed, 85); + addMix(Tan, IndianRed, DarkSalmon, 95); + addMix(Tan, Khaki, Wheat, 110); + addMix(Tan, Lavender, LightGray, 100); + addMix(Tan, LemonChiffon, Wheat, 110); + addMix(Tan, LightGray, Wheat, 110); + addMix(Tan, LightSeaGreen, MediumAquamarine, 95); + addMix(Tan, LightSteelBlue, DarkGray, 100); + addMix(Tan, Lime, LimeGreen, 90); + addMix(Tan, LimeGreen, YellowGreen, 95); + addMix(Tan, Magenta, HotPink, 75); + addMix(Tan, Maroon, Sienna, 70); + addMix(Tan, MediumAquamarine, DarkSeaGreen, 95); + addMix(Tan, MediumOrchid, PaleVioletRed, 75); + addMix(Tan, MediumPurple, Plum, 80); + addMix(Tan, MediumSeaGreen, DarkSeaGreen, 95); + addMix(Tan, MediumVioletRed, PaleVioletRed, 75); + addMix(Tan, MistyRose, Wheat, 110); + addMix(Tan, Navy, DarkSlateBlue, 50); + addMix(Tan, Olive, DarkKhaki, 100); + addMix(Tan, OliveDrab, DarkKhaki, 100); + addMix(Tan, Orange, Goldenrod, 110); + addMix(Tan, PaleGreen, DarkSeaGreen, 95); + addMix(Tan, PaleTurquoise, LightGray, 95); + addMix(Tan, PaleVioletRed, RosyBrown, 90); + addMix(Tan, Peru, SandyBrown, 110); + addMix(Tan, Pink, DarkSalmon, 100); + addMix(Tan, Plum, Pink, 90); + addMix(Tan, Purple, MediumVioletRed, 60); + addMix(Tan, Red, IndianRed, 90); + addMix(Tan, RosyBrown, DarkSalmon, 105); + addMix(Tan, RoyalBlue, SlateGray, 75); + addMix(Tan, Salmon, DarkSalmon, 100); + addMix(Tan, SandyBrown, Peru, 115); + addMix(Tan, SeaGreen, DarkSeaGreen, 90); + addMix(Tan, Sienna, Peru, 95); + addMix(Tan, SkyBlue, DarkGray, 95); + addMix(Tan, SlateGray, DarkGray, 95); + addMix(Tan, SpringGreen, PaleGreen, 90); + addMix(Tan, SteelBlue, DarkGray, 85); + addMix(Teal, Aquamarine, LightSeaGreen, 90); + addMix(Teal, Black, DarkSlateGray, 85); + addMix(Teal, Blue, DarkSlateBlue, 85); + addMix(Teal, Brown, DimGray, 75); + addMix(Teal, CadetBlue, LightSeaGreen, 115); + addMix(Teal, Chocolate, DarkOliveGreen, 80); + addMix(Teal, Coral, Gray, 75); + addMix(Teal, Cyan, DarkTurquoise, 90); + addMix(Teal, DarkGoldenrod, OliveDrab, 85); + addMix(Teal, DarkGray, CadetBlue, 100); + addMix(Teal, DarkGreen, SeaGreen, 100); + addMix(Teal, DarkKhaki, SeaGreen, 90); + addMix(Teal, DarkOliveGreen, SeaGreen, 100); + addMix(Teal, DarkOrange, OliveDrab, 75); + addMix(Teal, DarkSalmon, CadetBlue, 80); + addMix(Teal, DarkSeaGreen, LightSeaGreen, 100); + addMix(Teal, DarkTurquoise, LightSeaGreen, 105); + addMix(Teal, DarkViolet, DarkSlateBlue, 90); + addMix(Teal, DeepPink, Purple, 70); + addMix(Teal, DeepSkyBlue, CadetBlue, 100); + addMix(Teal, DodgerBlue, SteelBlue, 95); + addMix(Teal, Gold, OliveDrab, 75); + addMix(Teal, Goldenrod, OliveDrab, 80); + addMix(Teal, Gray, CadetBlue, 105); + addMix(Teal, Green, SeaGreen, 100); + addMix(Teal, IndianRed, DimGray, 75); + addMix(Teal, Indigo, DarkSlateBlue, 85); + addMix(Teal, Khaki, DarkSeaGreen, 80); + addMix(Teal, Lavender, CadetBlue, 85); + addMix(Teal, LemonChiffon, MediumAquamarine, 80); + addMix(Teal, LightGray, CadetBlue, 90); + addMix(Teal, LightSeaGreen, CadetBlue, 110); + addMix(Teal, LightSteelBlue, CadetBlue, 95); + addMix(Teal, Lime, LimeGreen, 80); + addMix(Teal, LimeGreen, MediumSeaGreen, 90); + addMix(Teal, Magenta, DarkViolet, 85); + addMix(Teal, Maroon, Gray, 70); + addMix(Teal, MediumAquamarine, LightSeaGreen, 100); + addMix(Teal, MediumOrchid, RoyalBlue, 85); + addMix(Teal, MediumPurple, SteelBlue, 90); + addMix(Teal, MediumSeaGreen, SeaGreen, 100); + addMix(Teal, MediumVioletRed, DarkSlateBlue, 75); + addMix(Teal, MistyRose, CadetBlue, 75); + addMix(Teal, Navy, DarkSlateBlue, 80); + addMix(Teal, Olive, SeaGreen, 95); + addMix(Teal, OliveDrab, SeaGreen, 95); + addMix(Teal, Orange, OliveDrab, 75); + addMix(Teal, PaleGreen, MediumSeaGreen, 85); + addMix(Teal, PaleTurquoise, LightSeaGreen, 95); + addMix(Teal, PaleVioletRed, SlateGray, 70); + addMix(Teal, Peru, SeaGreen, 85); + addMix(Teal, Pink, CadetBlue, 65); + addMix(Teal, Plum, SteelBlue, 80); + addMix(Teal, Purple, DarkSlateBlue, 80); + addMix(Teal, Red, Brown, 70); + addMix(Teal, RosyBrown, CadetBlue, 85); + addMix(Teal, RoyalBlue, SteelBlue, 95); + addMix(Teal, Salmon, Gray, 70); + addMix(Teal, SandyBrown, SeaGreen, 80); + addMix(Teal, Sienna, DarkOliveGreen, 80); + addMix(Teal, SkyBlue, CadetBlue, 100); + addMix(Teal, SlateBlue, SteelBlue, 95); + addMix(Teal, SlateGray, CadetBlue, 105); + addMix(Teal, SpringGreen, MediumSeaGreen, 85); + addMix(Teal, Tan, CadetBlue, 85); + addMix(Thistle, Aquamarine, PaleTurquoise, 85); + addMix(Thistle, Black, DimGray, 55); + addMix(Thistle, Blue, SlateBlue, 75); + addMix(Thistle, Brown, PaleVioletRed, 80); + addMix(Thistle, CadetBlue, LightSteelBlue, 90); + addMix(Thistle, Chocolate, DarkSalmon, 90); + addMix(Thistle, Coral, DarkSalmon, 95); + addMix(Thistle, Crimson, PaleVioletRed, 85); + addMix(Thistle, Cyan, DarkTurquoise, 80); + addMix(Thistle, DarkGoldenrod, Tan, 85); + addMix(Thistle, DarkGray, LightGray, 110); + addMix(Thistle, DarkGreen, SeaGreen, 60); + addMix(Thistle, DarkKhaki, Tan, 85); + addMix(Thistle, DarkOliveGreen, DarkGray, 75); + addMix(Thistle, DarkOrange, SandyBrown, 90); + addMix(Thistle, DarkSalmon, Pink, 100); + addMix(Thistle, DarkSeaGreen, DarkGray, 85); + addMix(Thistle, DarkSlateBlue, MediumPurple, 75); + addMix(Thistle, DarkSlateGray, SlateGray, 70); + addMix(Thistle, DarkTurquoise, SkyBlue, 85); + addMix(Thistle, DarkViolet, MediumOrchid, 85); + addMix(Thistle, DeepPink, HotPink, 95); + addMix(Thistle, DeepSkyBlue, SkyBlue, 85); + addMix(Thistle, DimGray, DarkGray, 90); + addMix(Thistle, DodgerBlue, LightSteelBlue, 90); + addMix(Thistle, Gold, Khaki, 80); + addMix(Thistle, Goldenrod, Tan, 85); + addMix(Thistle, Gray, DarkGray, 100); + addMix(Thistle, Green, MediumSeaGreen, 65); + addMix(Thistle, HotPink, Plum, 105); + addMix(Thistle, IndianRed, RosyBrown, 95); + addMix(Thistle, Indigo, MediumOrchid, 60); + addMix(Thistle, Khaki, Wheat, 85); + addMix(Thistle, Lavender, MistyRose, 115); + addMix(Thistle, LemonChiffon, MistyRose, 90); + addMix(Thistle, LightGray, Lavender, 110); + addMix(Thistle, LightSeaGreen, CadetBlue, 85); + addMix(Thistle, LightSteelBlue, Lavender, 110); + addMix(Thistle, Lime, LimeGreen, 65); + addMix(Thistle, LimeGreen, DarkSeaGreen, 70); + addMix(Thistle, Magenta, Violet, 95); + addMix(Thistle, Maroon, IndianRed, 65); + addMix(Thistle, MediumAquamarine, PaleTurquoise, 90); + addMix(Thistle, MediumOrchid, Plum, 95); + addMix(Thistle, MediumPurple, Plum, 100); + addMix(Thistle, MediumSeaGreen, DarkSeaGreen, 85); + addMix(Thistle, MediumVioletRed, HotPink, 90); + addMix(Thistle, MistyRose, Pink, 115); + addMix(Thistle, Navy, SlateBlue, 55); + addMix(Thistle, Olive, DarkKhaki, 75); + addMix(Thistle, OliveDrab, DarkKhaki, 75); + addMix(Thistle, Orange, SandyBrown, 85); + addMix(Thistle, PaleGreen, DarkSeaGreen, 75); + addMix(Thistle, PaleTurquoise, LightSteelBlue, 90); + addMix(Thistle, PaleVioletRed, Plum, 105); + addMix(Thistle, Peru, DarkSalmon, 90); + addMix(Thistle, Pink, MistyRose, 115); + addMix(Thistle, Plum, Pink, 115); + addMix(Thistle, Purple, MediumOrchid, 75); + addMix(Thistle, Red, IndianRed, 85); + addMix(Thistle, RosyBrown, Pink, 110); + addMix(Thistle, RoyalBlue, MediumPurple, 90); + addMix(Thistle, Salmon, Pink, 100); + addMix(Thistle, SandyBrown, DarkSalmon, 95); + addMix(Thistle, SeaGreen, CadetBlue, 85); + addMix(Thistle, Sienna, RosyBrown, 85); + addMix(Thistle, SkyBlue, LightSteelBlue, 90); + addMix(Thistle, SlateBlue, MediumPurple, 90); + addMix(Thistle, SlateGray, DarkGray, 100); + addMix(Thistle, SpringGreen, MediumAquamarine, 85); + addMix(Thistle, SteelBlue, LightSteelBlue, 90); + addMix(Thistle, Tan, MistyRose, 100); + addMix(Thistle, Teal, CadetBlue, 80); + addMix(Turquoise, Aquamarine, MediumAquamarine, 115); + addMix(Turquoise, Black, Teal, 50); + addMix(Turquoise, Blue, RoyalBlue, 60); + addMix(Turquoise, Brown, Gray, 55); + addMix(Turquoise, CadetBlue, LightSeaGreen, 110); + addMix(Turquoise, Chocolate, DarkSeaGreen, 70); + addMix(Turquoise, Coral, DarkSeaGreen, 70); + addMix(Turquoise, Crimson, Gray, 50); + addMix(Turquoise, Cyan, DarkTurquoise, 120); + addMix(Turquoise, DarkGoldenrod, DarkSeaGreen, 80); + addMix(Turquoise, DarkGray, DarkTurquoise, 100); + addMix(Turquoise, DarkGreen, MediumSeaGreen, 80); + addMix(Turquoise, DarkKhaki, MediumAquamarine, 95); + addMix(Turquoise, DarkOliveGreen, MediumSeaGreen, 85); + addMix(Turquoise, DarkOrange, DarkKhaki, 75); + addMix(Turquoise, DarkSalmon, DarkSeaGreen, 75); + addMix(Turquoise, DarkSeaGreen, MediumAquamarine, 110); + addMix(Turquoise, DarkSlateBlue, SteelBlue, 65); + addMix(Turquoise, DarkSlateGray, CadetBlue, 75); + addMix(Turquoise, DarkTurquoise, Cyan, 120); + addMix(Turquoise, DarkViolet, RoyalBlue, 65); + addMix(Turquoise, DeepPink, MediumPurple, 55); + addMix(Turquoise, DeepSkyBlue, DarkTurquoise, 100); + addMix(Turquoise, DimGray, CadetBlue, 85); + addMix(Turquoise, DodgerBlue, DeepSkyBlue, 90); + addMix(Turquoise, Gold, YellowGreen, 85); + addMix(Turquoise, Goldenrod, DarkSeaGreen, 85); + addMix(Turquoise, Gray, LightSeaGreen, 95); + addMix(Turquoise, Green, MediumSeaGreen, 90); + addMix(Turquoise, HotPink, LightSteelBlue, 65); + addMix(Turquoise, IndianRed, CadetBlue, 60); + addMix(Turquoise, Indigo, RoyalBlue, 50); + addMix(Turquoise, Khaki, MediumAquamarine, 95); + addMix(Turquoise, Lavender, PaleTurquoise, 95); + addMix(Turquoise, LemonChiffon, Aquamarine, 100); + addMix(Turquoise, LightGray, PaleTurquoise, 100); + addMix(Turquoise, LightSeaGreen, DarkTurquoise, 115); + addMix(Turquoise, LightSteelBlue, DarkTurquoise, 100); + addMix(Turquoise, Lime, SpringGreen, 95); + addMix(Turquoise, LimeGreen, MediumSeaGreen, 100); + addMix(Turquoise, Magenta, MediumPurple, 75); + addMix(Turquoise, Maroon, DimGray, 45); + addMix(Turquoise, MediumAquamarine, DarkTurquoise, 120); + addMix(Turquoise, MediumOrchid, DodgerBlue, 75); + addMix(Turquoise, MediumPurple, DeepSkyBlue, 80); + addMix(Turquoise, MediumSeaGreen, MediumAquamarine, 110); + addMix(Turquoise, MediumVioletRed, MediumPurple, 60); + addMix(Turquoise, MistyRose, PaleTurquoise, 90); + addMix(Turquoise, Navy, SteelBlue, 45); + addMix(Turquoise, Olive, MediumSeaGreen, 85); + addMix(Turquoise, OliveDrab, MediumSeaGreen, 90); + addMix(Turquoise, Orange, YellowGreen, 80); + addMix(Turquoise, PaleGreen, Aquamarine, 105); + addMix(Turquoise, PaleTurquoise, Cyan, 115); + addMix(Turquoise, PaleVioletRed, DarkGray, 60); + addMix(Turquoise, Peru, DarkSeaGreen, 80); + addMix(Turquoise, Pink, PaleTurquoise, 75); + addMix(Turquoise, Plum, SkyBlue, 80); + addMix(Turquoise, Purple, RoyalBlue, 55); + addMix(Turquoise, Red, RosyBrown, 55); + addMix(Turquoise, RosyBrown, CadetBlue, 80); + addMix(Turquoise, RoyalBlue, DeepSkyBlue, 80); + addMix(Turquoise, Salmon, DarkGray, 65); + addMix(Turquoise, SandyBrown, DarkSeaGreen, 80); + addMix(Turquoise, SeaGreen, MediumAquamarine, 100); + addMix(Turquoise, Sienna, DarkSeaGreen, 65); + addMix(Turquoise, SkyBlue, DarkTurquoise, 110); + addMix(Turquoise, SlateBlue, DodgerBlue, 75); + addMix(Turquoise, SlateGray, LightSeaGreen, 95); + addMix(Turquoise, SpringGreen, Aquamarine, 105); + addMix(Turquoise, SteelBlue, CadetBlue, 90); + addMix(Turquoise, Tan, MediumAquamarine, 95); + addMix(Turquoise, Teal, LightSeaGreen, 100); + addMix(Turquoise, Thistle, PaleTurquoise, 85); + addMix(Violet, Aquamarine, LightSteelBlue, 75); + addMix(Violet, Black, Purple, 60); + addMix(Violet, Blue, SlateBlue, 85); + addMix(Violet, Brown, PaleVioletRed, 85); + addMix(Violet, CadetBlue, Plum, 95); + addMix(Violet, Chocolate, PaleVioletRed, 80); + addMix(Violet, Coral, PaleVioletRed, 85); + addMix(Violet, Crimson, DeepPink, 90); + addMix(Violet, Cyan, DeepSkyBlue, 70); + addMix(Violet, DarkGoldenrod, Salmon, 65); + addMix(Violet, DarkGray, Plum, 100); + addMix(Violet, DarkKhaki, RosyBrown, 65); + addMix(Violet, DarkOliveGreen, RosyBrown, 55); + addMix(Violet, DarkOrange, Salmon, 75); + addMix(Violet, DarkSalmon, HotPink, 90); + addMix(Violet, DarkSeaGreen, Thistle, 60); + addMix(Violet, DarkSlateBlue, MediumOrchid, 85); + addMix(Violet, DarkSlateGray, MediumPurple, 80); + addMix(Violet, DarkTurquoise, DodgerBlue, 75); + addMix(Violet, DarkViolet, MediumOrchid, 95); + addMix(Violet, DeepPink, HotPink, 110); + addMix(Violet, DeepSkyBlue, DodgerBlue, 75); + addMix(Violet, DimGray, MediumOrchid, 90); + addMix(Violet, DodgerBlue, MediumPurple, 90); + addMix(Violet, Gold, SandyBrown, 55); + addMix(Violet, Goldenrod, DarkSalmon, 65); + addMix(Violet, Gray, Plum, 95); + addMix(Violet, HotPink, Plum, 115); + addMix(Violet, IndianRed, PaleVioletRed, 95); + addMix(Violet, Indigo, DarkViolet, 80); + addMix(Violet, Khaki, Pink, 60); + addMix(Violet, Lavender, Plum, 100); + addMix(Violet, LemonChiffon, Pink, 70); + addMix(Violet, LightGray, Plum, 95); + addMix(Violet, LightSteelBlue, Plum, 100); + addMix(Violet, Magenta, MediumOrchid, 115); + addMix(Violet, Maroon, MediumVioletRed, 70); + addMix(Violet, MediumAquamarine, Thistle, 80); + addMix(Violet, MediumOrchid, Magenta, 115); + addMix(Violet, MediumPurple, MediumOrchid, 110); + addMix(Violet, MediumSeaGreen, DarkGray, 75); + addMix(Violet, MediumVioletRed, MediumOrchid, 100); + addMix(Violet, MistyRose, Plum, 95); + addMix(Violet, Navy, DarkViolet, 75); + addMix(Violet, Olive, RosyBrown, 55); + addMix(Violet, OliveDrab, RosyBrown, 50); + addMix(Violet, Orange, DarkSalmon, 65); + addMix(Violet, PaleTurquoise, Thistle, 90); + addMix(Violet, PaleVioletRed, HotPink, 110); + addMix(Violet, Peru, PaleVioletRed, 80); + addMix(Violet, Pink, Plum, 105); + addMix(Violet, Plum, HotPink, 120); + addMix(Violet, Purple, MediumOrchid, 85); + addMix(Violet, Red, DeepPink, 85); + addMix(Violet, RosyBrown, Plum, 100); + addMix(Violet, RoyalBlue, MediumPurple, 95); + addMix(Violet, Salmon, HotPink, 95); + addMix(Violet, SandyBrown, PaleVioletRed, 80); + addMix(Violet, Sienna, PaleVioletRed, 80); + addMix(Violet, SkyBlue, Plum, 90); + addMix(Violet, SlateBlue, MediumPurple, 100); + addMix(Violet, SlateGray, Plum, 100); + addMix(Violet, SpringGreen, LightSeaGreen, 70); + addMix(Violet, SteelBlue, MediumPurple, 90); + addMix(Violet, Tan, Plum, 80); + addMix(Violet, Teal, MediumPurple, 80); + addMix(Violet, Thistle, Plum, 105); + addMix(Violet, Turquoise, LightSteelBlue, 75); + addMix(Wheat, Aquamarine, PaleGreen, 100); + addMix(Wheat, Blue, MediumPurple, 50); + addMix(Wheat, Brown, DarkSalmon, 75); + addMix(Wheat, CadetBlue, DarkSeaGreen, 90); + addMix(Wheat, Chocolate, SandyBrown, 95); + addMix(Wheat, Coral, SandyBrown, 100); + addMix(Wheat, Crimson, Salmon, 80); + addMix(Wheat, Cyan, Turquoise, 90); + addMix(Wheat, DarkGoldenrod, Goldenrod, 100); + addMix(Wheat, DarkGray, Tan, 105); + addMix(Wheat, DarkGreen, OliveDrab, 75); + addMix(Wheat, DarkKhaki, Khaki, 110); + addMix(Wheat, DarkOliveGreen, DarkKhaki, 85); + addMix(Wheat, DarkOrange, Orange, 100); + addMix(Wheat, DarkSalmon, Tan, 105); + addMix(Wheat, DarkSeaGreen, DarkKhaki, 105); + addMix(Wheat, DarkSlateBlue, RosyBrown, 60); + addMix(Wheat, DarkSlateGray, DarkGray, 70); + addMix(Wheat, DarkTurquoise, MediumAquamarine, 90); + addMix(Wheat, DarkViolet, MediumOrchid, 60); + addMix(Wheat, DeepPink, PaleVioletRed, 75); + addMix(Wheat, DeepSkyBlue, SkyBlue, 80); + addMix(Wheat, DimGray, Tan, 85); + addMix(Wheat, DodgerBlue, SkyBlue, 75); + addMix(Wheat, Gold, Khaki, 110); + addMix(Wheat, Goldenrod, DarkKhaki, 105); + addMix(Wheat, Gray, Tan, 95); + addMix(Wheat, Green, DarkSeaGreen, 85); + addMix(Wheat, HotPink, Pink, 80); + addMix(Wheat, IndianRed, DarkSalmon, 85); + addMix(Wheat, Khaki, LemonChiffon, 115); + addMix(Wheat, Lavender, LightGray, 100); + addMix(Wheat, LemonChiffon, Khaki, 120); + addMix(Wheat, LightGray, LemonChiffon, 110); + addMix(Wheat, LightSeaGreen, MediumAquamarine, 90); + addMix(Wheat, LightSteelBlue, LightGray, 95); + addMix(Wheat, Lime, PaleGreen, 95); + addMix(Wheat, LimeGreen, YellowGreen, 95); + addMix(Wheat, Magenta, Violet, 70); + addMix(Wheat, Maroon, IndianRed, 60); + addMix(Wheat, MediumAquamarine, DarkSeaGreen, 100); + addMix(Wheat, MediumOrchid, Plum, 70); + addMix(Wheat, MediumPurple, Thistle, 75); + addMix(Wheat, MediumSeaGreen, DarkSeaGreen, 95); + addMix(Wheat, MediumVioletRed, PaleVioletRed, 70); + addMix(Wheat, MistyRose, Tan, 110); + addMix(Wheat, Olive, DarkKhaki, 95); + addMix(Wheat, OliveDrab, DarkKhaki, 95); + addMix(Wheat, Orange, Goldenrod, 105); + addMix(Wheat, PaleGreen, LemonChiffon, 100); + addMix(Wheat, PaleTurquoise, LemonChiffon, 100); + addMix(Wheat, PaleVioletRed, Pink, 85); + addMix(Wheat, Peru, Tan, 100); + addMix(Wheat, Pink, MistyRose, 100); + addMix(Wheat, Plum, Pink, 85); + addMix(Wheat, Purple, PaleVioletRed, 55); + addMix(Wheat, Red, Salmon, 85); + addMix(Wheat, RosyBrown, Tan, 100); + addMix(Wheat, RoyalBlue, LightSteelBlue, 70); + addMix(Wheat, Salmon, DarkSalmon, 95); + addMix(Wheat, SandyBrown, Tan, 110); + addMix(Wheat, SeaGreen, DarkSeaGreen, 90); + addMix(Wheat, Sienna, Peru, 85); + addMix(Wheat, SkyBlue, PaleTurquoise, 95); + addMix(Wheat, SlateBlue, Plum, 65); + addMix(Wheat, SlateGray, DarkGray, 90); + addMix(Wheat, SpringGreen, PaleGreen, 95); + addMix(Wheat, SteelBlue, DarkGray, 75); + addMix(Wheat, Tan, DarkKhaki, 115); + addMix(Wheat, Teal, DarkSeaGreen, 80); + addMix(Wheat, Thistle, MistyRose, 95); + addMix(Wheat, Turquoise, MediumAquamarine, 95); + addMix(Wheat, Violet, Pink, 75); + addMix(White, Aquamarine, PaleTurquoise, 100); + addMix(White, Blue, MediumPurple, 60); + addMix(White, Brown, RosyBrown, 70); + addMix(White, CadetBlue, PaleTurquoise, 95); + addMix(White, Chocolate, Tan, 85); + addMix(White, Coral, DarkSalmon, 90); + addMix(White, Crimson, PaleVioletRed, 75); + addMix(White, Cyan, PaleTurquoise, 100); + addMix(White, DarkGoldenrod, Tan, 85); + addMix(White, DarkGray, LightGray, 105); + addMix(White, DarkGreen, DarkSeaGreen, 70); + addMix(White, DarkKhaki, LemonChiffon, 100); + addMix(White, DarkOliveGreen, DarkSeaGreen, 75); + addMix(White, DarkOrange, SandyBrown, 90); + addMix(White, DarkSalmon, MistyRose, 95); + addMix(White, DarkSlateGray, DarkGray, 70); + addMix(White, DarkTurquoise, PaleTurquoise, 95); + addMix(White, DarkViolet, Violet, 70); + addMix(White, DeepPink, HotPink, 85); + addMix(White, DeepSkyBlue, SkyBlue, 95); + addMix(White, DimGray, DarkGray, 85); + addMix(White, DodgerBlue, SkyBlue, 85); + addMix(White, Gold, Khaki, 95); + addMix(White, Goldenrod, Wheat, 95); + addMix(White, Gray, LightGray, 95); + addMix(White, Green, DarkSeaGreen, 75); + addMix(White, HotPink, Pink, 90); + addMix(White, IndianRed, Pink, 85); + addMix(White, Indigo, MediumPurple, 50); + addMix(White, Khaki, LemonChiffon, 105); + addMix(White, Lavender, LightGray, 115); + addMix(White, LemonChiffon, Wheat, 110); + addMix(White, LightGray, Lavender, 120); + addMix(White, LightSeaGreen, PaleTurquoise, 95); + addMix(White, LightSteelBlue, Lavender, 110); + addMix(White, Lime, PaleGreen, 95); + addMix(White, LimeGreen, PaleGreen, 90); + addMix(White, Magenta, Violet, 85); + addMix(White, Maroon, RosyBrown, 55); + addMix(White, MediumAquamarine, PaleTurquoise, 100); + addMix(White, MediumOrchid, Plum, 80); + addMix(White, MediumPurple, Thistle, 85); + addMix(White, MediumSeaGreen, MediumAquamarine, 90); + addMix(White, MediumVioletRed, Plum, 75); + addMix(White, MistyRose, LightGray, 115); + addMix(White, Olive, DarkKhaki, 85); + addMix(White, OliveDrab, DarkSeaGreen, 85); + addMix(White, Orange, Wheat, 95); + addMix(White, PaleGreen, Aquamarine, 100); + addMix(White, PaleVioletRed, Pink, 90); + addMix(White, Peru, Tan, 90); + addMix(White, Pink, MistyRose, 105); + addMix(White, Plum, Thistle, 100); + addMix(White, Purple, Plum, 60); + addMix(White, Red, Salmon, 80); + addMix(White, RosyBrown, MistyRose, 95); + addMix(White, RoyalBlue, LightSteelBlue, 80); + addMix(White, Salmon, Pink, 95); + addMix(White, SandyBrown, Wheat, 95); + addMix(White, SeaGreen, DarkSeaGreen, 85); + addMix(White, Sienna, DarkSalmon, 75); + addMix(White, SkyBlue, PaleTurquoise, 105); + addMix(White, SlateBlue, LightSteelBlue, 75); + addMix(White, SlateGray, LightGray, 90); + addMix(White, SpringGreen, Aquamarine, 95); + addMix(White, SteelBlue, LightSteelBlue, 85); + addMix(White, Tan, Wheat, 105); + addMix(White, Teal, DarkTurquoise, 80); + addMix(White, Thistle, Lavender, 105); + addMix(White, Turquoise, PaleTurquoise, 100); + addMix(White, Violet, Plum, 95); + addMix(White, Wheat, LemonChiffon, 110); + addMix(Yellow, Aquamarine, PaleGreen, 95); + addMix(Yellow, Brown, Goldenrod, 55); + addMix(Yellow, CadetBlue, YellowGreen, 80); + addMix(Yellow, Chocolate, Goldenrod, 80); + addMix(Yellow, Coral, Goldenrod, 75); + addMix(Yellow, Crimson, DarkOrange, 55); + addMix(Yellow, Cyan, PaleGreen, 85); + addMix(Yellow, DarkGoldenrod, Gold, 95); + addMix(Yellow, DarkGray, Khaki, 90); + addMix(Yellow, DarkGreen, YellowGreen, 70); + addMix(Yellow, DarkKhaki, Khaki, 105); + addMix(Yellow, DarkOliveGreen, YellowGreen, 80); + addMix(Yellow, DarkOrange, Gold, 90); + addMix(Yellow, DarkSalmon, Gold, 80); + addMix(Yellow, DarkSeaGreen, YellowGreen, 95); + addMix(Yellow, DarkSlateGray, DarkKhaki, 60); + addMix(Yellow, DarkTurquoise, PaleGreen, 80); + addMix(Yellow, DeepSkyBlue, PaleGreen, 60); + addMix(Yellow, DimGray, DarkKhaki, 75); + addMix(Yellow, DodgerBlue, DarkSeaGreen, 45); + addMix(Yellow, Gold, Khaki, 115); + addMix(Yellow, Goldenrod, Gold, 100); + addMix(Yellow, Gray, DarkKhaki, 80); + addMix(Yellow, Green, YellowGreen, 80); + addMix(Yellow, HotPink, SandyBrown, 50); + addMix(Yellow, IndianRed, Goldenrod, 65); + addMix(Yellow, Khaki, Gold, 115); + addMix(Yellow, Lavender, Khaki, 80); + addMix(Yellow, LemonChiffon, Khaki, 105); + addMix(Yellow, LightGray, Khaki, 95); + addMix(Yellow, LightSeaGreen, YellowGreen, 80); + addMix(Yellow, LightSteelBlue, Khaki, 75); + addMix(Yellow, Lime, SpringGreen, 105); + addMix(Yellow, LimeGreen, YellowGreen, 100); + addMix(Yellow, Maroon, DarkGoldenrod, 45); + addMix(Yellow, MediumAquamarine, YellowGreen, 90); + addMix(Yellow, MediumSeaGreen, YellowGreen, 90); + addMix(Yellow, MistyRose, Khaki, 90); + addMix(Yellow, Olive, DarkKhaki, 90); + addMix(Yellow, OliveDrab, YellowGreen, 90); + addMix(Yellow, Orange, Gold, 95); + addMix(Yellow, PaleGreen, YellowGreen, 105); + addMix(Yellow, PaleTurquoise, Khaki, 90); + addMix(Yellow, PaleVioletRed, Goldenrod, 55); + addMix(Yellow, Peru, Gold, 90); + addMix(Yellow, Pink, Gold, 75); + addMix(Yellow, Plum, Khaki, 55); + addMix(Yellow, Red, DarkOrange, 60); + addMix(Yellow, RosyBrown, Gold, 75); + addMix(Yellow, Salmon, Goldenrod, 70); + addMix(Yellow, SandyBrown, Gold, 90); + addMix(Yellow, SeaGreen, YellowGreen, 85); + addMix(Yellow, Sienna, Goldenrod, 70); + addMix(Yellow, SkyBlue, YellowGreen, 75); + addMix(Yellow, SlateGray, DarkKhaki, 70); + addMix(Yellow, SpringGreen, Lime, 100); + addMix(Yellow, SteelBlue, YellowGreen, 55); + addMix(Yellow, Tan, Gold, 100); + addMix(Yellow, Teal, YellowGreen, 70); + addMix(Yellow, Thistle, Khaki, 75); + addMix(Yellow, Turquoise, PaleGreen, 85); + addMix(Yellow, Wheat, Khaki, 105); + addMix(Yellow, White, Khaki, 95); + addMix(YellowGreen, Aquamarine, PaleGreen, 100); + addMix(YellowGreen, Black, DarkOliveGreen, 55); + addMix(YellowGreen, Brown, DarkGoldenrod, 55); + addMix(YellowGreen, CadetBlue, DarkSeaGreen, 90); + addMix(YellowGreen, Chocolate, Goldenrod, 75); + addMix(YellowGreen, Coral, Goldenrod, 75); + addMix(YellowGreen, Crimson, Chocolate, 50); + addMix(YellowGreen, Cyan, SpringGreen, 90); + addMix(YellowGreen, DarkGoldenrod, DarkKhaki, 95); + addMix(YellowGreen, DarkGray, DarkKhaki, 100); + addMix(YellowGreen, DarkGreen, OliveDrab, 85); + addMix(YellowGreen, DarkOliveGreen, OliveDrab, 95); + addMix(YellowGreen, DarkOrange, Goldenrod, 85); + addMix(YellowGreen, DarkSalmon, DarkKhaki, 80); + addMix(YellowGreen, DarkSeaGreen, LimeGreen, 110); + addMix(YellowGreen, DarkSlateGray, OliveDrab, 70); + addMix(YellowGreen, DarkTurquoise, MediumSeaGreen, 90); + addMix(YellowGreen, DeepSkyBlue, MediumAquamarine, 70); + addMix(YellowGreen, DimGray, OliveDrab, 85); + addMix(YellowGreen, DodgerBlue, LightSeaGreen, 55); + addMix(YellowGreen, Gold, Yellow, 105); + addMix(YellowGreen, Goldenrod, DarkKhaki, 100); + addMix(YellowGreen, Gray, OliveDrab, 90); + addMix(YellowGreen, Green, OliveDrab, 100); + addMix(YellowGreen, HotPink, Tan, 45); + addMix(YellowGreen, IndianRed, DarkGoldenrod, 65); + addMix(YellowGreen, Khaki, DarkKhaki, 110); + addMix(YellowGreen, Lavender, DarkSeaGreen, 85); + addMix(YellowGreen, LemonChiffon, Khaki, 105); + addMix(YellowGreen, LightGray, DarkKhaki, 100); + addMix(YellowGreen, LightSeaGreen, MediumSeaGreen, 95); + addMix(YellowGreen, LightSteelBlue, DarkSeaGreen, 80); + addMix(YellowGreen, Lime, LimeGreen, 110); + addMix(YellowGreen, LimeGreen, Lime, 115); + addMix(YellowGreen, MediumAquamarine, LimeGreen, 105); + addMix(YellowGreen, MediumPurple, DarkGray, 45); + addMix(YellowGreen, MediumSeaGreen, LimeGreen, 110); + addMix(YellowGreen, MistyRose, Khaki, 90); + addMix(YellowGreen, Olive, OliveDrab, 105); + addMix(YellowGreen, OliveDrab, LimeGreen, 110); + addMix(YellowGreen, Orange, Gold, 90); + addMix(YellowGreen, PaleGreen, LimeGreen, 110); + addMix(YellowGreen, PaleTurquoise, PaleGreen, 95); + addMix(YellowGreen, PaleVioletRed, Tan, 60); + addMix(YellowGreen, Peru, DarkKhaki, 90); + addMix(YellowGreen, Pink, DarkKhaki, 75); + addMix(YellowGreen, Plum, DarkKhaki, 55); + addMix(YellowGreen, Red, Chocolate, 55); + addMix(YellowGreen, RosyBrown, DarkKhaki, 80); + addMix(YellowGreen, RoyalBlue, CadetBlue, 55); + addMix(YellowGreen, Salmon, Goldenrod, 70); + addMix(YellowGreen, SandyBrown, DarkKhaki, 90); + addMix(YellowGreen, SeaGreen, MediumSeaGreen, 100); + addMix(YellowGreen, Sienna, Olive, 70); + addMix(YellowGreen, SkyBlue, DarkSeaGreen, 80); + addMix(YellowGreen, SlateGray, DarkSeaGreen, 80); + addMix(YellowGreen, SpringGreen, LimeGreen, 110); + addMix(YellowGreen, SteelBlue, DarkSeaGreen, 65); + addMix(YellowGreen, Tan, DarkKhaki, 100); + addMix(YellowGreen, Teal, MediumSeaGreen, 85); + addMix(YellowGreen, Thistle, DarkKhaki, 75); + addMix(YellowGreen, Turquoise, PaleGreen, 95); + addMix(YellowGreen, Wheat, Khaki, 100); + addMix(YellowGreen, White, Khaki, 95); + addMix(YellowGreen, Yellow, Khaki, 110); + } + + public static void initColours() { + for (EnumFlowerColor color : values()) { + AlleleManager.alleleRegistry.registerAllele(color.allele); + } + } + + public static EnumFlowerColor get(int i) { + return values()[Math.max(0, i) % values().length]; + } + + public String getDisplayName() { + return I18n.translateToLocal("botany.color." + getName()); + } + + @Override + public String getName() { + return name().toLowerCase(); + } + + public IAlleleFlowerColor getFlowerColorAllele() { + return allele; + } +} diff --git a/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java b/api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java rename to api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java b/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java new file mode 100644 index 00000000..27883376 --- /dev/null +++ b/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java @@ -0,0 +1,6 @@ +package binnie.botany.api.genetics; + +import forestry.api.genetics.IAlleleInteger; + +public interface IAlleleFlowerColor extends IFlowerColor, IAlleleInteger { +} diff --git a/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java b/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java rename to api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java diff --git a/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java b/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java rename to api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java diff --git a/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java b/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java rename to api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java diff --git a/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java b/api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IBotanistTracker.java rename to api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java diff --git a/src/main/java/binnie/botany/api/genetics/IColorMix.java b/api/src/main/java/binnie/botany/api/genetics/IColorMix.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IColorMix.java rename to api/src/main/java/binnie/botany/api/genetics/IColorMix.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlower.java b/api/src/main/java/binnie/botany/api/genetics/IFlower.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlower.java rename to api/src/main/java/binnie/botany/api/genetics/IFlower.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerColor.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerColor.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerFactory.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerGenome.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerMutation.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerRoot.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerType.java b/api/src/main/java/binnie/botany/api/genetics/IFlowerType.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/IFlowerType.java rename to api/src/main/java/binnie/botany/api/genetics/IFlowerType.java diff --git a/src/main/java/binnie/botany/api/genetics/package-info.java b/api/src/main/java/binnie/botany/api/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/botany/api/genetics/package-info.java rename to api/src/main/java/binnie/botany/api/genetics/package-info.java diff --git a/src/main/java/binnie/botany/api/package-info.java b/api/src/main/java/binnie/botany/api/package-info.java similarity index 100% rename from src/main/java/binnie/botany/api/package-info.java rename to api/src/main/java/binnie/botany/api/package-info.java diff --git a/src/main/java/binnie/core/api/IBinnieRecipe.java b/api/src/main/java/binnie/core/api/IBinnieRecipe.java similarity index 100% rename from src/main/java/binnie/core/api/IBinnieRecipe.java rename to api/src/main/java/binnie/core/api/IBinnieRecipe.java diff --git a/src/main/java/binnie/core/api/ICraftingManager.java b/api/src/main/java/binnie/core/api/ICraftingManager.java similarity index 100% rename from src/main/java/binnie/core/api/ICraftingManager.java rename to api/src/main/java/binnie/core/api/ICraftingManager.java diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/api/src/main/java/binnie/core/api/block/BlockMetadata.java similarity index 94% rename from src/main/java/binnie/core/block/BlockMetadata.java rename to api/src/main/java/binnie/core/api/block/BlockMetadata.java index be6f603c..67ba7474 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/api/src/main/java/binnie/core/api/block/BlockMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.block; +package binnie.core.api.block; import javax.annotation.Nullable; import java.util.ArrayList; @@ -18,8 +18,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import binnie.core.BinnieCore; - +// TODO: move out of API public class BlockMetadata extends BlockContainer implements IBlockMetadata { public BlockMetadata(final Material material) { super(material); @@ -49,7 +48,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { drops = block.getDrops(world, pos, world.getBlockState(pos), 0); } boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/api/src/main/java/binnie/core/api/block/IBlockMetadata.java similarity index 89% rename from src/main/java/binnie/core/block/IBlockMetadata.java rename to api/src/main/java/binnie/core/api/block/IBlockMetadata.java index 6e3cc667..f6bc6b7f 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/api/src/main/java/binnie/core/api/block/IBlockMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.block; +package binnie.core.api.block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.state.IBlockState; @@ -7,6 +7,7 @@ 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); diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/api/src/main/java/binnie/core/api/block/TileEntityMetadata.java similarity index 98% rename from src/main/java/binnie/core/block/TileEntityMetadata.java rename to api/src/main/java/binnie/core/api/block/TileEntityMetadata.java index 9be053ee..0a4ab305 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/api/src/main/java/binnie/core/api/block/TileEntityMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.block; +package binnie.core.api.block; import com.google.common.base.Preconditions; @@ -15,6 +15,7 @@ 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; diff --git a/api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java b/api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java new file mode 100644 index 00000000..ca999943 --- /dev/null +++ b/api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java @@ -0,0 +1,148 @@ +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 getAllSpecies(); + + Collection getDiscoveredSpecies(World world, GameProfile player); + + List getAllBranches(); + + Collection getDiscoveredBranches(World world, GameProfile player); + + List getDiscoveredMutations(World world, GameProfile player); + + List getResultantMutations(final IAlleleSpecies species); + + List 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 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 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 getDiscoveredBranches(IBreedingTracker tracker); + + Collection getDiscoveredSpecies(IBreedingTracker tracker); + + @SideOnly(Side.CLIENT) + TextureAtlasSprite getUndiscoveredIcon(); + + @SideOnly(Side.CLIENT) + TextureAtlasSprite getDiscoveredIcon(); + + Class 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 getActiveKaryotype(); + + ItemStack getDefaultMember(String uid); +} diff --git a/src/main/java/binnie/core/api/package-info.java b/api/src/main/java/binnie/core/api/package-info.java similarity index 100% rename from src/main/java/binnie/core/api/package-info.java rename to api/src/main/java/binnie/core/api/package-info.java diff --git a/api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java b/api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java new file mode 100644 index 00000000..91a3c74d --- /dev/null +++ b/api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java @@ -0,0 +1,7 @@ +package binnie.extrabees.api; + +import binnie.core.api.genetics.IBreedingSystem; + +public class ExtraBeesAPI { + public static IBreedingSystem beeBreedingSystem; +} diff --git a/src/main/java/binnie/extratrees/api/CarpentryManager.java b/api/src/main/java/binnie/extratrees/api/CarpentryManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/CarpentryManager.java rename to api/src/main/java/binnie/extratrees/api/CarpentryManager.java diff --git a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java similarity index 100% rename from src/main/java/binnie/extratrees/api/ICarpentryInterface.java rename to api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java diff --git a/src/main/java/binnie/extratrees/api/IDesign.java b/api/src/main/java/binnie/extratrees/api/IDesign.java similarity index 100% rename from src/main/java/binnie/extratrees/api/IDesign.java rename to api/src/main/java/binnie/extratrees/api/IDesign.java diff --git a/src/main/java/binnie/extratrees/api/IDesignCategory.java b/api/src/main/java/binnie/extratrees/api/IDesignCategory.java similarity index 100% rename from src/main/java/binnie/extratrees/api/IDesignCategory.java rename to api/src/main/java/binnie/extratrees/api/IDesignCategory.java diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/api/src/main/java/binnie/extratrees/api/IDesignMaterial.java similarity index 100% rename from src/main/java/binnie/extratrees/api/IDesignMaterial.java rename to api/src/main/java/binnie/extratrees/api/IDesignMaterial.java diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/api/src/main/java/binnie/extratrees/api/IDesignSystem.java similarity index 100% rename from src/main/java/binnie/extratrees/api/IDesignSystem.java rename to api/src/main/java/binnie/extratrees/api/IDesignSystem.java diff --git a/src/main/java/binnie/extratrees/api/ILayout.java b/api/src/main/java/binnie/extratrees/api/ILayout.java similarity index 100% rename from src/main/java/binnie/extratrees/api/ILayout.java rename to api/src/main/java/binnie/extratrees/api/ILayout.java diff --git a/src/main/java/binnie/extratrees/api/IPattern.java b/api/src/main/java/binnie/extratrees/api/IPattern.java similarity index 96% rename from src/main/java/binnie/extratrees/api/IPattern.java rename to api/src/main/java/binnie/extratrees/api/IPattern.java index 6420eb45..bdde191b 100644 --- a/src/main/java/binnie/extratrees/api/IPattern.java +++ b/api/src/main/java/binnie/extratrees/api/IPattern.java @@ -17,4 +17,6 @@ public interface IPattern extends ISpriteRegister { ILayout getRotation(); ILayout getHorizontalFlip(); + + int getIndex(); } diff --git a/src/main/java/binnie/extratrees/api/IToolHammer.java b/api/src/main/java/binnie/extratrees/api/IToolHammer.java similarity index 100% rename from src/main/java/binnie/extratrees/api/IToolHammer.java rename to api/src/main/java/binnie/extratrees/api/IToolHammer.java diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java similarity index 67% rename from src/main/java/binnie/extratrees/carpentry/DesignerManager.java rename to api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java index 9d64660b..079e2b96 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java @@ -1,4 +1,4 @@ -package binnie.extratrees.carpentry; +package binnie.extratrees.api.carpentry; import java.util.ArrayList; import java.util.Collection; @@ -6,12 +6,12 @@ import java.util.List; import binnie.extratrees.api.IDesignSystem; -public class DesignerManager { +public final class DesignerManager { public static DesignerManager instance = new DesignerManager(); - List systems; + private final List systems; - public DesignerManager() { + private DesignerManager() { this.systems = new ArrayList<>(); } @@ -23,7 +23,7 @@ public class DesignerManager { return this.systems; } - public void addDesignSystem(final DesignSystem system) { + public void addDesignSystem(final IDesignSystem system) { this.systems.add(system); } } diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java similarity index 99% rename from src/main/java/binnie/extratrees/carpentry/EnumPattern.java rename to api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java index 388bef33..7b9573ae 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java @@ -1,4 +1,4 @@ -package binnie.extratrees.carpentry; +package binnie.extratrees.api.carpentry; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -11,6 +11,7 @@ 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, @@ -391,6 +392,11 @@ public enum EnumPattern implements IPattern { return this.horizontalFlip; } + @Override + public int getIndex() { + return ordinal(); + } + protected void setLeftRotation(final EnumPattern pattern, final boolean inverted) { this.leftRotation = Layout.get(pattern, inverted); } diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java b/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java new file mode 100644 index 00000000..456f3e70 --- /dev/null +++ b/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java @@ -0,0 +1,7 @@ +package binnie.extratrees.api.carpentry; + +import binnie.extratrees.api.IDesignSystem; + +public interface IBlockDesign { + IDesignSystem getDesignSystem(); +} diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java b/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java new file mode 100644 index 00000000..1045753d --- /dev/null +++ b/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java @@ -0,0 +1,4 @@ +package binnie.extratrees.api.carpentry; + +public interface IBlockDesignProperties { +} diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/api/src/main/java/binnie/extratrees/api/carpentry/Layout.java similarity index 97% rename from src/main/java/binnie/extratrees/carpentry/Layout.java rename to api/src/main/java/binnie/extratrees/api/carpentry/Layout.java index d6ae7d0a..dfc19e70 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/api/src/main/java/binnie/extratrees/api/carpentry/Layout.java @@ -1,4 +1,4 @@ -package binnie.extratrees.carpentry; +package binnie.extratrees.api.carpentry; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/binnie/extratrees/api/package-info.java b/api/src/main/java/binnie/extratrees/api/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/api/package-info.java rename to api/src/main/java/binnie/extratrees/api/package-info.java diff --git a/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java b/api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java rename to api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java b/api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java rename to api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java b/api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java rename to api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java b/api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java rename to api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java b/api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java rename to api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java b/api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java rename to api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java b/api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java rename to api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java diff --git a/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java b/api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java rename to api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java diff --git a/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java b/api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java rename to api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java diff --git a/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java b/api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java rename to api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java diff --git a/src/main/java/binnie/extratrees/api/recipes/package-info.java b/api/src/main/java/binnie/extratrees/api/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/api/recipes/package-info.java rename to api/src/main/java/binnie/extratrees/api/recipes/package-info.java diff --git a/src/main/java/binnie/genetics/api/IGene.java b/api/src/main/java/binnie/genetics/api/IGene.java similarity index 100% rename from src/main/java/binnie/genetics/api/IGene.java rename to api/src/main/java/binnie/genetics/api/IGene.java diff --git a/src/main/java/binnie/genetics/api/IItemAnalysable.java b/api/src/main/java/binnie/genetics/api/IItemAnalysable.java similarity index 100% rename from src/main/java/binnie/genetics/api/IItemAnalysable.java rename to api/src/main/java/binnie/genetics/api/IItemAnalysable.java diff --git a/src/main/java/binnie/genetics/api/IItemChargeable.java b/api/src/main/java/binnie/genetics/api/IItemChargeable.java similarity index 100% rename from src/main/java/binnie/genetics/api/IItemChargeable.java rename to api/src/main/java/binnie/genetics/api/IItemChargeable.java diff --git a/src/main/java/binnie/genetics/api/IItemSerum.java b/api/src/main/java/binnie/genetics/api/IItemSerum.java similarity index 100% rename from src/main/java/binnie/genetics/api/IItemSerum.java rename to api/src/main/java/binnie/genetics/api/IItemSerum.java diff --git a/src/main/java/binnie/genetics/api/package-info.java b/api/src/main/java/binnie/genetics/api/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/api/package-info.java rename to api/src/main/java/binnie/genetics/api/package-info.java diff --git a/botany/build.gradle b/botany/build.gradle new file mode 100644 index 00000000..de51b64f --- /dev/null +++ b/botany/build.gradle @@ -0,0 +1,9 @@ +archivesBaseName = 'botany-' + mcversion + +dependencies { + compile project(":api") + compile project(":core") + + // TODO: remove + compile project(":extratrees") +} diff --git a/src/main/java/binnie/botany/Botany.java b/botany/src/main/java/binnie/botany/Botany.java similarity index 85% rename from src/main/java/binnie/botany/Botany.java rename to botany/src/main/java/binnie/botany/Botany.java index 836ad340..4a694713 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/botany/src/main/java/binnie/botany/Botany.java @@ -1,12 +1,15 @@ 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.Constants; +import binnie.core.Constants; import binnie.botany.gui.BotanyGUI; import binnie.botany.network.PacketID; import binnie.botany.proxy.Proxy; @@ -15,8 +18,7 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; -import binnie.modules.BlankModuleContainer; -import binnie.modules.ModuleManager; +import binnie.core.modules.BlankModuleContainer; @Mod( modid = Constants.BOTANY_MOD_ID, @@ -32,10 +34,13 @@ public class Botany extends BlankModuleContainer { @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 diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/botany/src/main/java/binnie/botany/CreativeTabBotany.java similarity index 100% rename from src/main/java/binnie/botany/CreativeTabBotany.java rename to botany/src/main/java/binnie/botany/CreativeTabBotany.java diff --git a/src/main/java/binnie/botany/GardeningManager.java b/botany/src/main/java/binnie/botany/GardeningManager.java similarity index 100% rename from src/main/java/binnie/botany/GardeningManager.java rename to botany/src/main/java/binnie/botany/GardeningManager.java diff --git a/src/main/java/binnie/botany/blocks/BlockCeramic.java b/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java similarity index 94% rename from src/main/java/binnie/botany/blocks/BlockCeramic.java rename to botany/src/main/java/binnie/botany/blocks/BlockCeramic.java index 54adaefe..bd56e746 100644 --- a/src/main/java/binnie/botany/blocks/BlockCeramic.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockCeramic.java @@ -28,9 +28,8 @@ import forestry.api.core.IModelManager; import forestry.core.blocks.IColoredBlock; import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.tile.TileCeramic; -import binnie.core.BinnieCore; import binnie.core.util.TileUtil; public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegister { @@ -63,7 +62,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi drops = Collections.singletonList(ceramic.getStack()); } boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java b/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java similarity index 97% rename from src/main/java/binnie/botany/blocks/BlockCeramicBrick.java rename to botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java index cd6a3e45..eb5c7d6c 100644 --- a/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockCeramicBrick.java @@ -50,14 +50,13 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.CreativeTabBotany; import binnie.botany.ceramic.brick.CeramicBrickPair; import binnie.botany.ceramic.brick.CeramicBrickType; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.tile.TileCeramic; import binnie.botany.tile.TileCeramicBrick; -import binnie.core.BinnieCore; import binnie.core.block.IMultipassBlock; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; @@ -88,7 +87,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java b/botany/src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java similarity index 95% rename from src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java rename to botany/src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java index 8d760d39..d44169cd 100644 --- a/src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockCeramicPatterned.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import binnie.botany.ceramic.CeramicColor; import binnie.botany.ceramic.CeramicDesignSystem; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.carpentry.BlockDesign; diff --git a/src/main/java/binnie/botany/blocks/BlockFlower.java b/botany/src/main/java/binnie/botany/blocks/BlockFlower.java similarity index 98% rename from src/main/java/binnie/botany/blocks/BlockFlower.java rename to botany/src/main/java/binnie/botany/blocks/BlockFlower.java index 9f722839..f5c3dc80 100644 --- a/src/main/java/binnie/botany/blocks/BlockFlower.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockFlower.java @@ -149,7 +149,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState super.onBlockPlacedBy(world, pos, state, placer, stack); IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot(); TileEntity flower = world.getTileEntity(pos); - if (!BinnieCore.getBinnieProxy().isSimulating(world)) { + if (!!world.isRemote) { if (flower != null && flower instanceof TileEntityFlower) { IFlower f = flowerRoot.getMember(stack); if (f != null) { @@ -300,7 +300,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IState public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { List drops = getDrops(world, pos, world.getBlockState(pos), 0); boolean hasBeenBroken = world.setBlockToAir(pos); - if (hasBeenBroken && BinnieCore.getBinnieProxy().isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { + if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { spawnAsEntity(world, pos, drop); } diff --git a/src/main/java/binnie/botany/blocks/BlockPlant.java b/botany/src/main/java/binnie/botany/blocks/BlockPlant.java similarity index 100% rename from src/main/java/binnie/botany/blocks/BlockPlant.java rename to botany/src/main/java/binnie/botany/blocks/BlockPlant.java diff --git a/src/main/java/binnie/botany/blocks/BlockSoil.java b/botany/src/main/java/binnie/botany/blocks/BlockSoil.java similarity index 98% rename from src/main/java/binnie/botany/blocks/BlockSoil.java rename to botany/src/main/java/binnie/botany/blocks/BlockSoil.java index f5742709..b8102304 100644 --- a/src/main/java/binnie/botany/blocks/BlockSoil.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockSoil.java @@ -29,18 +29,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.Constants; +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.botany.modules.BotanyModuleUIDs; +import binnie.core.modules.BotanyModuleUIDs; import binnie.botany.modules.ModuleFlowers; import binnie.botany.modules.ModuleGardening; import binnie.core.util.I18N; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { public static final PropertyEnum MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class); diff --git a/src/main/java/binnie/botany/blocks/BlockStainedGlass.java b/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java similarity index 96% rename from src/main/java/binnie/botany/blocks/BlockStainedGlass.java rename to botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java index d949d6be..1de09acb 100644 --- a/src/main/java/binnie/botany/blocks/BlockStainedGlass.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java @@ -35,10 +35,10 @@ import forestry.api.core.IModelManager; import forestry.core.blocks.IColoredBlock; import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; +import binnie.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 { diff --git a/src/main/java/binnie/botany/blocks/PlantType.java b/botany/src/main/java/binnie/botany/blocks/PlantType.java similarity index 100% rename from src/main/java/binnie/botany/blocks/PlantType.java rename to botany/src/main/java/binnie/botany/blocks/PlantType.java diff --git a/src/main/java/binnie/botany/blocks/package-info.java b/botany/src/main/java/binnie/botany/blocks/package-info.java similarity index 100% rename from src/main/java/binnie/botany/blocks/package-info.java rename to botany/src/main/java/binnie/botany/blocks/package-info.java diff --git a/src/main/java/binnie/botany/blocks/properties/PropertyFlower.java b/botany/src/main/java/binnie/botany/blocks/properties/PropertyFlower.java similarity index 100% rename from src/main/java/binnie/botany/blocks/properties/PropertyFlower.java rename to botany/src/main/java/binnie/botany/blocks/properties/PropertyFlower.java diff --git a/src/main/java/binnie/botany/blocks/properties/package-info.java b/botany/src/main/java/binnie/botany/blocks/properties/package-info.java similarity index 100% rename from src/main/java/binnie/botany/blocks/properties/package-info.java rename to botany/src/main/java/binnie/botany/blocks/properties/package-info.java diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java similarity index 91% rename from src/main/java/binnie/botany/ceramic/CeramicColor.java rename to botany/src/main/java/binnie/botany/ceramic/CeramicColor.java index 78c115f4..a6fcf983 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -5,9 +5,9 @@ import java.util.Map; import net.minecraft.item.ItemStack; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; public class CeramicColor implements IDesignMaterial { diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java similarity index 83% rename from src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java rename to botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index a84b5ac3..d38a3b05 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -4,6 +4,8 @@ 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; @@ -15,15 +17,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.Botany; -import binnie.botany.genetics.EnumFlowerColor; +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; -import binnie.extratrees.carpentry.DesignerManager; -import binnie.extratrees.carpentry.EnumPattern; public class CeramicDesignSystem implements IDesignSystem { public static CeramicDesignSystem instance = new CeramicDesignSystem(); @@ -64,8 +64,9 @@ public class CeramicDesignSystem implements IDesignSystem { @Nullable @SideOnly(Side.CLIENT) public TextureAtlasSprite getPrimarySprite(IPattern pattern) { - if (pattern instanceof EnumPattern) { - return primary.get(((EnumPattern) pattern).ordinal()); + int index = pattern.getIndex(); + if (index > 0 && index < primary.size()) { + return primary.get(index); } return null; } @@ -74,8 +75,9 @@ public class CeramicDesignSystem implements IDesignSystem { @Nullable @SideOnly(Side.CLIENT) public TextureAtlasSprite getSecondarySprite(IPattern pattern) { - if (pattern instanceof EnumPattern) { - return secondary.get(((EnumPattern) pattern).ordinal()); + int index = pattern.getIndex(); + if (index > 0 && index < secondary.size()) { + return secondary.get(index); } return null; } @@ -87,8 +89,8 @@ public class CeramicDesignSystem implements IDesignSystem { 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.ordinal(), textureMap.registerSprite(primaryLocation)); - secondary.put(pattern.ordinal(), textureMap.registerSprite(secondaryLocation)); + primary.put(pattern.getIndex(), textureMap.registerSprite(primaryLocation)); + secondary.put(pattern.getIndex(), textureMap.registerSprite(secondaryLocation)); } } diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java similarity index 98% rename from src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java rename to botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java index 6effb4d5..89eb2dae 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java +++ b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java @@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagInt; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java similarity index 98% rename from src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java rename to botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java index efc813d8..922bcff8 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java +++ b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java @@ -11,10 +11,10 @@ import net.minecraft.util.IStringSerializable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.items.CeramicItems; import binnie.botany.modules.ModuleCeramic; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; public enum CeramicBrickType implements IStringSerializable { TILE("tile") { diff --git a/src/main/java/binnie/botany/ceramic/brick/package-info.java b/botany/src/main/java/binnie/botany/ceramic/brick/package-info.java similarity index 100% rename from src/main/java/binnie/botany/ceramic/brick/package-info.java rename to botany/src/main/java/binnie/botany/ceramic/brick/package-info.java diff --git a/src/main/java/binnie/botany/ceramic/package-info.java b/botany/src/main/java/binnie/botany/ceramic/package-info.java similarity index 100% rename from src/main/java/binnie/botany/ceramic/package-info.java rename to botany/src/main/java/binnie/botany/ceramic/package-info.java diff --git a/src/main/java/binnie/botany/core/BotanyCore.java b/botany/src/main/java/binnie/botany/core/BotanyCore.java similarity index 100% rename from src/main/java/binnie/botany/core/BotanyCore.java rename to botany/src/main/java/binnie/botany/core/BotanyCore.java diff --git a/src/main/java/binnie/botany/core/package-info.java b/botany/src/main/java/binnie/botany/core/package-info.java similarity index 100% rename from src/main/java/binnie/botany/core/package-info.java rename to botany/src/main/java/binnie/botany/core/package-info.java diff --git a/src/main/java/binnie/botany/farming/CircuitGarden.java b/botany/src/main/java/binnie/botany/farming/CircuitGarden.java similarity index 100% rename from src/main/java/binnie/botany/farming/CircuitGarden.java rename to botany/src/main/java/binnie/botany/farming/CircuitGarden.java diff --git a/src/main/java/binnie/botany/farming/FarmLogic.java b/botany/src/main/java/binnie/botany/farming/FarmLogic.java similarity index 100% rename from src/main/java/binnie/botany/farming/FarmLogic.java rename to botany/src/main/java/binnie/botany/farming/FarmLogic.java diff --git a/src/main/java/binnie/botany/farming/FarmableFlower.java b/botany/src/main/java/binnie/botany/farming/FarmableFlower.java similarity index 100% rename from src/main/java/binnie/botany/farming/FarmableFlower.java rename to botany/src/main/java/binnie/botany/farming/FarmableFlower.java diff --git a/src/main/java/binnie/botany/farming/FarmableVanillaFlower.java b/botany/src/main/java/binnie/botany/farming/FarmableVanillaFlower.java similarity index 100% rename from src/main/java/binnie/botany/farming/FarmableVanillaFlower.java rename to botany/src/main/java/binnie/botany/farming/FarmableVanillaFlower.java diff --git a/src/main/java/binnie/botany/farming/FlowerCrop.java b/botany/src/main/java/binnie/botany/farming/FlowerCrop.java similarity index 100% rename from src/main/java/binnie/botany/farming/FlowerCrop.java rename to botany/src/main/java/binnie/botany/farming/FlowerCrop.java diff --git a/src/main/java/binnie/botany/farming/GardenLogic.java b/botany/src/main/java/binnie/botany/farming/GardenLogic.java similarity index 99% rename from src/main/java/binnie/botany/farming/GardenLogic.java rename to botany/src/main/java/binnie/botany/farming/GardenLogic.java index 4fb20466..96b8e59b 100644 --- a/src/main/java/binnie/botany/farming/GardenLogic.java +++ b/botany/src/main/java/binnie/botany/farming/GardenLogic.java @@ -30,7 +30,7 @@ import forestry.api.farming.IFarmable; import forestry.core.owner.IOwnedTile; import forestry.core.utils.BlockUtil; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumFertiliserType; import binnie.botany.api.gardening.EnumMoisture; diff --git a/src/main/java/binnie/botany/farming/package-info.java b/botany/src/main/java/binnie/botany/farming/package-info.java similarity index 100% rename from src/main/java/binnie/botany/farming/package-info.java rename to botany/src/main/java/binnie/botany/farming/package-info.java diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/botany/src/main/java/binnie/botany/genetics/BotanistTracker.java similarity index 83% rename from src/main/java/binnie/botany/genetics/BotanistTracker.java rename to botany/src/main/java/binnie/botany/genetics/BotanistTracker.java index 4253b6d8..45b90fb1 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/botany/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -1,12 +1,12 @@ package binnie.botany.genetics; +import binnie.botany.api.BotanyAPI; import net.minecraft.entity.player.EntityPlayer; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; -import binnie.Binnie; import binnie.botany.api.genetics.IBotanistTracker; public class BotanistTracker extends BreedingTracker implements IBotanistTracker { @@ -20,7 +20,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker @Override protected IBreedingTracker getBreedingTracker(EntityPlayer player) { - return Binnie.GENETICS.getFlowerRoot().getBreedingTracker(player.world, player.getGameProfile()); + return BotanyAPI.flowerRoot.getBreedingTracker(player.world, player.getGameProfile()); } @Override diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java similarity index 98% rename from src/main/java/binnie/botany/genetics/EnumFlowerType.java rename to botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java index 8870a754..d8f0a03a 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/botany/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.api.genetics.EnumFlowerStage; import binnie.botany.api.genetics.IFlowerType; diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/botany/src/main/java/binnie/botany/genetics/Flower.java similarity index 100% rename from src/main/java/binnie/botany/genetics/Flower.java rename to botany/src/main/java/binnie/botany/genetics/Flower.java diff --git a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java similarity index 100% rename from src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java rename to botany/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java similarity index 96% rename from src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java rename to botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index a4d4e27a..80f497a8 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -2,6 +2,8 @@ package binnie.botany.genetics; import java.util.TreeSet; +import binnie.botany.api.BotanyAPI; +import binnie.botany.api.genetics.EnumFlowerColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -14,7 +16,7 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.botany.api.genetics.EnumFlowerChromosome; import binnie.botany.api.genetics.EnumFlowerStage; import binnie.botany.api.genetics.IBotanistTracker; @@ -37,7 +39,7 @@ public class FlowerBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.GENETICS.getFlowerRoot(); + return BotanyAPI.flowerRoot; } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java similarity index 86% rename from src/main/java/binnie/botany/genetics/FlowerDefinition.java rename to botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 62f8f621..02edaf92 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import binnie.botany.api.genetics.EnumFlowerColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -23,7 +24,7 @@ import forestry.api.genetics.IClassification; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.api.BotanyAPI; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; @@ -40,7 +41,7 @@ import binnie.botany.api.genetics.IFlowerType; import binnie.botany.core.BotanyCore; public enum FlowerDefinition implements IFlowerDefinition { - Dandelion("Dandelion", "taraxacum", "officinale", binnie.botany.genetics.EnumFlowerType.DANDELION, EnumFlowerColor.Yellow) { + Dandelion("Dandelion", "taraxacum", "officinale", EnumFlowerType.DANDELION, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -59,7 +60,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Poppy("Poppy", "papaver", "rhoeas", binnie.botany.genetics.EnumFlowerType.POPPY, EnumFlowerColor.Red) { + Poppy("Poppy", "papaver", "rhoeas", EnumFlowerType.POPPY, EnumFlowerColor.Red) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -79,7 +80,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Orchid("Orchid", "vanda", "coerulea", binnie.botany.genetics.EnumFlowerType.ORCHID, EnumFlowerColor.DeepSkyBlue) { + Orchid("Orchid", "vanda", "coerulea", EnumFlowerType.ORCHID, EnumFlowerColor.DeepSkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -97,7 +98,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Allium("Allium", "allium", "giganteum", binnie.botany.genetics.EnumFlowerType.ALLIUM, EnumFlowerColor.MediumPurple) { + Allium("Allium", "allium", "giganteum", EnumFlowerType.ALLIUM, EnumFlowerColor.MediumPurple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -115,7 +116,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Bluet("Bluet", "houstonia", "caerulea", binnie.botany.genetics.EnumFlowerType.BLUET, EnumFlowerColor.Lavender, EnumFlowerColor.Khaki) { + Bluet("Bluet", "houstonia", "caerulea", EnumFlowerType.BLUET, EnumFlowerColor.Lavender, EnumFlowerColor.Khaki) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setMoisture(EnumMoisture.DAMP); @@ -134,7 +135,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Tulip("Tulip", "tulipa", "agenensis", binnie.botany.genetics.EnumFlowerType.TULIP, EnumFlowerColor.Violet) { + Tulip("Tulip", "tulipa", "agenensis", EnumFlowerType.TULIP, EnumFlowerColor.Violet) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -152,7 +153,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Daisy("Daisy", "leucanthemum", "vulgare", binnie.botany.genetics.EnumFlowerType.DAISY, EnumFlowerColor.White, EnumFlowerColor.Yellow) { + Daisy("Daisy", "leucanthemum", "vulgare", EnumFlowerType.DAISY, EnumFlowerColor.White, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -172,7 +173,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Cornflower("Cornflower", "centaurea", "cyanus", binnie.botany.genetics.EnumFlowerType.CORNFLOWER, EnumFlowerColor.SkyBlue) { + Cornflower("Cornflower", "centaurea", "cyanus", EnumFlowerType.CORNFLOWER, EnumFlowerColor.SkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -191,7 +192,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Dandelion, Tulip, 10); } }, - Pansy("Pansy", "viola", "tricolor", binnie.botany.genetics.EnumFlowerType.PANSY, EnumFlowerColor.Pink, EnumFlowerColor.Purple) { + Pansy("Pansy", "viola", "tricolor", EnumFlowerType.PANSY, EnumFlowerColor.Pink, EnumFlowerColor.Purple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -210,7 +211,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Viola, 5); } }, - Iris("Iris", "iris", "germanica", binnie.botany.genetics.EnumFlowerType.IRIS, EnumFlowerColor.LightGray, EnumFlowerColor.Purple) { + Iris("Iris", "iris", "germanica", EnumFlowerType.IRIS, EnumFlowerColor.LightGray, EnumFlowerColor.Purple) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -229,7 +230,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Orchid, Viola, 10); } }, - Lavender("Lavender", "Lavandula", "angustifolia", binnie.botany.genetics.EnumFlowerType.LAVENDER, EnumFlowerColor.MediumOrchid) { + Lavender("Lavender", "Lavandula", "angustifolia", EnumFlowerType.LAVENDER, EnumFlowerColor.MediumOrchid) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -249,7 +250,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Allium, Viola, 10); } }, - Viola("Viola", "viola", "odorata", binnie.botany.genetics.EnumFlowerType.VIOLA, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue) { + Viola("Viola", "viola", "odorata", EnumFlowerType.VIOLA, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -267,7 +268,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Orchid, Poppy, 15); } }, - Daffodil("Daffodil", "narcissus", "pseudonarcissus", binnie.botany.genetics.EnumFlowerType.DAFFODIL, EnumFlowerColor.Yellow, EnumFlowerColor.Gold) { + Daffodil("Daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.DAFFODIL, EnumFlowerColor.Yellow, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -284,7 +285,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Dandelion, Poppy, 10); } }, - Dahlia("Dahlia", "dahlia", "variabilis", binnie.botany.genetics.EnumFlowerType.DAHLIA, EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink) { + Dahlia("Dahlia", "dahlia", "variabilis", EnumFlowerType.DAHLIA, EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -302,7 +303,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Daisy, Allium, 15); } }, - Peony("Peony", "paeonia", "suffruticosa", binnie.botany.genetics.EnumFlowerType.PEONY, EnumFlowerColor.Thistle) { + Peony("Peony", "paeonia", "suffruticosa", EnumFlowerType.PEONY, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -322,7 +323,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Rose("ROSE", "rosa", "rubiginosa", binnie.botany.genetics.EnumFlowerType.ROSE, EnumFlowerColor.Red) { + Rose("ROSE", "rosa", "rubiginosa", EnumFlowerType.ROSE, EnumFlowerColor.Red) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -341,7 +342,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Lilac("Lilac", "syringa", "vulgaris", binnie.botany.genetics.EnumFlowerType.LILAC, EnumFlowerColor.Plum) { + Lilac("Lilac", "syringa", "vulgaris", EnumFlowerType.LILAC, EnumFlowerColor.Plum) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -359,7 +360,7 @@ public enum FlowerDefinition implements IFlowerDefinition { protected void registerMutations() { } }, - Hydrangea("Hydrangea", "hydrangea", "macrophylla", binnie.botany.genetics.EnumFlowerType.HYDRANGEA, EnumFlowerColor.DeepSkyBlue) { + Hydrangea("Hydrangea", "hydrangea", "macrophylla", EnumFlowerType.HYDRANGEA, EnumFlowerColor.DeepSkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setMoisture(EnumMoisture.DAMP); @@ -379,7 +380,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Peony, Bluet, 10); } }, - Foxglove("Foxglove", "digitalis", "purpurea", binnie.botany.genetics.EnumFlowerType.FOXGLOVE, EnumFlowerColor.HotPink) { + Foxglove("Foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HotPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -400,7 +401,7 @@ public enum FlowerDefinition implements IFlowerDefinition { // vanilla } }, - Zinnia("Zinnia", "zinnia", "elegans", binnie.botany.genetics.EnumFlowerType.ZINNIA, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Yellow) { + Zinnia("Zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -419,7 +420,7 @@ public enum FlowerDefinition implements IFlowerDefinition { Zinnia.registerMutation(Dahlia, Marigold, 5); } }, - Chrysanthemum("Chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", binnie.botany.genetics.EnumFlowerType.MUMS, EnumFlowerColor.Violet) { + Chrysanthemum("Chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.Violet) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -439,7 +440,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Geranium, Rose, 10); } }, - Marigold("Marigold", "calendula", "officinalis", binnie.botany.genetics.EnumFlowerType.MARIGOLD, EnumFlowerColor.Gold, EnumFlowerColor.DarkOrange) { + Marigold("Marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.Gold, EnumFlowerColor.DarkOrange) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -459,7 +460,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Daisy, Dandelion, 10); } }, - Geranium("Geranium", "geranium", "maderense", binnie.botany.genetics.EnumFlowerType.GERANIUM, EnumFlowerColor.DeepPink) { + Geranium("Geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DeepPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -480,7 +481,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Orchid, 15); } }, - Azalea("Azalea", "rhododendrons", "aurigeranum", binnie.botany.genetics.EnumFlowerType.AZALEA, EnumFlowerColor.HotPink) { + Azalea("Azalea", "rhododendrons", "aurigeranum", EnumFlowerType.AZALEA, EnumFlowerColor.HotPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -495,7 +496,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Orchid, Geranium, 5); } }, - Primrose("Primrose", "primula", "vulgaris", binnie.botany.genetics.EnumFlowerType.PRIMROSE, EnumFlowerColor.Red, EnumFlowerColor.Gold) { + Primrose("Primrose", "primula", "vulgaris", EnumFlowerType.PRIMROSE, EnumFlowerColor.Red, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -513,7 +514,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Chrysanthemum, Auricula, 5); } }, - Aster("Aster", "aster", "amellus", binnie.botany.genetics.EnumFlowerType.ASTER, EnumFlowerColor.MediumPurple, EnumFlowerColor.Goldenrod) { + Aster("Aster", "aster", "amellus", EnumFlowerType.ASTER, EnumFlowerColor.MediumPurple, EnumFlowerColor.Goldenrod) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -529,7 +530,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Daisy, Tulip, 10); } }, - Carnation("Carnation", "dianthus", "caryophyllus", binnie.botany.genetics.EnumFlowerType.CARNATION, EnumFlowerColor.Crimson, EnumFlowerColor.White) { + Carnation("Carnation", "dianthus", "caryophyllus", EnumFlowerType.CARNATION, EnumFlowerColor.Crimson, EnumFlowerColor.White) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -547,7 +548,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Dianthus, Rose, 5); } }, - Lily("Lily", "lilium", "auratum", binnie.botany.genetics.EnumFlowerType.LILY, EnumFlowerColor.Pink, EnumFlowerColor.Gold) { + Lily("Lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.Pink, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -567,7 +568,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Chrysanthemum, 5); } }, - Yarrow("Yarrow", "achillea", "millefolium", binnie.botany.genetics.EnumFlowerType.YARROW, EnumFlowerColor.Yellow) { + Yarrow("Yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -587,7 +588,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Dandelion, Orchid, 10); } }, - Petunia("Petunia", "petunia", "\u00ef?? atkinsiana", binnie.botany.genetics.EnumFlowerType.Petunia, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Thistle) { + Petunia("Petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.Petunia, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -606,7 +607,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Dahlia, 5); } }, - Agapanthus("Agapanthus", "agapanthus", "praecox", binnie.botany.genetics.EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DeepSkyBlue) { + Agapanthus("Agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DeepSkyBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -626,7 +627,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Allium, Geranium, 5); } }, - Fuchsia("Fuchsia", "fuchsia", "magellanica", binnie.botany.genetics.EnumFlowerType.FUCHSIA, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid) { + Fuchsia("Fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -646,7 +647,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Foxglove, Dahlia, 5); } }, - Dianthus("Dianthus", "dianthus", "barbatus", binnie.botany.genetics.EnumFlowerType.DIANTHUS, EnumFlowerColor.Crimson, EnumFlowerColor.HotPink) { + Dianthus("Dianthus", "dianthus", "barbatus", EnumFlowerType.DIANTHUS, EnumFlowerColor.Crimson, EnumFlowerColor.HotPink) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -667,7 +668,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Poppy, 15); } }, - Forget("Forget-me-nots", "myosotis", "arvensis", binnie.botany.genetics.EnumFlowerType.FORGET, EnumFlowerColor.LightSteelBlue) { + Forget("Forget-me-nots", "myosotis", "arvensis", EnumFlowerType.FORGET, EnumFlowerColor.LightSteelBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -686,7 +687,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Orchid, Bluet, 10); } }, - Anemone("Anemone", "anemone", "coronaria", binnie.botany.genetics.EnumFlowerType.ANEMONE, EnumFlowerColor.Red, EnumFlowerColor.MistyRose) { + Anemone("Anemone", "anemone", "coronaria", EnumFlowerType.ANEMONE, EnumFlowerColor.Red, EnumFlowerColor.MistyRose) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -705,7 +706,7 @@ public enum FlowerDefinition implements IFlowerDefinition { FlowerDefinition.Anemone.registerMutation(FlowerDefinition.Aquilegia, FlowerDefinition.Rose, 5); } }, - Aquilegia("Aquilegia", "aquilegia", "vulgaris", binnie.botany.genetics.EnumFlowerType.AQUILEGIA, EnumFlowerColor.SlateBlue, EnumFlowerColor.Thistle) { + Aquilegia("Aquilegia", "aquilegia", "vulgaris", EnumFlowerType.AQUILEGIA, EnumFlowerColor.SlateBlue, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -721,7 +722,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Iris, Poppy, 5); } }, - Edelweiss("Edelweiss", "leontopodium", "alpinum", binnie.botany.genetics.EnumFlowerType.EDELWEISS, EnumFlowerColor.White, EnumFlowerColor.Khaki) { + Edelweiss("Edelweiss", "leontopodium", "alpinum", EnumFlowerType.EDELWEISS, EnumFlowerColor.White, EnumFlowerColor.Khaki) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ALKALINE); @@ -742,7 +743,7 @@ public enum FlowerDefinition implements IFlowerDefinition { FlowerDefinition.Edelweiss.registerMutation(FlowerDefinition.Peony, FlowerDefinition.Bluet, 5); } }, - Scabious("Scabious", "scabiosa", "columbaria", binnie.botany.genetics.EnumFlowerType.SCABIOUS, EnumFlowerColor.RoyalBlue) { + Scabious("Scabious", "scabiosa", "columbaria", EnumFlowerType.SCABIOUS, EnumFlowerColor.RoyalBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -761,7 +762,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Allium, Cornflower, 5); } }, - Coneflower("Coneflower", "echinacea", "purpurea", binnie.botany.genetics.EnumFlowerType.CONEFLOWER, EnumFlowerColor.Violet, EnumFlowerColor.DarkOrange) { + Coneflower("Coneflower", "echinacea", "purpurea", EnumFlowerType.CONEFLOWER, EnumFlowerColor.Violet, EnumFlowerColor.DarkOrange) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -778,7 +779,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Tulip, Cornflower, 5); } }, - Gaillardia("Gaillardia", "gaillardia", "aristata", binnie.botany.genetics.EnumFlowerType.GAILLARDIA, EnumFlowerColor.DarkOrange, EnumFlowerColor.Yellow) { + Gaillardia("Gaillardia", "gaillardia", "aristata", EnumFlowerType.GAILLARDIA, EnumFlowerColor.DarkOrange, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setMoisture(EnumMoisture.DAMP); @@ -800,7 +801,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Dandelion, Marigold, 5); } }, - Auricula("Auricula", "primula", "auricula", binnie.botany.genetics.EnumFlowerType.AURICULA, EnumFlowerColor.Red, EnumFlowerColor.Yellow) { + Auricula("Auricula", "primula", "auricula", EnumFlowerType.AURICULA, EnumFlowerColor.Red, EnumFlowerColor.Yellow) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -820,7 +821,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Poppy, Geranium, 10); } }, - Camellia("Camellia", "camellia", "japonica", binnie.botany.genetics.EnumFlowerType.CAMELLIA, EnumFlowerColor.Crimson) { + Camellia("Camellia", "camellia", "japonica", EnumFlowerType.CAMELLIA, EnumFlowerColor.Crimson) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setPH(EnumAcidity.ACID); @@ -840,7 +841,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Hydrangea, Rose, 5); } }, - Goldenrod("Goldenrod", "solidago", "canadensis", binnie.botany.genetics.EnumFlowerType.GOLDENROD, EnumFlowerColor.Gold) { + Goldenrod("Goldenrod", "solidago", "canadensis", EnumFlowerType.GOLDENROD, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -858,7 +859,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Lilac, Marigold, 10); } }, - Althea("Althea", "althaea", "officinalis", binnie.botany.genetics.EnumFlowerType.ALTHEA, EnumFlowerColor.Thistle, EnumFlowerColor.MediumOrchid) { + Althea("Althea", "althaea", "officinalis", EnumFlowerType.ALTHEA, EnumFlowerColor.Thistle, EnumFlowerColor.MediumOrchid) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setTemperature(EnumTemperature.WARM); @@ -879,7 +880,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Hydrangea, Iris, 5); } }, - Penstemon("Penstemon", "penstemon", "digitalis", binnie.botany.genetics.EnumFlowerType.PENSTEMON, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Thistle) { + Penstemon("Penstemon", "penstemon", "digitalis", EnumFlowerType.PENSTEMON, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Thistle) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setMoisture(EnumMoisture.DRY); @@ -901,7 +902,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Peony, Lilac, 5); } }, - Delphinium("Delphinium", "delphinium", "staphisagria", binnie.botany.genetics.EnumFlowerType.DELPHINIUM, EnumFlowerColor.DarkSlateBlue) { + Delphinium("Delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DarkSlateBlue) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { flowerSpecies.setMoisture(EnumMoisture.DAMP); @@ -922,7 +923,7 @@ public enum FlowerDefinition implements IFlowerDefinition { registerMutation(Lilac, Bluet, 5); } }, - Hollyhock("Hollyhock", "Alcea", "rosea", binnie.botany.genetics.EnumFlowerType.HOLLYHOCK, EnumFlowerColor.Black, EnumFlowerColor.Gold) { + Hollyhock("Hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.Black, EnumFlowerColor.Gold) { @Override protected void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies) { } @@ -943,7 +944,7 @@ public enum FlowerDefinition implements IFlowerDefinition { public static FlowerDefinition[] VALUES = values(); private final IAlleleFlowerSpecies species; - IFlowerType type; + IFlowerType type; String name; String binomial; String branchName; @@ -954,15 +955,15 @@ public enum FlowerDefinition implements IFlowerDefinition { private IAllele[] template; private IFlowerGenome genome; - FlowerDefinition(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) { + FlowerDefinition(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) { this(name, branch, binomial, type, false, colour, colour); } - FlowerDefinition(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { + FlowerDefinition(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { this(name, branch, binomial, type, true, primaryColor, secondaryColor); } - FlowerDefinition(String name, String branch, String binomial, IFlowerType flowerType, boolean isDominant, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { + FlowerDefinition(String name, String branch, String binomial, IFlowerType flowerType, boolean isDominant, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { String uid = Constants.BOTANY_MOD_ID + ".flower" + this; String unlocalizedDescription = "botany.description.flower" + this; String unlocalizedName = "botany.flowers.species." + name; @@ -1004,9 +1005,9 @@ public enum FlowerDefinition implements IFlowerDefinition { MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(BotanyAPI.flowerRoot, IAlleleFlowerSpecies.class)); for (FlowerDefinition def : values()) { @SuppressWarnings("unchecked") - IFlowerType type = def.species.getType(); - if (binnie.botany.genetics.EnumFlowerType.highestSection < type.getSections()) { - binnie.botany.genetics.EnumFlowerType.highestSection = type.getSections(); + IFlowerType type = def.species.getType(); + if (EnumFlowerType.highestSection < type.getSections()) { + EnumFlowerType.highestSection = type.getSections(); } } } diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/botany/src/main/java/binnie/botany/genetics/FlowerFactory.java similarity index 100% rename from src/main/java/binnie/botany/genetics/FlowerFactory.java rename to botany/src/main/java/binnie/botany/genetics/FlowerFactory.java diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/botany/src/main/java/binnie/botany/genetics/FlowerGenome.java similarity index 98% rename from src/main/java/binnie/botany/genetics/FlowerGenome.java rename to botany/src/main/java/binnie/botany/genetics/FlowerGenome.java index 7a66bc69..c2acccdc 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -15,7 +15,7 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.botany.api.BotanyAPI; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; @@ -24,7 +24,7 @@ import binnie.botany.api.genetics.IAlleleFlowerSpecies; import binnie.botany.api.genetics.IFlowerGenome; import binnie.botany.api.genetics.IFlowerType; import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.allele.AlleleFlowerColor; +import binnie.botany.api.genetics.AlleleFlowerColor; public class FlowerGenome extends Genome implements IFlowerGenome { public FlowerGenome(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/botany/src/main/java/binnie/botany/genetics/FlowerMutation.java similarity index 100% rename from src/main/java/binnie/botany/genetics/FlowerMutation.java rename to botany/src/main/java/binnie/botany/genetics/FlowerMutation.java diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java similarity index 99% rename from src/main/java/binnie/botany/genetics/FlowerRoot.java rename to botany/src/main/java/binnie/botany/genetics/FlowerRoot.java index 50e64175..d9f37568 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/botany/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import binnie.botany.api.genetics.EnumFlowerColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/binnie/botany/genetics/allele/AlleleEffectNone.java b/botany/src/main/java/binnie/botany/genetics/allele/AlleleEffectNone.java similarity index 100% rename from src/main/java/binnie/botany/genetics/allele/AlleleEffectNone.java rename to botany/src/main/java/binnie/botany/genetics/allele/AlleleEffectNone.java diff --git a/src/main/java/binnie/botany/genetics/allele/AlleleFlowerSpecies.java b/botany/src/main/java/binnie/botany/genetics/allele/AlleleFlowerSpecies.java similarity index 100% rename from src/main/java/binnie/botany/genetics/allele/AlleleFlowerSpecies.java rename to botany/src/main/java/binnie/botany/genetics/allele/AlleleFlowerSpecies.java diff --git a/src/main/java/binnie/botany/genetics/allele/package-info.java b/botany/src/main/java/binnie/botany/genetics/allele/package-info.java similarity index 100% rename from src/main/java/binnie/botany/genetics/allele/package-info.java rename to botany/src/main/java/binnie/botany/genetics/allele/package-info.java diff --git a/src/main/java/binnie/botany/genetics/package-info.java b/botany/src/main/java/binnie/botany/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/botany/genetics/package-info.java rename to botany/src/main/java/binnie/botany/genetics/package-info.java diff --git a/src/main/java/binnie/botany/gui/BotanyGUI.java b/botany/src/main/java/binnie/botany/gui/BotanyGUI.java similarity index 100% rename from src/main/java/binnie/botany/gui/BotanyGUI.java rename to botany/src/main/java/binnie/botany/gui/BotanyGUI.java diff --git a/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/ControlColorDisplay.java rename to botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java diff --git a/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/ControlColorMixBox.java rename to botany/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java diff --git a/src/main/java/binnie/botany/gui/database/ControlColorMixItem.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixItem.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/ControlColorMixItem.java rename to botany/src/main/java/binnie/botany/gui/database/ControlColorMixItem.java diff --git a/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java rename to botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java diff --git a/src/main/java/binnie/botany/gui/database/ControlColorOption.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/ControlColorOption.java rename to botany/src/main/java/binnie/botany/gui/database/ControlColorOption.java diff --git a/src/main/java/binnie/botany/gui/database/PageColorMix.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/PageColorMix.java rename to botany/src/main/java/binnie/botany/gui/database/PageColorMix.java diff --git a/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/PageColorMixResultant.java rename to botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java diff --git a/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java b/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java similarity index 96% rename from src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java rename to botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java index bf0245af..1d571fcf 100644 --- a/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java @@ -1,12 +1,12 @@ package binnie.botany.gui.database; +import binnie.botany.api.BotanyAPI; import net.minecraft.item.ItemStack; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import binnie.Binnie; import binnie.botany.api.genetics.EnumFlowerChromosome; import binnie.botany.api.genetics.EnumFlowerStage; import binnie.botany.api.genetics.IAlleleFlowerSpecies; @@ -34,12 +34,12 @@ public class PageSpeciesFlowerGenome extends PageSpecies { @Override public void onValueChanged(IAlleleSpecies species) { deleteAllChildren(); - IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID()); + IAllele[] template = BotanyAPI.flowerRoot.getTemplate(species.getUID()); if (template == null) { return; } - IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template); + IFlower tree = BotanyAPI.flowerRoot.templateAsIndividual(template); IFlowerGenome genome = tree.getGenome(); IAlleleFlowerSpecies treeSpecies = genome.getPrimary(); int w = 144; diff --git a/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java similarity index 96% rename from src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java rename to botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java index 89220caa..f61da2d6 100644 --- a/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java +++ b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -9,10 +9,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.genetics.IFlowerColor; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.AbstractMod; import binnie.core.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; @@ -33,7 +32,7 @@ import binnie.core.util.I18N; public class WindowBotanistDatabase extends WindowAbstractDatabase { public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) { - super(player, side, nei, Binnie.GENETICS.flowerBreedingSystem, 130); + super(player, side, nei, Botany.flowerBreedingSystem, 130); } public static Window create(EntityPlayer player, Side side, boolean nei) { diff --git a/src/main/java/binnie/botany/gui/database/package-info.java b/botany/src/main/java/binnie/botany/gui/database/package-info.java similarity index 100% rename from src/main/java/binnie/botany/gui/database/package-info.java rename to botany/src/main/java/binnie/botany/gui/database/package-info.java diff --git a/src/main/java/binnie/botany/gui/package-info.java b/botany/src/main/java/binnie/botany/gui/package-info.java similarity index 100% rename from src/main/java/binnie/botany/gui/package-info.java rename to botany/src/main/java/binnie/botany/gui/package-info.java diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/botany/src/main/java/binnie/botany/items/BotanyItems.java similarity index 100% rename from src/main/java/binnie/botany/items/BotanyItems.java rename to botany/src/main/java/binnie/botany/items/BotanyItems.java diff --git a/src/main/java/binnie/botany/items/CeramicItems.java b/botany/src/main/java/binnie/botany/items/CeramicItems.java similarity index 100% rename from src/main/java/binnie/botany/items/CeramicItems.java rename to botany/src/main/java/binnie/botany/items/CeramicItems.java diff --git a/src/main/java/binnie/botany/items/EnumTubeInsulate.java b/botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java similarity index 100% rename from src/main/java/binnie/botany/items/EnumTubeInsulate.java rename to botany/src/main/java/binnie/botany/items/EnumTubeInsulate.java diff --git a/src/main/java/binnie/botany/items/EnumTubeMaterial.java b/botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java similarity index 100% rename from src/main/java/binnie/botany/items/EnumTubeMaterial.java rename to botany/src/main/java/binnie/botany/items/EnumTubeMaterial.java diff --git a/src/main/java/binnie/botany/items/ItemBotany.java b/botany/src/main/java/binnie/botany/items/ItemBotany.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemBotany.java rename to botany/src/main/java/binnie/botany/items/ItemBotany.java diff --git a/src/main/java/binnie/botany/items/ItemCeramic.java b/botany/src/main/java/binnie/botany/items/ItemCeramic.java similarity index 95% rename from src/main/java/binnie/botany/items/ItemCeramic.java rename to botany/src/main/java/binnie/botany/items/ItemCeramic.java index ac934509..c1f3dcbd 100644 --- a/src/main/java/binnie/botany/items/ItemCeramic.java +++ b/botany/src/main/java/binnie/botany/items/ItemCeramic.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.IColoredItem; import binnie.botany.blocks.BlockCeramic; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.util.I18N; public class ItemCeramic extends ItemBlock implements IColoredItem { diff --git a/src/main/java/binnie/botany/items/ItemCeramicBrick.java b/botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemCeramicBrick.java rename to botany/src/main/java/binnie/botany/items/ItemCeramicBrick.java diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/botany/src/main/java/binnie/botany/items/ItemClay.java similarity index 96% rename from src/main/java/binnie/botany/items/ItemClay.java rename to botany/src/main/java/binnie/botany/items/ItemClay.java index edb3f599..a2249e1a 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/botany/src/main/java/binnie/botany/items/ItemClay.java @@ -12,7 +12,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.items.IColoredItem; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.util.I18N; public class ItemClay extends ItemBotany implements IColoredItem, IItemModelRegister { diff --git a/src/main/java/binnie/botany/items/ItemDatabaseBotany.java b/botany/src/main/java/binnie/botany/items/ItemDatabaseBotany.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemDatabaseBotany.java rename to botany/src/main/java/binnie/botany/items/ItemDatabaseBotany.java diff --git a/src/main/java/binnie/botany/items/ItemFlowerGE.java b/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java similarity index 98% rename from src/main/java/binnie/botany/items/ItemFlowerGE.java rename to botany/src/main/java/binnie/botany/items/ItemFlowerGE.java index fd00fe73..b5f8fa50 100644 --- a/src/main/java/binnie/botany/items/ItemFlowerGE.java +++ b/botany/src/main/java/binnie/botany/items/ItemFlowerGE.java @@ -1,5 +1,6 @@ package binnie.botany.items; +import binnie.botany.api.BotanyAPI; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -38,7 +39,6 @@ import forestry.api.genetics.IPollinatable; import forestry.core.config.Config; import forestry.core.items.IColoredItem; -import binnie.Binnie; import binnie.botany.CreativeTabBotany; import binnie.botany.api.genetics.EnumFlowerChromosome; import binnie.botany.api.genetics.EnumFlowerStage; @@ -200,7 +200,7 @@ public class ItemFlowerGE extends Item implements IColoredItem, IItemModelRegist } private EnumActionResult pollinateFlower(World world, BlockPos pos, EntityPlayer player, ItemStack stack){ - IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack); + IFlower flower = BotanyAPI.flowerRoot.getMember(stack); TileEntity target = world.getTileEntity(pos); if (!(target instanceof IPollinatable)) { return EnumActionResult.PASS; diff --git a/src/main/java/binnie/botany/items/ItemInsulatedTube.java b/botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemInsulatedTube.java rename to botany/src/main/java/binnie/botany/items/ItemInsulatedTube.java diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/botany/src/main/java/binnie/botany/items/ItemPigment.java similarity index 97% rename from src/main/java/binnie/botany/items/ItemPigment.java rename to botany/src/main/java/binnie/botany/items/ItemPigment.java index 7fe875a8..81ee5be9 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/botany/src/main/java/binnie/botany/items/ItemPigment.java @@ -13,7 +13,7 @@ import forestry.api.core.IModelManager; import forestry.core.items.IColoredItem; import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.util.I18N; public class ItemPigment extends Item implements IItemModelRegister, IColoredItem { diff --git a/src/main/java/binnie/botany/items/ItemSoil.java b/botany/src/main/java/binnie/botany/items/ItemSoil.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemSoil.java rename to botany/src/main/java/binnie/botany/items/ItemSoil.java diff --git a/src/main/java/binnie/botany/items/ItemSoilMeter.java b/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java similarity index 96% rename from src/main/java/binnie/botany/items/ItemSoilMeter.java rename to botany/src/main/java/binnie/botany/items/ItemSoilMeter.java index 004557e0..ec3f56cc 100644 --- a/src/main/java/binnie/botany/items/ItemSoilMeter.java +++ b/botany/src/main/java/binnie/botany/items/ItemSoilMeter.java @@ -25,7 +25,6 @@ import binnie.botany.api.gardening.EnumMoisture; import binnie.botany.api.gardening.IBlockSoil; import binnie.botany.api.gardening.IGardeningManager; import binnie.botany.core.BotanyCore; -import binnie.core.BinnieCore; import binnie.core.util.I18N; public class ItemSoilMeter extends Item implements IItemModelRegister { @@ -76,7 +75,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { block = worldIn.getBlockState(pos).getBlock(); } - if (gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(worldIn)) { + if (gardening.isSoil(block) && !!worldIn.isRemote) { IBlockSoil soil = (IBlockSoil) block; String info = I18N.localise("botany.soil.type") + ": " + soil.getType(worldIn, pos).getTranslated() + ", " diff --git a/src/main/java/binnie/botany/items/ItemStainedGlass.java b/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java similarity index 87% rename from src/main/java/binnie/botany/items/ItemStainedGlass.java rename to botany/src/main/java/binnie/botany/items/ItemStainedGlass.java index 5c584334..ec7e45bb 100644 --- a/src/main/java/binnie/botany/items/ItemStainedGlass.java +++ b/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java @@ -8,9 +8,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.IColoredItem; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.block.ItemMetadata; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; public class ItemStainedGlass extends ItemMetadata implements IColoredItem { public ItemStainedGlass(Block block) { diff --git a/src/main/java/binnie/botany/items/ItemTrowel.java b/botany/src/main/java/binnie/botany/items/ItemTrowel.java similarity index 97% rename from src/main/java/binnie/botany/items/ItemTrowel.java rename to botany/src/main/java/binnie/botany/items/ItemTrowel.java index 28a84000..db4a0dac 100644 --- a/src/main/java/binnie/botany/items/ItemTrowel.java +++ b/botany/src/main/java/binnie/botany/items/ItemTrowel.java @@ -28,16 +28,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.Constants; +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.IGardeningManager; import binnie.botany.core.BotanyCore; -import binnie.botany.modules.BotanyModuleUIDs; +import binnie.core.modules.BotanyModuleUIDs; import binnie.botany.modules.ModuleFlowers; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; public class ItemTrowel extends Item implements IItemModelRegister { protected final ToolMaterial theToolMaterial; diff --git a/src/main/java/binnie/botany/items/ItemWeed.java b/botany/src/main/java/binnie/botany/items/ItemWeed.java similarity index 100% rename from src/main/java/binnie/botany/items/ItemWeed.java rename to botany/src/main/java/binnie/botany/items/ItemWeed.java diff --git a/src/main/java/binnie/botany/items/package-info.java b/botany/src/main/java/binnie/botany/items/package-info.java similarity index 100% rename from src/main/java/binnie/botany/items/package-info.java rename to botany/src/main/java/binnie/botany/items/package-info.java diff --git a/botany/src/main/java/binnie/botany/machines/BotanyMachine.java b/botany/src/main/java/binnie/botany/machines/BotanyMachine.java new file mode 100644 index 00000000..622af23e --- /dev/null +++ b/botany/src/main/java/binnie/botany/machines/BotanyMachine.java @@ -0,0 +1,77 @@ +package binnie.botany.machines; + +import java.util.function.Supplier; + +import binnie.botany.Botany; +import binnie.botany.machines.designer.Tileworker; +import binnie.botany.modules.ModuleMachine; +import binnie.core.Constants; +import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.MachinePackage; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.component.IInteraction; +import binnie.core.modules.BotanyModuleUIDs; +import binnie.core.modules.ModuleManager; +import binnie.extratrees.core.ExtraTreesGUID; +import binnie.extratrees.machines.designer.PackageDesigner; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public enum BotanyMachine implements IMachineType { + Tileworker(() -> { + if (ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.CERAMIC)) { + return new PackageDesigner(new Tileworker()); + } + return null; + }); + + Supplier supplier; + + BotanyMachine(final Supplier supplier) { + this.supplier = supplier; + } + + @Override + public Supplier getSupplier() { + return this.supplier; + } + + public ItemStack get(final int i) { + return new ItemStack(ModuleMachine.blockMachine, i, this.ordinal()); + } + + public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { + ExtraTreesGUID id; + + public ComponentExtraTreeGUI(final Machine machine, final ExtraTreesGUID id) { + super(machine); + this.id = id; + } + + @Override + public void onRightClick(World p0, EntityPlayer p1, BlockPos pos) { + Botany.proxy.openGui(this.id, p1, pos); + } + } + + public abstract static class PackageExtraTreeMachine extends MachinePackage { + + protected PackageExtraTreeMachine(final String uid, final boolean powered) { + super(uid, powered); + } + + @Override + public TileEntity createTileEntity() { + return new TileEntityMachine(this); + } + + @Override + public void register() { + } + } +} diff --git a/botany/src/main/java/binnie/botany/machines/designer/Tileworker.java b/botany/src/main/java/binnie/botany/machines/designer/Tileworker.java new file mode 100644 index 00000000..a067687f --- /dev/null +++ b/botany/src/main/java/binnie/botany/machines/designer/Tileworker.java @@ -0,0 +1,54 @@ +package binnie.botany.machines.designer; + +import binnie.extratrees.machines.designer.IDesignerType; +import net.minecraft.item.ItemStack; + +import binnie.botany.ceramic.CeramicDesignSystem; +import binnie.botany.modules.ModuleCeramic; +import binnie.core.util.I18N; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.carpentry.BlockDesign; +import binnie.extratrees.carpentry.EnumDesign; +import binnie.extratrees.carpentry.ModuleCarpentry; + +public class Tileworker implements IDesignerType { + private static final String name = "tileworker"; + + @Override + public IDesignSystem getSystem() { + return CeramicDesignSystem.instance; + } + + @Override + public ItemStack getBlock(final IDesignMaterial type1, IDesignMaterial type2, final IDesign design) { + int stackSize = 2; + if (design == EnumDesign.Blank) { + type2 = type1; + stackSize = 1; + } + final ItemStack stack = ModuleCarpentry.getItemStack(this.getBlock(), type1, type2, design); + stack.setCount(stackSize); + return stack; + } + + private BlockDesign getBlock() { + return ModuleCeramic.ceramicTile; + } + + @Override + public ItemStack getDisplayStack(final IDesign design) { + return this.getBlock(this.getSystem().getDefaultMaterial(), this.getSystem().getDefaultMaterial2(), design); + } + + @Override + public String getMaterialTooltip() { + return I18N.localise("extratrees.machine.machine.designer.material.tile"); + } + + @Override + public String getName() { + return name; + } +} diff --git a/src/main/java/binnie/botany/models/FlowerSpriteManager.java b/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java similarity index 99% rename from src/main/java/binnie/botany/models/FlowerSpriteManager.java rename to botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java index f91234b6..d8fd80b7 100644 --- a/src/main/java/binnie/botany/models/FlowerSpriteManager.java +++ b/botany/src/main/java/binnie/botany/models/FlowerSpriteManager.java @@ -9,7 +9,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.botany.Botany; import binnie.botany.api.genetics.IFlowerType; import binnie.core.resource.BinnieSprite; diff --git a/src/main/java/binnie/botany/models/StateMapperFlower.java b/botany/src/main/java/binnie/botany/models/StateMapperFlower.java similarity index 97% rename from src/main/java/binnie/botany/models/StateMapperFlower.java rename to botany/src/main/java/binnie/botany/models/StateMapperFlower.java index 66183836..fe596f1e 100644 --- a/src/main/java/binnie/botany/models/StateMapperFlower.java +++ b/botany/src/main/java/binnie/botany/models/StateMapperFlower.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.api.genetics.IFlowerType; import binnie.botany.blocks.BlockFlower; diff --git a/src/main/java/binnie/botany/models/package-info.java b/botany/src/main/java/binnie/botany/models/package-info.java similarity index 100% rename from src/main/java/binnie/botany/models/package-info.java rename to botany/src/main/java/binnie/botany/models/package-info.java diff --git a/src/main/java/binnie/botany/modules/ModuleCeramic.java b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java similarity index 92% rename from src/main/java/binnie/botany/modules/ModuleCeramic.java rename to botany/src/main/java/binnie/botany/modules/ModuleCeramic.java index 6181fc27..60f9e8bb 100644 --- a/src/main/java/binnie/botany/modules/ModuleCeramic.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java @@ -1,5 +1,6 @@ package binnie.botany.modules; +import binnie.core.modules.BotanyModuleUIDs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -9,14 +10,14 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.blocks.BlockCeramic; import binnie.botany.blocks.BlockCeramicBrick; import binnie.botany.blocks.BlockCeramicPatterned; import binnie.botany.blocks.BlockStainedGlass; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.botany.items.CeramicItems; import binnie.botany.items.ItemCeramic; @@ -26,13 +27,13 @@ import binnie.botany.items.ItemPigment; import binnie.botany.items.ItemStainedGlass; import binnie.botany.recipes.CeramicTileRecipe; import binnie.botany.recipes.PigmentRecipe; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.item.ItemMisc; import binnie.core.util.RecipeUtil; import binnie.extratrees.carpentry.ItemDesign; -import binnie.modules.BinnieModule; -import binnie.modules.Module; -import binnie.modules.ModuleManager; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; +import binnie.core.modules.ModuleManager; @BinnieModule(moduleID = BotanyModuleUIDs.CERAMIC, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Ceramic", unlocalizedDescription = "botany.module.ceramic") public class ModuleCeramic extends Module { diff --git a/src/main/java/binnie/botany/modules/ModuleCore.java b/botany/src/main/java/binnie/botany/modules/ModuleCore.java similarity index 73% rename from src/main/java/binnie/botany/modules/ModuleCore.java rename to botany/src/main/java/binnie/botany/modules/ModuleCore.java index 410f2819..cdb1afa4 100644 --- a/src/main/java/binnie/botany/modules/ModuleCore.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCore.java @@ -1,8 +1,9 @@ package binnie.botany.modules; -import binnie.Constants; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.Constants; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; +import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.CORE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Core", coreModule = true) public class ModuleCore extends Module { diff --git a/src/main/java/binnie/botany/modules/ModuleDatabase.java b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java similarity index 87% rename from src/main/java/binnie/botany/modules/ModuleDatabase.java rename to botany/src/main/java/binnie/botany/modules/ModuleDatabase.java index 9d74fc24..ae24cbda 100644 --- a/src/main/java/binnie/botany/modules/ModuleDatabase.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java @@ -1,5 +1,6 @@ package binnie.botany.modules; +import binnie.core.modules.BotanyModuleUIDs; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -10,13 +11,13 @@ import net.minecraft.item.ItemStack; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.items.ItemDatabaseBotany; import binnie.core.liquid.ManagerLiquid; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.DATABASE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Database", unlocalizedDescription = "botany.module.database") public class ModuleDatabase extends Module { diff --git a/src/main/java/binnie/botany/modules/ModuleFarming.java b/botany/src/main/java/binnie/botany/modules/ModuleFarming.java similarity index 95% rename from src/main/java/binnie/botany/modules/ModuleFarming.java rename to botany/src/main/java/binnie/botany/modules/ModuleFarming.java index 0e9aaf86..9623ed66 100644 --- a/src/main/java/binnie/botany/modules/ModuleFarming.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleFarming.java @@ -1,5 +1,6 @@ package binnie.botany.modules; +import binnie.core.modules.BotanyModuleUIDs; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -7,7 +8,7 @@ import java.util.Set; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; @@ -17,8 +18,8 @@ import binnie.botany.items.EnumTubeMaterial; import binnie.botany.items.ItemInsulatedTube; import binnie.core.Mods; import binnie.core.util.RecipeUtil; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.FARMING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Farming", unlocalizedDescription = "botany.module.farming") public class ModuleFarming extends Module { diff --git a/src/main/java/binnie/botany/modules/ModuleFlowers.java b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java similarity index 95% rename from src/main/java/binnie/botany/modules/ModuleFlowers.java rename to botany/src/main/java/binnie/botany/modules/ModuleFlowers.java index cd610a96..46d75893 100644 --- a/src/main/java/binnie/botany/modules/ModuleFlowers.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleFlowers.java @@ -1,5 +1,6 @@ package binnie.botany.modules; +import binnie.core.modules.BotanyModuleUIDs; import binnie.core.util.TileUtil; import com.google.common.collect.ImmutableSet; @@ -33,7 +34,7 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackInterface; import forestry.storage.BackpackDefinition; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.BotanyAPI; @@ -43,7 +44,7 @@ import binnie.botany.api.genetics.IFlower; import binnie.botany.api.genetics.IFlowerRoot; import binnie.botany.blocks.BlockFlower; import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.genetics.FlowerDefinition; import binnie.botany.genetics.FlowerFactory; import binnie.botany.genetics.allele.AlleleEffectNone; @@ -51,8 +52,8 @@ import binnie.botany.items.ItemFlowerGE; import binnie.botany.tile.TileEntityFlower; import binnie.core.BinnieCore; import binnie.core.util.RecipeUtil; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.FLOWERS, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Flowers", unlocalizedDescription = "botany.module.flowers") public class ModuleFlowers extends Module { @@ -116,7 +117,7 @@ public class ModuleFlowers extends Module { @Override public void postInit() { - RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); + RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); FlowerManager.flowerRegistry.registerAcceptableFlower(flower, "flowersVanilla"); recipeUtil.addRecipe("botanist_backpack", botanistBackpack, "X#X", @@ -186,7 +187,7 @@ public class ModuleFlowers extends Module { World world = event.getWorld(); EntityPlayer player = event.getEntityPlayer(); ItemStack heldItem = player.getHeldItemMainhand(); - if (!BinnieCore.getBinnieProxy().isSimulating(event.getWorld())) { + if (!!event.getWorld().isRemote) { return; } diff --git a/src/main/java/binnie/botany/modules/ModuleGardening.java b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java similarity index 98% rename from src/main/java/binnie/botany/modules/ModuleGardening.java rename to botany/src/main/java/binnie/botany/modules/ModuleGardening.java index 1fd86f9a..8ca88c40 100644 --- a/src/main/java/binnie/botany/modules/ModuleGardening.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleGardening.java @@ -3,6 +3,7 @@ package binnie.botany.modules; import java.util.Locale; import java.util.Map; +import binnie.core.modules.BotanyModuleUIDs; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -20,7 +21,7 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.gardening.EnumAcidity; @@ -44,8 +45,8 @@ import binnie.core.Mods; import binnie.core.item.ItemMisc; import binnie.core.util.OreDictionaryUtil; import binnie.core.util.RecipeUtil; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = BotanyModuleUIDs.GARDENING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Gardening", unlocalizedDescription = "botany.module.gardening") public class ModuleGardening extends Module { diff --git a/botany/src/main/java/binnie/botany/modules/ModuleMachine.java b/botany/src/main/java/binnie/botany/modules/ModuleMachine.java new file mode 100644 index 00000000..af782b6e --- /dev/null +++ b/botany/src/main/java/binnie/botany/modules/ModuleMachine.java @@ -0,0 +1,38 @@ +package binnie.botany.modules; + +import binnie.botany.Botany; +import binnie.botany.machines.BotanyMachine; +import binnie.core.Constants; +import binnie.core.Mods; +import binnie.core.machines.MachineGroup; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.BotanyModuleUIDs; +import binnie.core.modules.Module; +import binnie.core.modules.ModuleManager; +import binnie.core.util.RecipeUtil; +import binnie.extratrees.item.ExtraTreeItems; +import binnie.extratrees.modules.ExtraTreesModuleUIDs; +import forestry.api.core.Tabs; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; + +@BinnieModule(moduleID = BotanyModuleUIDs.MACHINES, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Machines", unlocalizedDescription = "botany.module.machines") +public class ModuleMachine extends Module { + public static Block blockMachine; + + @Override + public void registerItemsAndBlocks() { + final MachineGroup machineGroup = new MachineGroup(Botany.instance, "machine", "machine", BotanyMachine.values()); + machineGroup.setCreativeTab(Tabs.tabArboriculture); + blockMachine = machineGroup.getBlock(); + } + + @Override + public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); + if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) { + recipeUtil.addRecipe("tileworker", BotanyMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing")); + } + } +} diff --git a/src/main/java/binnie/botany/network/PacketID.java b/botany/src/main/java/binnie/botany/network/PacketID.java similarity index 98% rename from src/main/java/binnie/botany/network/PacketID.java rename to botany/src/main/java/binnie/botany/network/PacketID.java index cee66d63..a04c9546 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/botany/src/main/java/binnie/botany/network/PacketID.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side; import forestry.api.genetics.AlleleManager; import binnie.botany.api.genetics.IAlleleFlowerSpecies; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.BinnieCore; import binnie.core.network.IPacketID; import binnie.core.network.packet.MessageBinnie; diff --git a/src/main/java/binnie/botany/network/package-info.java b/botany/src/main/java/binnie/botany/network/package-info.java similarity index 100% rename from src/main/java/binnie/botany/network/package-info.java rename to botany/src/main/java/binnie/botany/network/package-info.java diff --git a/src/main/java/binnie/botany/package-info.java b/botany/src/main/java/binnie/botany/package-info.java similarity index 100% rename from src/main/java/binnie/botany/package-info.java rename to botany/src/main/java/binnie/botany/package-info.java diff --git a/src/main/java/binnie/botany/proxy/IBotanyProxy.java b/botany/src/main/java/binnie/botany/proxy/IBotanyProxy.java similarity index 100% rename from src/main/java/binnie/botany/proxy/IBotanyProxy.java rename to botany/src/main/java/binnie/botany/proxy/IBotanyProxy.java diff --git a/src/main/java/binnie/botany/proxy/Proxy.java b/botany/src/main/java/binnie/botany/proxy/Proxy.java similarity index 100% rename from src/main/java/binnie/botany/proxy/Proxy.java rename to botany/src/main/java/binnie/botany/proxy/Proxy.java diff --git a/src/main/java/binnie/botany/proxy/ProxyClient.java b/botany/src/main/java/binnie/botany/proxy/ProxyClient.java similarity index 96% rename from src/main/java/binnie/botany/proxy/ProxyClient.java rename to botany/src/main/java/binnie/botany/proxy/ProxyClient.java index acd689a6..2514416b 100644 --- a/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/botany/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.models.ModelManager; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/botany/proxy/ProxyServer.java b/botany/src/main/java/binnie/botany/proxy/ProxyServer.java similarity index 100% rename from src/main/java/binnie/botany/proxy/ProxyServer.java rename to botany/src/main/java/binnie/botany/proxy/ProxyServer.java diff --git a/src/main/java/binnie/botany/proxy/package-info.java b/botany/src/main/java/binnie/botany/proxy/package-info.java similarity index 100% rename from src/main/java/binnie/botany/proxy/package-info.java rename to botany/src/main/java/binnie/botany/proxy/package-info.java diff --git a/src/main/java/binnie/botany/recipes/CeramicTileRecipe.java b/botany/src/main/java/binnie/botany/recipes/CeramicTileRecipe.java similarity index 98% rename from src/main/java/binnie/botany/recipes/CeramicTileRecipe.java rename to botany/src/main/java/binnie/botany/recipes/CeramicTileRecipe.java index a41d37e7..e58cf4bc 100644 --- a/src/main/java/binnie/botany/recipes/CeramicTileRecipe.java +++ b/botany/src/main/java/binnie/botany/recipes/CeramicTileRecipe.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.ceramic.brick.CeramicBrickType; import binnie.botany.modules.ModuleCeramic; diff --git a/src/main/java/binnie/botany/recipes/PigmentRecipe.java b/botany/src/main/java/binnie/botany/recipes/PigmentRecipe.java similarity index 88% rename from src/main/java/binnie/botany/recipes/PigmentRecipe.java rename to botany/src/main/java/binnie/botany/recipes/PigmentRecipe.java index 81328f6e..18186039 100644 --- a/src/main/java/binnie/botany/recipes/PigmentRecipe.java +++ b/botany/src/main/java/binnie/botany/recipes/PigmentRecipe.java @@ -1,5 +1,6 @@ package binnie.botany.recipes; +import binnie.botany.api.BotanyAPI; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -8,8 +9,7 @@ import net.minecraft.world.World; import net.minecraftforge.registries.IForgeRegistryEntry; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.api.genetics.IFlower; import binnie.botany.modules.ModuleCeramic; @@ -38,8 +38,8 @@ public class PigmentRecipe extends IForgeRegistryEntry.Impl implements if (++n > 1) { return ItemStack.EMPTY; } - if (Binnie.GENETICS.getFlowerRoot().isMember(stackInSlot)) { - IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stackInSlot); + if (BotanyAPI.flowerRoot.isMember(stackInSlot)) { + IFlower flower = BotanyAPI.flowerRoot.getMember(stackInSlot); if (flower != null && flower.getAge() >= 1) { stack = new ItemStack(ModuleCeramic.pigment, 1, flower.getGenome().getPrimaryColor().getID()); } diff --git a/src/main/java/binnie/botany/recipes/package-info.java b/botany/src/main/java/binnie/botany/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/botany/recipes/package-info.java rename to botany/src/main/java/binnie/botany/recipes/package-info.java diff --git a/src/main/java/binnie/botany/tile/TileCeramic.java b/botany/src/main/java/binnie/botany/tile/TileCeramic.java similarity index 95% rename from src/main/java/binnie/botany/tile/TileCeramic.java rename to botany/src/main/java/binnie/botany/tile/TileCeramic.java index 6e7c01a7..252824ac 100644 --- a/src/main/java/binnie/botany/tile/TileCeramic.java +++ b/botany/src/main/java/binnie/botany/tile/TileCeramic.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; public class TileCeramic extends TileEntity { diff --git a/src/main/java/binnie/botany/tile/TileCeramicBrick.java b/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java similarity index 95% rename from src/main/java/binnie/botany/tile/TileCeramicBrick.java rename to botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java index 56203612..08d704fb 100644 --- a/src/main/java/binnie/botany/tile/TileCeramicBrick.java +++ b/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java @@ -6,9 +6,9 @@ import net.minecraft.tileentity.TileEntity; import binnie.botany.ceramic.brick.CeramicBrickPair; import binnie.botany.ceramic.brick.CeramicBrickType; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; public class TileCeramicBrick extends TileEntity { private EnumFlowerColor colorFirst = EnumFlowerColor.Black; diff --git a/src/main/java/binnie/botany/tile/TileEntityFlower.java b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java similarity index 97% rename from src/main/java/binnie/botany/tile/TileEntityFlower.java rename to botany/src/main/java/binnie/botany/tile/TileEntityFlower.java index 8912f9df..66a3cf23 100644 --- a/src/main/java/binnie/botany/tile/TileEntityFlower.java +++ b/botany/src/main/java/binnie/botany/tile/TileEntityFlower.java @@ -5,6 +5,9 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; +import binnie.botany.api.BotanyAPI; +import binnie.botany.genetics.EnumFlowerType; +import forestry.api.lepidopterology.ButterflyManager; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -30,7 +33,6 @@ import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; -import binnie.Binnie; import binnie.botany.api.gardening.EnumSoilType; import binnie.botany.api.gardening.IGardeningManager; import binnie.botany.api.genetics.EnumFlowerStage; @@ -42,7 +44,7 @@ import binnie.botany.api.genetics.IFlowerRoot; import binnie.botany.api.genetics.IFlowerType; import binnie.botany.blocks.PlantType; import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.genetics.Flower; import binnie.botany.modules.ModuleFlowers; import binnie.botany.modules.ModuleGardening; @@ -86,7 +88,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (nbtCompound.hasKey("CATER") && BinnieCore.isLepidopteryActive()) { matureTime = nbtCompound.getInteger("caterTime"); - caterpillar = Binnie.GENETICS.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater")); + caterpillar = ButterflyManager.butterflyRoot.getMember(nbtCompound.getCompoundTag("cater")); } readRenderInfo(nbtCompound); @@ -345,7 +347,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt info.primary = EnumFlowerColor.values()[infotag.getByte("primary")].getFlowerColorAllele(); info.secondary = EnumFlowerColor.values()[infotag.getByte("secondary")].getFlowerColorAllele(); info.stem = EnumFlowerColor.values()[infotag.getByte("stem")].getFlowerColorAllele(); - info.type = binnie.botany.genetics.EnumFlowerType.values()[infotag.getByte("type")]; + info.type = EnumFlowerType.values()[infotag.getByte("type")]; info.age = infotag.getByte("age"); info.section = infotag.getByte("section"); info.wilted = infotag.getBoolean("wilted"); @@ -395,7 +397,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setSection(int i) { section = i; - if (BinnieCore.getBinnieProxy().isSimulating(world)) { + if (!world.isRemote) { updateRender(true); } } @@ -405,7 +407,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (flower == null) { return ItemStack.EMPTY; } - return Binnie.GENETICS.getFlowerRoot().getMemberStack(flower, EnumFlowerStage.getStage(flower)); + return BotanyAPI.flowerRoot.getMemberStack(flower, EnumFlowerStage.getStage(flower)); } @Nullable @@ -558,7 +560,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt private void attemptButterflySpawn(World world, IButterfly butterfly, double x, double y, double z) { if (BinnieCore.isLepidopteryActive()) { - Binnie.GENETICS.getButterflyRoot().spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z); + ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z); } } @@ -682,7 +684,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public IFlowerType getType() { return (renderInfo == null) - ? binnie.botany.genetics.EnumFlowerType.POPPY + ? EnumFlowerType.POPPY : renderInfo.type; } diff --git a/src/main/java/binnie/botany/tile/package-info.java b/botany/src/main/java/binnie/botany/tile/package-info.java similarity index 100% rename from src/main/java/binnie/botany/tile/package-info.java rename to botany/src/main/java/binnie/botany/tile/package-info.java diff --git a/src/main/resources/assets/botany/blockstates/ceramic.json b/botany/src/main/resources/assets/botany/blockstates/ceramic.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/ceramic.json rename to botany/src/main/resources/assets/botany/blockstates/ceramic.json diff --git a/src/main/resources/assets/botany/blockstates/flower.json b/botany/src/main/resources/assets/botany/blockstates/flower.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/flower.json rename to botany/src/main/resources/assets/botany/blockstates/flower.json diff --git a/src/main/resources/assets/botany/blockstates/flowerbed.json b/botany/src/main/resources/assets/botany/blockstates/flowerbed.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/flowerbed.json rename to botany/src/main/resources/assets/botany/blockstates/flowerbed.json diff --git a/src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json b/botany/src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json rename to botany/src/main/resources/assets/botany/blockstates/flowerbed_no_weed.json diff --git a/src/main/resources/assets/botany/blockstates/loam.json b/botany/src/main/resources/assets/botany/blockstates/loam.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/loam.json rename to botany/src/main/resources/assets/botany/blockstates/loam.json diff --git a/src/main/resources/assets/botany/blockstates/loam_no_weed.json b/botany/src/main/resources/assets/botany/blockstates/loam_no_weed.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/loam_no_weed.json rename to botany/src/main/resources/assets/botany/blockstates/loam_no_weed.json diff --git a/botany/src/main/resources/assets/botany/blockstates/machine.json b/botany/src/main/resources/assets/botany/blockstates/machine.json new file mode 100644 index 00000000..81cb8045 --- /dev/null +++ b/botany/src/main/resources/assets/botany/blockstates/machine.json @@ -0,0 +1,33 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "binniecore:machine" + }, + + "variants": { + "normal": [{}], + "inventory": [{}], + "machine_type":{ + "0": { + "textures":{ + "texture": "botany:blocks/tileworker" + } + }, + "1": {}, + "2": {}, + "3": {}, + "4": {}, + "5": {}, + "6": {}, + "7": {}, + "8": {}, + "9": {}, + "10": {}, + "11": {}, + "12": {}, + "13": {}, + "14": {}, + "15": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/plant.json b/botany/src/main/resources/assets/botany/blockstates/plant.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/plant.json rename to botany/src/main/resources/assets/botany/blockstates/plant.json diff --git a/src/main/resources/assets/botany/blockstates/soil.json b/botany/src/main/resources/assets/botany/blockstates/soil.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/soil.json rename to botany/src/main/resources/assets/botany/blockstates/soil.json diff --git a/src/main/resources/assets/botany/blockstates/soil_no_weed.json b/botany/src/main/resources/assets/botany/blockstates/soil_no_weed.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/soil_no_weed.json rename to botany/src/main/resources/assets/botany/blockstates/soil_no_weed.json diff --git a/src/main/resources/assets/botany/blockstates/stained.json b/botany/src/main/resources/assets/botany/blockstates/stained.json similarity index 100% rename from src/main/resources/assets/botany/blockstates/stained.json rename to botany/src/main/resources/assets/botany/blockstates/stained.json diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/botany/src/main/resources/assets/botany/lang/en_GB.lang similarity index 100% rename from src/main/resources/assets/botany/lang/en_GB.lang rename to botany/src/main/resources/assets/botany/lang/en_GB.lang diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/botany/src/main/resources/assets/botany/lang/en_US.lang similarity index 99% rename from src/main/resources/assets/botany/lang/en_US.lang rename to botany/src/main/resources/assets/botany/lang/en_US.lang index 2b87e30e..54467738 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/botany/src/main/resources/assets/botany/lang/en_US.lang @@ -6,6 +6,9 @@ botany.module.gardening=Adds soil, loam, flowerbeds and trowels. botany.module.ceramic=Adds decorative ceramic blocks. And the Tileworker. botany.module.flowers=Adds an entirely new breeding system to Forestry: Flowers. +botany.machine.machine.tileworker=Tileworker +botany.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles. + botany.ph=PH botany.ph.acid=Acidic botany.ph.neutral=Neutral diff --git a/src/main/resources/assets/botany/models/block/ceramic.json b/botany/src/main/resources/assets/botany/models/block/ceramic.json similarity index 100% rename from src/main/resources/assets/botany/models/block/ceramic.json rename to botany/src/main/resources/assets/botany/models/block/ceramic.json diff --git a/src/main/resources/assets/botany/models/block/dead_flower.json b/botany/src/main/resources/assets/botany/models/block/dead_flower.json similarity index 100% rename from src/main/resources/assets/botany/models/block/dead_flower.json rename to botany/src/main/resources/assets/botany/models/block/dead_flower.json diff --git a/src/main/resources/assets/botany/models/block/decaying_flower.json b/botany/src/main/resources/assets/botany/models/block/decaying_flower.json similarity index 100% rename from src/main/resources/assets/botany/models/block/decaying_flower.json rename to botany/src/main/resources/assets/botany/models/block/decaying_flower.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/acid.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/acid.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed/normal.json b/botany/src/main/resources/assets/botany/models/block/flowerbed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed/normal.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed/normal.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/block/flowerbed_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/block/flowers/agapanthus.json b/botany/src/main/resources/assets/botany/models/block/flowers/agapanthus.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/agapanthus.json rename to botany/src/main/resources/assets/botany/models/block/flowers/agapanthus.json diff --git a/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/allium.json b/botany/src/main/resources/assets/botany/models/block/flowers/allium.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/allium.json rename to botany/src/main/resources/assets/botany/models/block/flowers/allium.json diff --git a/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/allium_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/anemone.json b/botany/src/main/resources/assets/botany/models/block/flowers/anemone.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/anemone.json rename to botany/src/main/resources/assets/botany/models/block/flowers/anemone.json diff --git a/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/aquilegia.json b/botany/src/main/resources/assets/botany/models/block/flowers/aquilegia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/aquilegia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/aquilegia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/aster.json b/botany/src/main/resources/assets/botany/models/block/flowers/aster.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/aster.json rename to botany/src/main/resources/assets/botany/models/block/flowers/aster.json diff --git a/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/aster_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/auricula.json b/botany/src/main/resources/assets/botany/models/block/flowers/auricula.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/auricula.json rename to botany/src/main/resources/assets/botany/models/block/flowers/auricula.json diff --git a/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/azalea.json b/botany/src/main/resources/assets/botany/models/block/flowers/azalea.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/azalea.json rename to botany/src/main/resources/assets/botany/models/block/flowers/azalea.json diff --git a/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/bluet.json b/botany/src/main/resources/assets/botany/models/block/flowers/bluet.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/bluet.json rename to botany/src/main/resources/assets/botany/models/block/flowers/bluet.json diff --git a/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/carnation.json b/botany/src/main/resources/assets/botany/models/block/flowers/carnation.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/carnation.json rename to botany/src/main/resources/assets/botany/models/block/flowers/carnation.json diff --git a/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/coneflower.json b/botany/src/main/resources/assets/botany/models/block/flowers/coneflower.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/coneflower.json rename to botany/src/main/resources/assets/botany/models/block/flowers/coneflower.json diff --git a/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/cornflower.json b/botany/src/main/resources/assets/botany/models/block/flowers/cornflower.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/cornflower.json rename to botany/src/main/resources/assets/botany/models/block/flowers/cornflower.json diff --git a/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/daffodil.json b/botany/src/main/resources/assets/botany/models/block/flowers/daffodil.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/daffodil.json rename to botany/src/main/resources/assets/botany/models/block/flowers/daffodil.json diff --git a/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dahlia.json b/botany/src/main/resources/assets/botany/models/block/flowers/dahlia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dahlia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dahlia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/daisy.json b/botany/src/main/resources/assets/botany/models/block/flowers/daisy.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/daisy.json rename to botany/src/main/resources/assets/botany/models/block/flowers/daisy.json diff --git a/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dandelion.json b/botany/src/main/resources/assets/botany/models/block/flowers/dandelion.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dandelion.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dandelion.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dandelion_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/dandelion_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dandelion_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dandelion_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dianthus.json b/botany/src/main/resources/assets/botany/models/block/flowers/dianthus.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dianthus.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dianthus.json diff --git a/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/althea_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/althea_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/althea_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/althea_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/althea_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/althea_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/althea_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/althea_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/althea_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/althea_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/althea_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/althea_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/althea_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/althea_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/althea_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/althea_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/camellia_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/camellia_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/camellia_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/camellia_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/camellia_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/camellia_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/camellia_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/camellia_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/camellia_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/delphinium_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/delphinium_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/delphinium_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/delphinium_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/delphinium_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/foxglove_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/foxglove_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/foxglove_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/foxglove_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/foxglove_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/goldenrod_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hollyhock_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/hydrangea_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lavender_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lavender_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lavender_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lavender_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lavender_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lavender_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lavender_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lavender_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lavender_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lilac_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lilac_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lilac_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lilac_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lilac_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lilac_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/lilac_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/lilac_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/lilac_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/penstemon_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/penstemon_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/penstemon_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/penstemon_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/penstemon_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/peony_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/peony_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/peony_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/peony_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/peony_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/peony_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/peony_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/peony_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/peony_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/peony_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/peony_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/peony_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/peony_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/peony_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/peony_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/peony_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/rose_0.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/rose_0.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/rose_0.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/rose_0.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/rose_0_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/rose_0_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/rose_0_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/rose_0_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/rose_1.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/rose_1.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/rose_1.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/rose_1.json diff --git a/src/main/resources/assets/botany/models/block/flowers/double/rose_1_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/double/rose_1_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/double/rose_1_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/double/rose_1_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/edelweiss.json b/botany/src/main/resources/assets/botany/models/block/flowers/edelweiss.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/edelweiss.json rename to botany/src/main/resources/assets/botany/models/block/flowers/edelweiss.json diff --git a/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/flower.json b/botany/src/main/resources/assets/botany/models/block/flowers/flower.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/flower.json rename to botany/src/main/resources/assets/botany/models/block/flowers/flower.json diff --git a/src/main/resources/assets/botany/models/block/flowers/forget.json b/botany/src/main/resources/assets/botany/models/block/flowers/forget.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/forget.json rename to botany/src/main/resources/assets/botany/models/block/flowers/forget.json diff --git a/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/forget_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/fuchsia.json b/botany/src/main/resources/assets/botany/models/block/flowers/fuchsia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/fuchsia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/fuchsia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/gaillardia.json b/botany/src/main/resources/assets/botany/models/block/flowers/gaillardia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/gaillardia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/gaillardia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/geranium.json b/botany/src/main/resources/assets/botany/models/block/flowers/geranium.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/geranium.json rename to botany/src/main/resources/assets/botany/models/block/flowers/geranium.json diff --git a/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/iris.json b/botany/src/main/resources/assets/botany/models/block/flowers/iris.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/iris.json rename to botany/src/main/resources/assets/botany/models/block/flowers/iris.json diff --git a/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/iris_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/lily.json b/botany/src/main/resources/assets/botany/models/block/flowers/lily.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/lily.json rename to botany/src/main/resources/assets/botany/models/block/flowers/lily.json diff --git a/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/lily_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/marigold.json b/botany/src/main/resources/assets/botany/models/block/flowers/marigold.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/marigold.json rename to botany/src/main/resources/assets/botany/models/block/flowers/marigold.json diff --git a/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/mums.json b/botany/src/main/resources/assets/botany/models/block/flowers/mums.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/mums.json rename to botany/src/main/resources/assets/botany/models/block/flowers/mums.json diff --git a/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/mums_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/orchid.json b/botany/src/main/resources/assets/botany/models/block/flowers/orchid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/orchid.json rename to botany/src/main/resources/assets/botany/models/block/flowers/orchid.json diff --git a/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/pansy.json b/botany/src/main/resources/assets/botany/models/block/flowers/pansy.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/pansy.json rename to botany/src/main/resources/assets/botany/models/block/flowers/pansy.json diff --git a/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/petunia.json b/botany/src/main/resources/assets/botany/models/block/flowers/petunia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/petunia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/petunia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/poppy.json b/botany/src/main/resources/assets/botany/models/block/flowers/poppy.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/poppy.json rename to botany/src/main/resources/assets/botany/models/block/flowers/poppy.json diff --git a/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/primrose.json b/botany/src/main/resources/assets/botany/models/block/flowers/primrose.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/primrose.json rename to botany/src/main/resources/assets/botany/models/block/flowers/primrose.json diff --git a/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/scabious.json b/botany/src/main/resources/assets/botany/models/block/flowers/scabious.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/scabious.json rename to botany/src/main/resources/assets/botany/models/block/flowers/scabious.json diff --git a/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/seed.json b/botany/src/main/resources/assets/botany/models/block/flowers/seed.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/seed.json rename to botany/src/main/resources/assets/botany/models/block/flowers/seed.json diff --git a/src/main/resources/assets/botany/models/block/flowers/tulip.json b/botany/src/main/resources/assets/botany/models/block/flowers/tulip.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/tulip.json rename to botany/src/main/resources/assets/botany/models/block/flowers/tulip.json diff --git a/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/viola.json b/botany/src/main/resources/assets/botany/models/block/flowers/viola.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/viola.json rename to botany/src/main/resources/assets/botany/models/block/flowers/viola.json diff --git a/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/viola_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/yarrow.json b/botany/src/main/resources/assets/botany/models/block/flowers/yarrow.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/yarrow.json rename to botany/src/main/resources/assets/botany/models/block/flowers/yarrow.json diff --git a/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json diff --git a/src/main/resources/assets/botany/models/block/flowers/zinnia.json b/botany/src/main/resources/assets/botany/models/block/flowers/zinnia.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/zinnia.json rename to botany/src/main/resources/assets/botany/models/block/flowers/zinnia.json diff --git a/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json b/botany/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json similarity index 100% rename from src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json rename to botany/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json diff --git a/src/main/resources/assets/botany/models/block/loam/acid.json b/botany/src/main/resources/assets/botany/models/block/loam/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/acid.json rename to botany/src/main/resources/assets/botany/models/block/loam/acid.json diff --git a/src/main/resources/assets/botany/models/block/loam/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/loam/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/loam/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/loam/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/loam/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/loam/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline.json b/botany/src/main/resources/assets/botany/models/block/loam/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/loam/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/loam/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/loam/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/loam/damp.json b/botany/src/main/resources/assets/botany/models/block/loam/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/damp.json rename to botany/src/main/resources/assets/botany/models/block/loam/damp.json diff --git a/src/main/resources/assets/botany/models/block/loam/dry.json b/botany/src/main/resources/assets/botany/models/block/loam/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/dry.json rename to botany/src/main/resources/assets/botany/models/block/loam/dry.json diff --git a/src/main/resources/assets/botany/models/block/loam/normal.json b/botany/src/main/resources/assets/botany/models/block/loam/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam/normal.json rename to botany/src/main/resources/assets/botany/models/block/loam/normal.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/loam_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/block/loam_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/loam_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/block/loam_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/block/soil.json b/botany/src/main/resources/assets/botany/models/block/soil.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil.json rename to botany/src/main/resources/assets/botany/models/block/soil.json diff --git a/src/main/resources/assets/botany/models/block/soil/acid.json b/botany/src/main/resources/assets/botany/models/block/soil/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/acid.json rename to botany/src/main/resources/assets/botany/models/block/soil/acid.json diff --git a/src/main/resources/assets/botany/models/block/soil/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/soil/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/soil/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/soil/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/soil/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/soil/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline.json b/botany/src/main/resources/assets/botany/models/block/soil/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/soil/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/soil/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/soil/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/soil/damp.json b/botany/src/main/resources/assets/botany/models/block/soil/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/damp.json rename to botany/src/main/resources/assets/botany/models/block/soil/damp.json diff --git a/src/main/resources/assets/botany/models/block/soil/dry.json b/botany/src/main/resources/assets/botany/models/block/soil/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/dry.json rename to botany/src/main/resources/assets/botany/models/block/soil/dry.json diff --git a/src/main/resources/assets/botany/models/block/soil/normal.json b/botany/src/main/resources/assets/botany/models/block/soil/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil/normal.json rename to botany/src/main/resources/assets/botany/models/block/soil/normal.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/block/soil_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/block/soil_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/block/soil_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/block/soil_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/block/stained.json b/botany/src/main/resources/assets/botany/models/block/stained.json similarity index 100% rename from src/main/resources/assets/botany/models/block/stained.json rename to botany/src/main/resources/assets/botany/models/block/stained.json diff --git a/src/main/resources/assets/botany/models/block/weeds.json b/botany/src/main/resources/assets/botany/models/block/weeds.json similarity index 100% rename from src/main/resources/assets/botany/models/block/weeds.json rename to botany/src/main/resources/assets/botany/models/block/weeds.json diff --git a/src/main/resources/assets/botany/models/block/weeds_long.json b/botany/src/main/resources/assets/botany/models/block/weeds_long.json similarity index 100% rename from src/main/resources/assets/botany/models/block/weeds_long.json rename to botany/src/main/resources/assets/botany/models/block/weeds_long.json diff --git a/src/main/resources/assets/botany/models/block/weeds_very_long.json b/botany/src/main/resources/assets/botany/models/block/weeds_very_long.json similarity index 100% rename from src/main/resources/assets/botany/models/block/weeds_very_long.json rename to botany/src/main/resources/assets/botany/models/block/weeds_very_long.json diff --git a/src/main/resources/assets/botany/models/item/botanist_database.json b/botany/src/main/resources/assets/botany/models/item/botanist_database.json similarity index 100% rename from src/main/resources/assets/botany/models/item/botanist_database.json rename to botany/src/main/resources/assets/botany/models/item/botanist_database.json diff --git a/src/main/resources/assets/botany/models/item/botanist_database_master.json b/botany/src/main/resources/assets/botany/models/item/botanist_database_master.json similarity index 100% rename from src/main/resources/assets/botany/models/item/botanist_database_master.json rename to botany/src/main/resources/assets/botany/models/item/botanist_database_master.json diff --git a/src/main/resources/assets/botany/models/item/ceramic.json b/botany/src/main/resources/assets/botany/models/item/ceramic.json similarity index 100% rename from src/main/resources/assets/botany/models/item/ceramic.json rename to botany/src/main/resources/assets/botany/models/item/ceramic.json diff --git a/src/main/resources/assets/botany/models/item/clay.json b/botany/src/main/resources/assets/botany/models/item/clay.json similarity index 100% rename from src/main/resources/assets/botany/models/item/clay.json rename to botany/src/main/resources/assets/botany/models/item/clay.json diff --git a/src/main/resources/assets/botany/models/item/dead_flower.json b/botany/src/main/resources/assets/botany/models/item/dead_flower.json similarity index 100% rename from src/main/resources/assets/botany/models/item/dead_flower.json rename to botany/src/main/resources/assets/botany/models/item/dead_flower.json diff --git a/src/main/resources/assets/botany/models/item/decaying_flower.json b/botany/src/main/resources/assets/botany/models/item/decaying_flower.json similarity index 100% rename from src/main/resources/assets/botany/models/item/decaying_flower.json rename to botany/src/main/resources/assets/botany/models/item/decaying_flower.json diff --git a/src/main/resources/assets/botany/models/item/encylopedia.json b/botany/src/main/resources/assets/botany/models/item/encylopedia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/encylopedia.json rename to botany/src/main/resources/assets/botany/models/item/encylopedia.json diff --git a/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json b/botany/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json similarity index 100% rename from src/main/resources/assets/botany/models/item/encylopedia_reinforced.json rename to botany/src/main/resources/assets/botany/models/item/encylopedia_reinforced.json diff --git a/src/main/resources/assets/botany/models/item/field_kit.json b/botany/src/main/resources/assets/botany/models/item/field_kit.json similarity index 100% rename from src/main/resources/assets/botany/models/item/field_kit.json rename to botany/src/main/resources/assets/botany/models/item/field_kit.json diff --git a/src/main/resources/assets/botany/models/item/field_kit1.json b/botany/src/main/resources/assets/botany/models/item/field_kit1.json similarity index 100% rename from src/main/resources/assets/botany/models/item/field_kit1.json rename to botany/src/main/resources/assets/botany/models/item/field_kit1.json diff --git a/src/main/resources/assets/botany/models/item/field_kit2.json b/botany/src/main/resources/assets/botany/models/item/field_kit2.json similarity index 100% rename from src/main/resources/assets/botany/models/item/field_kit2.json rename to botany/src/main/resources/assets/botany/models/item/field_kit2.json diff --git a/src/main/resources/assets/botany/models/item/field_kit3.json b/botany/src/main/resources/assets/botany/models/item/field_kit3.json similarity index 100% rename from src/main/resources/assets/botany/models/item/field_kit3.json rename to botany/src/main/resources/assets/botany/models/item/field_kit3.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/acid.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/acid.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed/normal.json b/botany/src/main/resources/assets/botany/models/item/flowerbed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed/normal.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed/normal.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/item/flowerbed_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/item/flowers/agapanthus.json b/botany/src/main/resources/assets/botany/models/item/flowers/agapanthus.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/agapanthus.json rename to botany/src/main/resources/assets/botany/models/item/flowers/agapanthus.json diff --git a/src/main/resources/assets/botany/models/item/flowers/allium.json b/botany/src/main/resources/assets/botany/models/item/flowers/allium.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/allium.json rename to botany/src/main/resources/assets/botany/models/item/flowers/allium.json diff --git a/src/main/resources/assets/botany/models/item/flowers/anemone.json b/botany/src/main/resources/assets/botany/models/item/flowers/anemone.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/anemone.json rename to botany/src/main/resources/assets/botany/models/item/flowers/anemone.json diff --git a/src/main/resources/assets/botany/models/item/flowers/aquilegia.json b/botany/src/main/resources/assets/botany/models/item/flowers/aquilegia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/aquilegia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/aquilegia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/aster.json b/botany/src/main/resources/assets/botany/models/item/flowers/aster.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/aster.json rename to botany/src/main/resources/assets/botany/models/item/flowers/aster.json diff --git a/src/main/resources/assets/botany/models/item/flowers/auricula.json b/botany/src/main/resources/assets/botany/models/item/flowers/auricula.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/auricula.json rename to botany/src/main/resources/assets/botany/models/item/flowers/auricula.json diff --git a/src/main/resources/assets/botany/models/item/flowers/azalea.json b/botany/src/main/resources/assets/botany/models/item/flowers/azalea.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/azalea.json rename to botany/src/main/resources/assets/botany/models/item/flowers/azalea.json diff --git a/src/main/resources/assets/botany/models/item/flowers/bluet.json b/botany/src/main/resources/assets/botany/models/item/flowers/bluet.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/bluet.json rename to botany/src/main/resources/assets/botany/models/item/flowers/bluet.json diff --git a/src/main/resources/assets/botany/models/item/flowers/carnation.json b/botany/src/main/resources/assets/botany/models/item/flowers/carnation.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/carnation.json rename to botany/src/main/resources/assets/botany/models/item/flowers/carnation.json diff --git a/src/main/resources/assets/botany/models/item/flowers/coneflower.json b/botany/src/main/resources/assets/botany/models/item/flowers/coneflower.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/coneflower.json rename to botany/src/main/resources/assets/botany/models/item/flowers/coneflower.json diff --git a/src/main/resources/assets/botany/models/item/flowers/cornflower.json b/botany/src/main/resources/assets/botany/models/item/flowers/cornflower.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/cornflower.json rename to botany/src/main/resources/assets/botany/models/item/flowers/cornflower.json diff --git a/src/main/resources/assets/botany/models/item/flowers/daffodil.json b/botany/src/main/resources/assets/botany/models/item/flowers/daffodil.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/daffodil.json rename to botany/src/main/resources/assets/botany/models/item/flowers/daffodil.json diff --git a/src/main/resources/assets/botany/models/item/flowers/dahlia.json b/botany/src/main/resources/assets/botany/models/item/flowers/dahlia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/dahlia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/dahlia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/daisy.json b/botany/src/main/resources/assets/botany/models/item/flowers/daisy.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/daisy.json rename to botany/src/main/resources/assets/botany/models/item/flowers/daisy.json diff --git a/src/main/resources/assets/botany/models/item/flowers/dandelion.json b/botany/src/main/resources/assets/botany/models/item/flowers/dandelion.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/dandelion.json rename to botany/src/main/resources/assets/botany/models/item/flowers/dandelion.json diff --git a/src/main/resources/assets/botany/models/item/flowers/dianthus.json b/botany/src/main/resources/assets/botany/models/item/flowers/dianthus.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/dianthus.json rename to botany/src/main/resources/assets/botany/models/item/flowers/dianthus.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/althea.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/althea.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/althea.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/althea.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/camellia.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/camellia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/camellia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/camellia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/delphinium.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/delphinium.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/delphinium.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/delphinium.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/foxglove.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/foxglove.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/foxglove.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/foxglove.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/goldenrod.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/goldenrod.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/goldenrod.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/goldenrod.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/hollyhock.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/hollyhock.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/hollyhock.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/hollyhock.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/hydrangea.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/hydrangea.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/hydrangea.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/hydrangea.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/lavender.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/lavender.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/lavender.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/lavender.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/lilac.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/lilac.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/lilac.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/lilac.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/penstemon.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/penstemon.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/penstemon.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/penstemon.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/peony.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/peony.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/peony.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/peony.json diff --git a/src/main/resources/assets/botany/models/item/flowers/double/rose.json b/botany/src/main/resources/assets/botany/models/item/flowers/double/rose.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/double/rose.json rename to botany/src/main/resources/assets/botany/models/item/flowers/double/rose.json diff --git a/src/main/resources/assets/botany/models/item/flowers/edelweiss.json b/botany/src/main/resources/assets/botany/models/item/flowers/edelweiss.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/edelweiss.json rename to botany/src/main/resources/assets/botany/models/item/flowers/edelweiss.json diff --git a/src/main/resources/assets/botany/models/item/flowers/forget.json b/botany/src/main/resources/assets/botany/models/item/flowers/forget.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/forget.json rename to botany/src/main/resources/assets/botany/models/item/flowers/forget.json diff --git a/src/main/resources/assets/botany/models/item/flowers/fuchsia.json b/botany/src/main/resources/assets/botany/models/item/flowers/fuchsia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/fuchsia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/fuchsia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/gaillardia.json b/botany/src/main/resources/assets/botany/models/item/flowers/gaillardia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/gaillardia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/gaillardia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/geranium.json b/botany/src/main/resources/assets/botany/models/item/flowers/geranium.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/geranium.json rename to botany/src/main/resources/assets/botany/models/item/flowers/geranium.json diff --git a/src/main/resources/assets/botany/models/item/flowers/iris.json b/botany/src/main/resources/assets/botany/models/item/flowers/iris.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/iris.json rename to botany/src/main/resources/assets/botany/models/item/flowers/iris.json diff --git a/src/main/resources/assets/botany/models/item/flowers/lily.json b/botany/src/main/resources/assets/botany/models/item/flowers/lily.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/lily.json rename to botany/src/main/resources/assets/botany/models/item/flowers/lily.json diff --git a/src/main/resources/assets/botany/models/item/flowers/marigold.json b/botany/src/main/resources/assets/botany/models/item/flowers/marigold.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/marigold.json rename to botany/src/main/resources/assets/botany/models/item/flowers/marigold.json diff --git a/src/main/resources/assets/botany/models/item/flowers/mums.json b/botany/src/main/resources/assets/botany/models/item/flowers/mums.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/mums.json rename to botany/src/main/resources/assets/botany/models/item/flowers/mums.json diff --git a/src/main/resources/assets/botany/models/item/flowers/orchid.json b/botany/src/main/resources/assets/botany/models/item/flowers/orchid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/orchid.json rename to botany/src/main/resources/assets/botany/models/item/flowers/orchid.json diff --git a/src/main/resources/assets/botany/models/item/flowers/pansy.json b/botany/src/main/resources/assets/botany/models/item/flowers/pansy.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/pansy.json rename to botany/src/main/resources/assets/botany/models/item/flowers/pansy.json diff --git a/src/main/resources/assets/botany/models/item/flowers/petunia.json b/botany/src/main/resources/assets/botany/models/item/flowers/petunia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/petunia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/petunia.json diff --git a/src/main/resources/assets/botany/models/item/flowers/pollen.json b/botany/src/main/resources/assets/botany/models/item/flowers/pollen.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/pollen.json rename to botany/src/main/resources/assets/botany/models/item/flowers/pollen.json diff --git a/src/main/resources/assets/botany/models/item/flowers/poppy.json b/botany/src/main/resources/assets/botany/models/item/flowers/poppy.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/poppy.json rename to botany/src/main/resources/assets/botany/models/item/flowers/poppy.json diff --git a/src/main/resources/assets/botany/models/item/flowers/primrose.json b/botany/src/main/resources/assets/botany/models/item/flowers/primrose.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/primrose.json rename to botany/src/main/resources/assets/botany/models/item/flowers/primrose.json diff --git a/src/main/resources/assets/botany/models/item/flowers/scabious.json b/botany/src/main/resources/assets/botany/models/item/flowers/scabious.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/scabious.json rename to botany/src/main/resources/assets/botany/models/item/flowers/scabious.json diff --git a/src/main/resources/assets/botany/models/item/flowers/seed.json b/botany/src/main/resources/assets/botany/models/item/flowers/seed.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/seed.json rename to botany/src/main/resources/assets/botany/models/item/flowers/seed.json diff --git a/src/main/resources/assets/botany/models/item/flowers/tulip.json b/botany/src/main/resources/assets/botany/models/item/flowers/tulip.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/tulip.json rename to botany/src/main/resources/assets/botany/models/item/flowers/tulip.json diff --git a/src/main/resources/assets/botany/models/item/flowers/viola.json b/botany/src/main/resources/assets/botany/models/item/flowers/viola.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/viola.json rename to botany/src/main/resources/assets/botany/models/item/flowers/viola.json diff --git a/src/main/resources/assets/botany/models/item/flowers/yarrow.json b/botany/src/main/resources/assets/botany/models/item/flowers/yarrow.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/yarrow.json rename to botany/src/main/resources/assets/botany/models/item/flowers/yarrow.json diff --git a/src/main/resources/assets/botany/models/item/flowers/zinnia.json b/botany/src/main/resources/assets/botany/models/item/flowers/zinnia.json similarity index 100% rename from src/main/resources/assets/botany/models/item/flowers/zinnia.json rename to botany/src/main/resources/assets/botany/models/item/flowers/zinnia.json diff --git a/src/main/resources/assets/botany/models/item/insulated_tube.json b/botany/src/main/resources/assets/botany/models/item/insulated_tube.json similarity index 100% rename from src/main/resources/assets/botany/models/item/insulated_tube.json rename to botany/src/main/resources/assets/botany/models/item/insulated_tube.json diff --git a/src/main/resources/assets/botany/models/item/loam/acid.json b/botany/src/main/resources/assets/botany/models/item/loam/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/acid.json rename to botany/src/main/resources/assets/botany/models/item/loam/acid.json diff --git a/src/main/resources/assets/botany/models/item/loam/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/loam/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/loam/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/loam/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/loam/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/loam/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline.json b/botany/src/main/resources/assets/botany/models/item/loam/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/loam/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/loam/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/loam/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/loam/damp.json b/botany/src/main/resources/assets/botany/models/item/loam/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/damp.json rename to botany/src/main/resources/assets/botany/models/item/loam/damp.json diff --git a/src/main/resources/assets/botany/models/item/loam/dry.json b/botany/src/main/resources/assets/botany/models/item/loam/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/dry.json rename to botany/src/main/resources/assets/botany/models/item/loam/dry.json diff --git a/src/main/resources/assets/botany/models/item/loam/normal.json b/botany/src/main/resources/assets/botany/models/item/loam/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam/normal.json rename to botany/src/main/resources/assets/botany/models/item/loam/normal.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/loam_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/item/loam_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/item/misc/mortar.json b/botany/src/main/resources/assets/botany/models/item/misc/mortar.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/mortar.json rename to botany/src/main/resources/assets/botany/models/item/misc/mortar.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_ash.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_ash.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_ash.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_ash.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_compost.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_compost.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_compost.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_compost.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_fertiliser.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_mulch.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_mulch.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_mulch.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_mulch.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_pulp.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_pulp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_pulp.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_pulp.json diff --git a/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json b/botany/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/powder_sulphur.json rename to botany/src/main/resources/assets/botany/models/item/misc/powder_sulphur.json diff --git a/src/main/resources/assets/botany/models/item/misc/weedkiller.json b/botany/src/main/resources/assets/botany/models/item/misc/weedkiller.json similarity index 100% rename from src/main/resources/assets/botany/models/item/misc/weedkiller.json rename to botany/src/main/resources/assets/botany/models/item/misc/weedkiller.json diff --git a/src/main/resources/assets/botany/models/item/pigment.json b/botany/src/main/resources/assets/botany/models/item/pigment.json similarity index 100% rename from src/main/resources/assets/botany/models/item/pigment.json rename to botany/src/main/resources/assets/botany/models/item/pigment.json diff --git a/src/main/resources/assets/botany/models/item/soil/acid.json b/botany/src/main/resources/assets/botany/models/item/soil/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/acid.json rename to botany/src/main/resources/assets/botany/models/item/soil/acid.json diff --git a/src/main/resources/assets/botany/models/item/soil/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/soil/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/soil/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/soil/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/soil/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/soil/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline.json b/botany/src/main/resources/assets/botany/models/item/soil/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/soil/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/soil/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/soil/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/soil/damp.json b/botany/src/main/resources/assets/botany/models/item/soil/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/damp.json rename to botany/src/main/resources/assets/botany/models/item/soil/damp.json diff --git a/src/main/resources/assets/botany/models/item/soil/dry.json b/botany/src/main/resources/assets/botany/models/item/soil/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/dry.json rename to botany/src/main/resources/assets/botany/models/item/soil/dry.json diff --git a/src/main/resources/assets/botany/models/item/soil/normal.json b/botany/src/main/resources/assets/botany/models/item/soil/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil/normal.json rename to botany/src/main/resources/assets/botany/models/item/soil/normal.json diff --git a/src/main/resources/assets/botany/models/item/soil_meter.json b/botany/src/main/resources/assets/botany/models/item/soil_meter.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_meter.json rename to botany/src/main/resources/assets/botany/models/item/soil_meter.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/acid.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid_damp.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/acid_dry.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_damp.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/alkaline_dry.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/damp.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/damp.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/dry.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/dry.json diff --git a/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json b/botany/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json similarity index 100% rename from src/main/resources/assets/botany/models/item/soil_no_weed/normal.json rename to botany/src/main/resources/assets/botany/models/item/soil_no_weed/normal.json diff --git a/src/main/resources/assets/botany/models/item/stained.json b/botany/src/main/resources/assets/botany/models/item/stained.json similarity index 100% rename from src/main/resources/assets/botany/models/item/stained.json rename to botany/src/main/resources/assets/botany/models/item/stained.json diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json b/botany/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json similarity index 100% rename from src/main/resources/assets/botany/models/item/tools/trowel_diamond.json rename to botany/src/main/resources/assets/botany/models/item/tools/trowel_diamond.json diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_gold.json b/botany/src/main/resources/assets/botany/models/item/tools/trowel_gold.json similarity index 100% rename from src/main/resources/assets/botany/models/item/tools/trowel_gold.json rename to botany/src/main/resources/assets/botany/models/item/tools/trowel_gold.json diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_iron.json b/botany/src/main/resources/assets/botany/models/item/tools/trowel_iron.json similarity index 100% rename from src/main/resources/assets/botany/models/item/tools/trowel_iron.json rename to botany/src/main/resources/assets/botany/models/item/tools/trowel_iron.json diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_stone.json b/botany/src/main/resources/assets/botany/models/item/tools/trowel_stone.json similarity index 100% rename from src/main/resources/assets/botany/models/item/tools/trowel_stone.json rename to botany/src/main/resources/assets/botany/models/item/tools/trowel_stone.json diff --git a/src/main/resources/assets/botany/models/item/tools/trowel_wood.json b/botany/src/main/resources/assets/botany/models/item/tools/trowel_wood.json similarity index 100% rename from src/main/resources/assets/botany/models/item/tools/trowel_wood.json rename to botany/src/main/resources/assets/botany/models/item/tools/trowel_wood.json diff --git a/src/main/resources/assets/botany/models/item/weeds.json b/botany/src/main/resources/assets/botany/models/item/weeds.json similarity index 100% rename from src/main/resources/assets/botany/models/item/weeds.json rename to botany/src/main/resources/assets/botany/models/item/weeds.json diff --git a/src/main/resources/assets/botany/models/item/weeds_long.json b/botany/src/main/resources/assets/botany/models/item/weeds_long.json similarity index 100% rename from src/main/resources/assets/botany/models/item/weeds_long.json rename to botany/src/main/resources/assets/botany/models/item/weeds_long.json diff --git a/src/main/resources/assets/botany/models/item/weeds_very_long.json b/botany/src/main/resources/assets/botany/models/item/weeds_very_long.json similarity index 100% rename from src/main/resources/assets/botany/models/item/weeds_very_long.json rename to botany/src/main/resources/assets/botany/models/item/weeds_very_long.json diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic brick base texture.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic brick base texture.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic brick base texture.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic brick base texture.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brick.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brick.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brick.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brick.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brick.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brick.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brick.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.bricklarge.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.brickstripe.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.cheque.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.cheque.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.cheque.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.cheque.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.mixed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.mixed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.mixed.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.mixed.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.split.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.split.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.split.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.split.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.split.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.split.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.split.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.tile.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.tile.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.tile.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.tile.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.tile.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.tile.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.tile.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrick.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbricklarge.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.2.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic.verticalbrickstripe.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredcurvedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/barredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/blank.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/blank.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/blank.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/blank.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/blank.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/blank.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/blank.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/blank.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/chequered.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/circle.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/circle.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/circle.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/circle.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/circle.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/circle.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/circle.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/circle.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/corner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/corner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/creeper4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/crossed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedsplitbarredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/curvedtsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal1edged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal2edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal3edged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonal4edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalcurvedtsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalhalved2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonalstriped2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diagonaltsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diamond.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/diamond.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/diamond.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/edged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/edged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem1.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/emblem5.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/halved.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/halved.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/halved.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/halved.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/halved2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/halved2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/halved2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettera4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterb4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letterf4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/letters4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/letters4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/lettert4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/multiply.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/multiply.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/multiply.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/octagon.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/octagon.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/octagon.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatebarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatestripedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ornatethinbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/overlappedsplitbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/plus.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/plus.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/plus.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/plus.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/plus.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/plus.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/plus.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/plus.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ringed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/ringed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/ringed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/roundedbarredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/saltire.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/saltire.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/saltire.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitbarredtsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/splitcrossed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/squared.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/squared.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/squared.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/squared.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/squared.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/squared.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/squared.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/squared.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/striped.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/striped.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/striped.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/striped.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/striped2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/striped2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/striped2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/stripedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickbarredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickcrossed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal1edged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal2edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal3edged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickdiagonal4edged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thickroundedbarredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicksaltire.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thicktsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinbarredend4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincrossed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedbarredcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedcrossed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thincurvedtsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thindiagonalstriped2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinedged4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinsaltire.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstriped2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thinstripedcorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/thintsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tiled.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tiled.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tiled.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/tsection4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner3.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/verythincorner4.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarred2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/ceramic/wavybarredalt2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/dead_flower.png b/botany/src/main/resources/assets/botany/textures/blocks/dead_flower.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/dead_flower.png rename to botany/src/main/resources/assets/botany/textures/blocks/dead_flower.png diff --git a/src/main/resources/assets/botany/textures/blocks/decaying_flower.png b/botany/src/main/resources/assets/botany/textures/blocks/decaying_flower.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/decaying_flower.png rename to botany/src/main/resources/assets/botany/textures/blocks/decaying_flower.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_allium.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_allium.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_allium.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_allium.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_blue_orchid.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_blue_orchid.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_blue_orchid.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_blue_orchid.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_dandelion.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_dandelion.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_dandelion.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_dandelion.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_houstonia.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_houstonia.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_houstonia.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_houstonia.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_oxeye_daisy.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_oxeye_daisy.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_oxeye_daisy.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_oxeye_daisy.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_paeonia.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_paeonia.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_paeonia.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_paeonia.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_pot.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_pot.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_pot.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_pot.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_rose.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_rose.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_rose.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_rose.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_tulip_orange.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_orange.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_tulip_orange.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_orange.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_tulip_pink.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_pink.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_tulip_pink.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_pink.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_tulip_red.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_red.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_tulip_red.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_red.png diff --git a/src/main/resources/assets/botany/textures/blocks/flower_tulip_white.png b/botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_white.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flower_tulip_white.png rename to botany/src/main/resources/assets/botany/textures/blocks/flower_tulip_white.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowerbed.normal.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/agapanthus.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/allium.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/allium.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/allium.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/allium.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/allium.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/allium.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/allium.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/allium.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/allium.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/anemone.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/anemone.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/anemone.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aquilegia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/aster.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/aster.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/aster.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/auricula.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/auricula.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/auricula.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/azalea.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/azalea.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/azalea.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/blank.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/blank.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/blank.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/blank.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/bluet.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/bluet.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/bluet.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/bluet.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/bluet.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/bluet.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/bluet.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/bluet.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/bluet.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/buddleia-wip.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/buddleia-wip.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/buddleia-wip.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/buddleia-wip.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/carnation.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/carnation.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/carnation.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/coneflower.bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/coneflower.bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/cornflower.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/cornflower.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/cornflower.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/cornflower.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/cornflower.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/cornflower.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daffodil.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daffodil.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daffodil.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daffodil.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daffodil.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dahlia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dahlia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dahlia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dahlia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dahlia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daisy.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daisy.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daisy.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daisy.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daisy.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daisy.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/daisy.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/daisy.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/daisy.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dandelion.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dandelion.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dandelion.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dandelion.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dandelion.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/dianthus.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/dianthus.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/althea2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/camellia2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-dw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-dw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-dw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-dw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/delphinium2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_bottom.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_bottom.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_bottom.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_bottom.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_top.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_top.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_top.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_paeonia_top.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_bottom.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_bottom.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_bottom.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_bottom.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_top.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_top.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_top.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_rose_top.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_bottom.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_bottom.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_bottom.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_bottom.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_top.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_top.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_top.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/double_plant_syringa_top.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/foxglove2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/goldenrod2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hollyhock2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/hydrangea2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lavender2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/lilac2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/penstemon2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/peony2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/double/rose2.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/edelweiss.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower.dandelion.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower.dandelion.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower.dandelion.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower.dandelion.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_allium.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_allium.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_allium.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_allium.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_blue_orchid.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_blue_orchid.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_blue_orchid.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_blue_orchid.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_dandelion.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_dandelion.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_dandelion.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_dandelion.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_houstonia.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_houstonia.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_houstonia.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_houstonia.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_oxeye_daisy.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_oxeye_daisy.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_oxeye_daisy.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_oxeye_daisy.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_paeonia.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_paeonia.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_paeonia.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_paeonia.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_rose.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_rose.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_rose.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_rose.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/flower_tulip_white.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_tulip_white.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/flower_tulip_white.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/flower_tulip_white.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/forget.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/forget.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/forget.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuchsia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/fuschia-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/fuschia-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/fuschia-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/fuschia-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/gaillardia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium-original.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/geranium.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/geranium.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/geranium.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/helenium-wip.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/helenium-wip.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/helenium-wip.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/helenium-wip.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/iris.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/iris.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/iris.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/iris.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/iris.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/iris.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/iris.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/iris.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/iris.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/iris.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/iris.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender-new-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-new-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender-new-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-new-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lavender.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lavender.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lavender.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/lily.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/lily.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/lily.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/marigold.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/marigold.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/marigold.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mum-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mum-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mum-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mum-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mums-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mums-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mums-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mums-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mums.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mums.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mums.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mums.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mums.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mums.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/mums.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/mums.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/mums.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/orchid.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/orchid.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/orchid.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/orchid.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/orchid.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/orchid.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/orchid.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/orchid.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/orchid.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pansy.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pansy.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pansy.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pansy.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pansy.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pansy.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pansy.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pansy.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pansy.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pansy.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pansy.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/petunia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/petunia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/petunia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/phlox-wip.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/phlox-wip.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/phlox-wip.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/phlox-wip.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pollen.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pollen.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pollen.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pollen.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/pollen.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/pollen.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/pollen.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/poppy.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/poppy.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/poppy.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/poppy.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/poppy.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/poppy.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/poppy.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/poppy.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/poppy.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/primrose.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/primrose.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/primrose.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/scabious.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/scabious.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/scabious.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/seed.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/seed.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/seed.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/seed.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/seed.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/seed.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/seed.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/tulip.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/tulip.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/tulip.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/tulip.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/tulip.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/tulip.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/tulip.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/tulip.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/tulip.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/viola.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/viola.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/viola.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/viola.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/viola.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/viola.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/viola.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/viola.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/viola.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/violet.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/violet.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/violet.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/violet.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/violet.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/violet.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/violet.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-wip.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-wip.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow-wip.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow-wip.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/yarrow.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/yarrow.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-bw.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-bw.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia-bw.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-bw.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-original.pdn b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-original.pdn similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia-original.pdn rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia-original.pdn diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.0.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.1.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.2.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.3.png b/botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.3.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/flowers/zinnia.3.png rename to botany/src/main/resources/assets/botany/textures/blocks/flowers/zinnia.3.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.normal.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.normal.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.png b/botany/src/main/resources/assets/botany/textures/blocks/loam.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.png rename to botany/src/main/resources/assets/botany/textures/blocks/loam.png diff --git a/src/main/resources/assets/botany/textures/blocks/loam.zip b/botany/src/main/resources/assets/botany/textures/blocks/loam.zip similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/loam.zip rename to botany/src/main/resources/assets/botany/textures/blocks/loam.zip diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil.normal.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil.normal.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.acid.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.alkaline.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/flowerbed.neutral.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.acid.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.alkaline.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/loam.neutral.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.acid.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.alkaline.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.damp.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.dry.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.0.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.0.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.0.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.1.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.1.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.1.png diff --git a/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.2.png b/botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.2.png rename to botany/src/main/resources/assets/botany/textures/blocks/soil/soil.neutral.normal.2.png diff --git a/src/main/resources/assets/botany/textures/blocks/stained.png b/botany/src/main/resources/assets/botany/textures/blocks/stained.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/stained.png rename to botany/src/main/resources/assets/botany/textures/blocks/stained.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/tileworker.png b/botany/src/main/resources/assets/botany/textures/blocks/tileworker.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/tileworker.png rename to botany/src/main/resources/assets/botany/textures/blocks/tileworker.png diff --git a/src/main/resources/assets/botany/textures/blocks/weeds.png b/botany/src/main/resources/assets/botany/textures/blocks/weeds.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/weeds.png rename to botany/src/main/resources/assets/botany/textures/blocks/weeds.png diff --git a/src/main/resources/assets/botany/textures/blocks/weeds_long.png b/botany/src/main/resources/assets/botany/textures/blocks/weeds_long.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/weeds_long.png rename to botany/src/main/resources/assets/botany/textures/blocks/weeds_long.png diff --git a/src/main/resources/assets/botany/textures/blocks/weeds_very_long.png b/botany/src/main/resources/assets/botany/textures/blocks/weeds_very_long.png similarity index 100% rename from src/main/resources/assets/botany/textures/blocks/weeds_very_long.png rename to botany/src/main/resources/assets/botany/textures/blocks/weeds_very_long.png diff --git a/src/main/resources/assets/botany/textures/items/botanist_database.png b/botany/src/main/resources/assets/botany/textures/items/botanist_database.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/botanist_database.png rename to botany/src/main/resources/assets/botany/textures/items/botanist_database.png diff --git a/src/main/resources/assets/botany/textures/items/botanist_database_master.png b/botany/src/main/resources/assets/botany/textures/items/botanist_database_master.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/botanist_database_master.png rename to botany/src/main/resources/assets/botany/textures/items/botanist_database_master.png diff --git a/src/main/resources/assets/botany/textures/items/clay.png b/botany/src/main/resources/assets/botany/textures/items/clay.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/clay.png rename to botany/src/main/resources/assets/botany/textures/items/clay.png diff --git a/src/main/resources/assets/botany/textures/items/insulated_tube.0.png b/botany/src/main/resources/assets/botany/textures/items/insulated_tube.0.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulated_tube.0.png rename to botany/src/main/resources/assets/botany/textures/items/insulated_tube.0.png diff --git a/src/main/resources/assets/botany/textures/items/insulated_tube.1.png b/botany/src/main/resources/assets/botany/textures/items/insulated_tube.1.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulated_tube.1.png rename to botany/src/main/resources/assets/botany/textures/items/insulated_tube.1.png diff --git a/src/main/resources/assets/botany/textures/items/insulated_tube.2.png b/botany/src/main/resources/assets/botany/textures/items/insulated_tube.2.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/insulated_tube.2.png rename to botany/src/main/resources/assets/botany/textures/items/insulated_tube.2.png diff --git a/src/main/resources/assets/botany/textures/items/mortar.png b/botany/src/main/resources/assets/botany/textures/items/mortar.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/mortar.png rename to botany/src/main/resources/assets/botany/textures/items/mortar.png diff --git a/src/main/resources/assets/botany/textures/items/pigment.png b/botany/src/main/resources/assets/botany/textures/items/pigment.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/pigment.png rename to botany/src/main/resources/assets/botany/textures/items/pigment.png diff --git a/src/main/resources/assets/botany/textures/items/powder_ash.png b/botany/src/main/resources/assets/botany/textures/items/powder_ash.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_ash.png rename to botany/src/main/resources/assets/botany/textures/items/powder_ash.png diff --git a/src/main/resources/assets/botany/textures/items/powder_compost.png b/botany/src/main/resources/assets/botany/textures/items/powder_compost.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_compost.png rename to botany/src/main/resources/assets/botany/textures/items/powder_compost.png diff --git a/src/main/resources/assets/botany/textures/items/powder_fertiliser.png b/botany/src/main/resources/assets/botany/textures/items/powder_fertiliser.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_fertiliser.png rename to botany/src/main/resources/assets/botany/textures/items/powder_fertiliser.png diff --git a/src/main/resources/assets/botany/textures/items/powder_mulch.png b/botany/src/main/resources/assets/botany/textures/items/powder_mulch.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_mulch.png rename to botany/src/main/resources/assets/botany/textures/items/powder_mulch.png diff --git a/src/main/resources/assets/botany/textures/items/powder_pulp.png b/botany/src/main/resources/assets/botany/textures/items/powder_pulp.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_pulp.png rename to botany/src/main/resources/assets/botany/textures/items/powder_pulp.png diff --git a/src/main/resources/assets/botany/textures/items/powder_sulphur.png b/botany/src/main/resources/assets/botany/textures/items/powder_sulphur.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/powder_sulphur.png rename to botany/src/main/resources/assets/botany/textures/items/powder_sulphur.png diff --git a/src/main/resources/assets/botany/textures/items/soil_meter.png b/botany/src/main/resources/assets/botany/textures/items/soil_meter.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/soil_meter.png rename to botany/src/main/resources/assets/botany/textures/items/soil_meter.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png b/botany/src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png rename to botany/src/main/resources/assets/botany/textures/items/tools/trowel_diamond.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowel_gold.png b/botany/src/main/resources/assets/botany/textures/items/tools/trowel_gold.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowel_gold.png rename to botany/src/main/resources/assets/botany/textures/items/tools/trowel_gold.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowel_iron.png b/botany/src/main/resources/assets/botany/textures/items/tools/trowel_iron.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowel_iron.png rename to botany/src/main/resources/assets/botany/textures/items/tools/trowel_iron.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowel_stone.png b/botany/src/main/resources/assets/botany/textures/items/tools/trowel_stone.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowel_stone.png rename to botany/src/main/resources/assets/botany/textures/items/tools/trowel_stone.png diff --git a/src/main/resources/assets/botany/textures/items/tools/trowel_wood.png b/botany/src/main/resources/assets/botany/textures/items/tools/trowel_wood.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/tools/trowel_wood.png rename to botany/src/main/resources/assets/botany/textures/items/tools/trowel_wood.png diff --git a/src/main/resources/assets/botany/textures/items/weedkiller.png b/botany/src/main/resources/assets/botany/textures/items/weedkiller.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/weedkiller.png rename to botany/src/main/resources/assets/botany/textures/items/weedkiller.png diff --git a/build.gradle b/build.gradle index 7d831614..2ee2cb29 100644 --- a/build.gradle +++ b/build.gradle @@ -15,87 +15,118 @@ buildscript { plugins { id "com.matthewprenger.cursegradle" version "1.0.9" } - -apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin" apply plugin: 'idea' apply plugin: 'maven' -apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin" -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - -version = version_major + '.' + version_minor + '.' + version_patch -if (System.getenv("BUILD_NUMBER") != null) { - version = version + "." + System.getenv("BUILD_NUMBER") -} -group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "binnie-mods-" + mcversion - -minecraft { - version = mcversion + "-" + forgeversion - mappings = mcp_mappings - runDir = "run" - - replace '@VERSION@', project.version -} - -repositories { - maven { - name = "jei" - url "http://dvs1.progwml6.com/files/maven" - } - maven { - name = "ic2, forestry" - url = "http://maven.ic2.player.to/" - } - maven { - name = "CurseForge" - url = "https://minecraft.curseforge.com/api/maven/" - } - maven { - name "Jared" - url "http://maven.blamejared.com/" - } -} - -dependencies { - deobfCompile("net.sengir.forestry:forestry_${mcversion}:${forestry_version}") { - transitive = false - } - deobfProvided "mezz.jei:jei_${mcversion}:${jei_version}:api" - runtime "mezz.jei:jei_${mcversion}:${jei_version}" - runtime "jei-bees:jeibees:${jeibees_version}:mc${mcversion}" - deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api" - runtime "net.industrial-craft:industrialcraft-2:${ic2_version}" - deobfProvided "CraftTweaker2:CraftTweaker2-API:${minetweaker_version}" -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} - -// prevent java 8's strict doclint for javadocs from failing builds allprojects { + apply plugin: 'net.minecraftforge.gradle.forge' + + minecraft { + version = mcversion + "-" + forgeversion + mappings = mcp_mappings + runDir = "run" + + replace '@VERSION@', project.version + } + + group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html + + version = version_major + '.' + version_minor + '.' + version_patch + if (System.getenv("BUILD_NUMBER") != null) { + version = version + "." + System.getenv("BUILD_NUMBER") + } + + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 + compileJava { + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 + } + + repositories { + maven { + name = "jei" + url "http://dvs1.progwml6.com/files/maven" + } + maven { + name = "ic2, forestry" + url = "http://maven.ic2.player.to/" + } + maven { + name = "CurseForge" + url = "https://minecraft.curseforge.com/api/maven/" + } + maven { + name "Jared" + url "http://maven.blamejared.com/" + } + } + + dependencies { + deobfCompile("net.sengir.forestry:forestry_${mcversion}:${forestry_version}") { + transitive = false + } + deobfProvided "mezz.jei:jei_${mcversion}:${jei_version}:api" + runtime "mezz.jei:jei_${mcversion}:${jei_version}" + runtime "jei-bees:jeibees:${jeibees_version}:mc${mcversion}" + deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api" + runtime "net.industrial-craft:industrialcraft-2:${ic2_version}" + deobfProvided "CraftTweaker2:CraftTweaker2-API:${minetweaker_version}" + } + + processResources { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version': project.version, 'mcversion': project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } + + // prevent java 8's strict doclint for javadocs from failing builds tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') } } +def mainProjects = [':api', ':botany', ':core', ':extrabees', ':extratrees', ':genetics'].collect{ subproject -> project(subproject) } +mainProjects.each { subproject -> evaluationDependsOn( subproject.path ) } +jar.dependsOn mainProjects.tasks['classes'] +jar { + mainProjects.each { subproject -> + from subproject.sourceSets.main.output.classesDirs + from subproject.sourceSets.main.output.resourcesDir + } +} + +task sourcesJar(type: Jar, dependsOn: mainProjects.tasks['classes']) { + classifier = 'sources' + mainProjects.each { subproject -> + from(subproject.sourceSets.main.allSource) { + exclude 'assets' + exclude 'mcmod.info' + } + } +} + +task copyJars(type: Copy) { + from mainProjects.collect { it.tasks.withType(Jar) } + into "$buildDir/libs" +} + +artifacts { + archives sourcesJar +} + uploadArchives { repositories { if (project.hasProperty('mavenDir')) { diff --git a/changelog.mustache b/changelog.mustache index 1b015bea..cd7451cf 100644 --- a/changelog.mustache +++ b/changelog.mustache @@ -1,10 +1,10 @@ -Alpha version. Do not create a world you care about with this version, it may break things severely.
-Please help the project by trying it out and reporting issues here.
-{{#tags}} -

{{name}}

-
    - {{#commits}} -
  • {{{message}}} - {{authorName}}
  • - {{/commits}} -
+Alpha version. Do not create a world you care about with this version, it may break things severely.
+Please help the project by trying it out and reporting issues here.
+{{#tags}} +

{{name}}

+
    + {{#commits}} +
  • {{{message}}} - {{authorName}}
  • + {{/commits}} +
{{/tags}} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 00000000..a3c602b7 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,5 @@ +archivesBaseName = 'core-' + mcversion + +dependencies { + compile project(":api") +} diff --git a/src/main/java/binnie/core/AbstractMod.java b/core/src/main/java/binnie/core/AbstractMod.java similarity index 99% rename from src/main/java/binnie/core/AbstractMod.java rename to core/src/main/java/binnie/core/AbstractMod.java index da7ad965..8a19f198 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/core/src/main/java/binnie/core/AbstractMod.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; diff --git a/src/main/java/binnie/Binnie.java b/core/src/main/java/binnie/core/Binnie.java similarity index 91% rename from src/main/java/binnie/Binnie.java rename to core/src/main/java/binnie/core/Binnie.java index 9e48cee4..ebc67f23 100644 --- a/src/main/java/binnie/Binnie.java +++ b/core/src/main/java/binnie/core/Binnie.java @@ -1,4 +1,4 @@ -package binnie; +package binnie.core; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; -import binnie.core.mod.config.ManagerConfig; +import binnie.core.config.ManagerConfig; import binnie.core.resource.ManagerResource; public final class Binnie { diff --git a/src/main/java/binnie/core/BinnieCore.java b/core/src/main/java/binnie/core/BinnieCore.java similarity index 97% rename from src/main/java/binnie/core/BinnieCore.java rename to core/src/main/java/binnie/core/BinnieCore.java index 04c6a89e..ddf7a9bd 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/core/src/main/java/binnie/core/BinnieCore.java @@ -27,9 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.plugins.PluginManager; -import binnie.Binnie; -import binnie.Constants; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; @@ -42,8 +40,8 @@ import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.ItemFluidContainer; import binnie.core.machines.MachineGroup; import binnie.core.machines.storage.ModuleStorage; -import binnie.core.mod.config.ConfigurationMain; -import binnie.core.mod.config.ConfigurationMods; +import binnie.core.config.ConfigurationMain; +import binnie.core.config.ConfigurationMods; import binnie.core.models.ModelManager; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinniePacketHandler; @@ -51,7 +49,7 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; @Mod( modid = Constants.CORE_MOD_ID, diff --git a/src/main/java/binnie/Constants.java b/core/src/main/java/binnie/core/Constants.java similarity index 94% rename from src/main/java/binnie/Constants.java rename to core/src/main/java/binnie/core/Constants.java index 191b955b..7a843327 100644 --- a/src/main/java/binnie/Constants.java +++ b/core/src/main/java/binnie/core/Constants.java @@ -1,4 +1,4 @@ -package binnie; +package binnie.core; public final class Constants { diff --git a/src/main/java/binnie/core/IInitializable.java b/core/src/main/java/binnie/core/IInitializable.java similarity index 100% rename from src/main/java/binnie/core/IInitializable.java rename to core/src/main/java/binnie/core/IInitializable.java diff --git a/src/main/java/binnie/core/ManagerBase.java b/core/src/main/java/binnie/core/ManagerBase.java similarity index 91% rename from src/main/java/binnie/core/ManagerBase.java rename to core/src/main/java/binnie/core/ManagerBase.java index 670a92d7..a47ba1b0 100644 --- a/src/main/java/binnie/core/ManagerBase.java +++ b/core/src/main/java/binnie/core/ManagerBase.java @@ -1,7 +1,5 @@ package binnie.core; -import binnie.Binnie; - public abstract class ManagerBase implements IInitializable { public ManagerBase() { Binnie.MANAGERS.add(this); diff --git a/src/main/java/binnie/core/Mods.java b/core/src/main/java/binnie/core/Mods.java similarity index 100% rename from src/main/java/binnie/core/Mods.java rename to core/src/main/java/binnie/core/Mods.java diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/core/src/main/java/binnie/core/block/IMultipassBlock.java similarity index 100% rename from src/main/java/binnie/core/block/IMultipassBlock.java rename to core/src/main/java/binnie/core/block/IMultipassBlock.java diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/core/src/main/java/binnie/core/block/ItemMetadata.java similarity index 94% rename from src/main/java/binnie/core/block/ItemMetadata.java rename to core/src/main/java/binnie/core/block/ItemMetadata.java index a85a6ca9..0a5024ea 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/core/src/main/java/binnie/core/block/ItemMetadata.java @@ -1,5 +1,7 @@ package binnie.core.block; +import binnie.core.api.block.IBlockMetadata; +import binnie.core.api.block.TileEntityMetadata; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/core/block/ItemMetadataRenderer.java b/core/src/main/java/binnie/core/block/ItemMetadataRenderer.java similarity index 100% rename from src/main/java/binnie/core/block/ItemMetadataRenderer.java rename to core/src/main/java/binnie/core/block/ItemMetadataRenderer.java diff --git a/src/main/java/binnie/core/block/package-info.java b/core/src/main/java/binnie/core/block/package-info.java similarity index 100% rename from src/main/java/binnie/core/block/package-info.java rename to core/src/main/java/binnie/core/block/package-info.java diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/core/src/main/java/binnie/core/circuits/BinnieCircuit.java similarity index 100% rename from src/main/java/binnie/core/circuits/BinnieCircuit.java rename to core/src/main/java/binnie/core/circuits/BinnieCircuit.java diff --git a/src/main/java/binnie/core/circuits/package-info.java b/core/src/main/java/binnie/core/circuits/package-info.java similarity index 100% rename from src/main/java/binnie/core/circuits/package-info.java rename to core/src/main/java/binnie/core/circuits/package-info.java diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/core/src/main/java/binnie/core/config/BinnieConfiguration.java similarity index 93% rename from src/main/java/binnie/core/mod/config/BinnieConfiguration.java rename to core/src/main/java/binnie/core/config/BinnieConfiguration.java index 5c9a997e..6b1eb022 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/core/src/main/java/binnie/core/config/BinnieConfiguration.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.io.File; diff --git a/src/main/java/binnie/core/mod/config/ConfigFile.java b/core/src/main/java/binnie/core/config/ConfigFile.java similarity index 84% rename from src/main/java/binnie/core/mod/config/ConfigFile.java rename to core/src/main/java/binnie/core/config/ConfigFile.java index 2bcb591a..b25261e3 100644 --- a/src/main/java/binnie/core/mod/config/ConfigFile.java +++ b/core/src/main/java/binnie/core/config/ConfigFile.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/core/mod/config/ConfigProperty.java b/core/src/main/java/binnie/core/config/ConfigProperty.java similarity index 94% rename from src/main/java/binnie/core/mod/config/ConfigProperty.java rename to core/src/main/java/binnie/core/config/ConfigProperty.java index 80b07e57..918e5c24 100644 --- a/src/main/java/binnie/core/mod/config/ConfigProperty.java +++ b/core/src/main/java/binnie/core/config/ConfigProperty.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMain.java b/core/src/main/java/binnie/core/config/ConfigurationMain.java similarity index 75% rename from src/main/java/binnie/core/mod/config/ConfigurationMain.java rename to core/src/main/java/binnie/core/config/ConfigurationMain.java index b4bbc736..b07fdec4 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMain.java +++ b/core/src/main/java/binnie/core/config/ConfigurationMain.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; @ConfigFile(filename = "/config/forestry/binniecore/main.conf") public class ConfigurationMain { diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMods.java b/core/src/main/java/binnie/core/config/ConfigurationMods.java similarity index 95% rename from src/main/java/binnie/core/mod/config/ConfigurationMods.java rename to core/src/main/java/binnie/core/config/ConfigurationMods.java index 108ea4fa..4d1ed3f4 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMods.java +++ b/core/src/main/java/binnie/core/config/ConfigurationMods.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; @ConfigFile(filename = "/config/forestry/binnie-mods.conf") public class ConfigurationMods { diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/core/src/main/java/binnie/core/config/ManagerConfig.java similarity index 98% rename from src/main/java/binnie/core/mod/config/ManagerConfig.java rename to core/src/main/java/binnie/core/config/ManagerConfig.java index 291fb72c..a6cfb963 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/core/src/main/java/binnie/core/config/ManagerConfig.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/main/java/binnie/core/mod/config/PropBoolean.java b/core/src/main/java/binnie/core/config/PropBoolean.java similarity index 96% rename from src/main/java/binnie/core/mod/config/PropBoolean.java rename to core/src/main/java/binnie/core/config/PropBoolean.java index 1676e6a5..67d3c15a 100644 --- a/src/main/java/binnie/core/mod/config/PropBoolean.java +++ b/core/src/main/java/binnie/core/config/PropBoolean.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/core/mod/config/PropDouble.java b/core/src/main/java/binnie/core/config/PropDouble.java similarity index 96% rename from src/main/java/binnie/core/mod/config/PropDouble.java rename to core/src/main/java/binnie/core/config/PropDouble.java index 28db9a2d..de568cc8 100644 --- a/src/main/java/binnie/core/mod/config/PropDouble.java +++ b/core/src/main/java/binnie/core/config/PropDouble.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/core/mod/config/PropInteger.java b/core/src/main/java/binnie/core/config/PropInteger.java similarity index 96% rename from src/main/java/binnie/core/mod/config/PropInteger.java rename to core/src/main/java/binnie/core/config/PropInteger.java index f8d99dfb..18b14d25 100644 --- a/src/main/java/binnie/core/mod/config/PropInteger.java +++ b/core/src/main/java/binnie/core/config/PropInteger.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/core/mod/config/PropPercentage.java b/core/src/main/java/binnie/core/config/PropPercentage.java similarity index 97% rename from src/main/java/binnie/core/mod/config/PropPercentage.java rename to core/src/main/java/binnie/core/config/PropPercentage.java index 80a89e9d..314c3a88 100644 --- a/src/main/java/binnie/core/mod/config/PropPercentage.java +++ b/core/src/main/java/binnie/core/config/PropPercentage.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/core/src/main/java/binnie/core/config/PropertyBase.java similarity index 98% rename from src/main/java/binnie/core/mod/config/PropertyBase.java rename to core/src/main/java/binnie/core/config/PropertyBase.java index 01228996..92934efb 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/core/src/main/java/binnie/core/config/PropertyBase.java @@ -1,4 +1,4 @@ -package binnie.core.mod.config; +package binnie.core.config; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/main/java/binnie/package-info.java b/core/src/main/java/binnie/core/config/package-info.java similarity index 89% rename from src/main/java/binnie/package-info.java rename to core/src/main/java/binnie/core/config/package-info.java index 536e4882..89eb631c 100644 --- a/src/main/java/binnie/package-info.java +++ b/core/src/main/java/binnie/core/config/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie; +package binnie.core.config; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/genetics/genetics/AlleleHelper.java b/core/src/main/java/binnie/core/genetics/AlleleHelper.java similarity index 98% rename from src/main/java/binnie/genetics/genetics/AlleleHelper.java rename to core/src/main/java/binnie/core/genetics/AlleleHelper.java index 414762dd..5bb12959 100644 --- a/src/main/java/binnie/genetics/genetics/AlleleHelper.java +++ b/core/src/main/java/binnie/core/genetics/AlleleHelper.java @@ -1,4 +1,4 @@ -package binnie.genetics.genetics; +package binnie.core.genetics; import java.util.Locale; @@ -14,7 +14,7 @@ import forestry.core.genetics.alleles.EnumAllele; import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; import binnie.botany.api.gardening.EnumSoilType; -import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.util.I18N; public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/core/src/main/java/binnie/core/genetics/BreedingSystem.java similarity index 89% rename from src/main/java/binnie/core/genetics/BreedingSystem.java rename to core/src/main/java/binnie/core/genetics/BreedingSystem.java index 7b64f4cc..53657207 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/core/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -11,6 +11,7 @@ import java.util.Objects; import java.util.Set; import java.util.TreeSet; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -37,23 +38,23 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.resource.BinnieSprite; import binnie.core.util.I18N; -public abstract class BreedingSystem implements IItemStackRepresentitive { - public float discoveredSpeciesPercentage; - public int totalSpeciesCount; - public int discoveredSpeciesCount; - public int totalSecretCount; - public int discoveredSecretCount; - public float discoveredBranchPercentage; - public int totalBranchCount; - public int discoveredBranchCount; +public abstract class BreedingSystem implements IBreedingSystem, IItemStackRepresentitive { + private float discoveredSpeciesPercentage; + private int totalSpeciesCount; + private int discoveredSpeciesCount; + private int totalSecretCount; + private int discoveredSecretCount; + private float discoveredBranchPercentage; + private int totalBranchCount; + private int discoveredBranchCount; protected BinnieSprite iconUndiscovered; protected BinnieSprite iconDiscovered; - List allActiveSpecies; - String currentEpithet; + protected List allActiveSpecies; + protected String currentEpithet; private List allBranches; private List allSpecies; private List allMutations; @@ -73,18 +74,20 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.furtherMutations = new HashMap<>(); this.allResultantMutations = new HashMap<>(); this.allFurtherMutations = new HashMap<>(); - Binnie.GENETICS.registerBreedingSystem(this); MinecraftForge.EVENT_BUS.register(this); } + @Override public String getChromosomeName(final IChromosomeType chromo) { return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); } + @Override public String getChromosomeShortName(final IChromosomeType chromo) { return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); } + @Override public final String getEpitome(final float discoveredPercentage) { int i = 0; if (discoveredPercentage == 1.0f) { @@ -105,20 +108,25 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".epitome." + i); } + @Override public abstract ISpeciesRoot getSpeciesRoot(); + @Override public final List getAllBranches() { return this.allBranches; } + @Override public final Collection getAllSpecies() { return this.allActiveSpecies; } + @Override public final Collection getAllMutations() { return this.allMutations; } + @Override public void calculateArrays() { ISpeciesRoot speciesRoot = getSpeciesRoot(); calculateAlleles(speciesRoot); @@ -126,6 +134,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { calculateMutations(speciesRoot); } + @Override public void calculateAlleles(ISpeciesRoot speciesRoot) { this.allSpecies = new ArrayList<>(); this.allActiveSpecies = new ArrayList<>(); @@ -152,6 +161,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } } + @Override public void calculateBranches(ISpeciesRoot speciesRoot) { Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values(); this.allBranches = new ArrayList<>(); @@ -177,6 +187,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } } + @Override public void calculateMutations(ISpeciesRoot speciesRoot) { this.allMutations = new ArrayList<>(); List speciesMutations = speciesRoot.getMutations(false); @@ -204,10 +215,12 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } } + @Override public final boolean isBlacklisted(final IAllele allele) { return AlleleManager.alleleRegistry.isBlacklisted(allele.getUID()); } + @Override public final List getResultantMutations(final IAlleleSpecies species) { if (this.resultantMutations.isEmpty()) { this.calculateArrays(); @@ -215,6 +228,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.resultantMutations.get(species); } + @Override public final List getFurtherMutations(final IAlleleSpecies species) { if (this.furtherMutations.isEmpty()) { this.calculateArrays(); @@ -222,26 +236,32 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.furtherMutations.get(species); } + @Override public final boolean isMutationDiscovered(final IMutation mutation, final World world, final GameProfile name) { return this.isMutationDiscovered(mutation, this.getSpeciesRoot().getBreedingTracker(world, name)); } + @Override public final boolean isMutationDiscovered(final IMutation mutation, final IBreedingTracker tracker) { return tracker.isDiscovered(mutation); } + @Override public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final GameProfile name) { return this.isSpeciesDiscovered(species, this.getSpeciesRoot().getBreedingTracker(world, name)); } + @Override public final boolean isSpeciesDiscovered(final IAlleleSpecies species, final IBreedingTracker tracker) { return tracker.isDiscovered(species); } + @Override public final boolean isSecret(final IAlleleSpecies species) { return !species.isCounted(); } + @Override public final boolean isSecret(final IClassification branch) { for (final IAlleleSpecies species : branch.getMemberSpecies()) { if (!this.isSecret(species)) { @@ -251,6 +271,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return true; } + @Override public final Collection getDiscoveredBranches(final World world, final GameProfile player) { final List branches = new ArrayList<>(); for (final IClassification branch : this.getAllBranches()) { @@ -267,6 +288,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return branches; } + @Override public final Collection getDiscoveredBranches(final IBreedingTracker tracker) { final List branches = new ArrayList<>(); for (final IClassification branch : this.getAllBranches()) { @@ -283,6 +305,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return branches; } + @Override public final Collection getDiscoveredSpecies(final World world, final GameProfile player) { final List speciesList = new ArrayList<>(); for (final IAlleleSpecies species : this.getAllSpecies()) { @@ -293,6 +316,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return speciesList; } + @Override public final Collection getDiscoveredSpecies(final IBreedingTracker tracker) { final List speciesList = new ArrayList<>(); for (final IAlleleSpecies species : this.getAllSpecies()) { @@ -313,20 +337,22 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return speciesList; } + @Override @SideOnly(Side.CLIENT) public TextureAtlasSprite getUndiscoveredIcon() { return this.iconUndiscovered.getSprite(); } + @Override @SideOnly(Side.CLIENT) public TextureAtlasSprite getDiscoveredIcon() { return this.iconDiscovered.getSprite(); } + @Override public abstract float getChance(IMutation mutation, EntityPlayer player, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies); - public abstract Class getTrackerClass(); - + @Override @SubscribeEvent public final void onSyncBreedingTracker(final ForestryEvent.SyncedBreedingTracker event) { final IBreedingTracker tracker = event.tracker; @@ -336,6 +362,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.syncTracker(tracker); } + @Override public final void syncTracker(final IBreedingTracker tracker) { if (allActiveSpecies.isEmpty()) { calculateArrays(); @@ -388,23 +415,29 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.onSyncBreedingTracker(tracker); } + @Override public void onSyncBreedingTracker(final IBreedingTracker tracker) { } + @Override public String getEpitome() { return this.getEpitome(this.discoveredSpeciesPercentage); } + @Override public final String getDescriptor() { return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".descriptor"); } + @Override public final String getIdent() { return this.getSpeciesRoot().getUID(); } + @Override public abstract int getColour(); + @Override public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (allele instanceof IAlleleBoolean) { IAlleleBoolean alleleBoolean = (IAlleleBoolean) allele; @@ -416,6 +449,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return allele.getAlleleName(); } + @Override public String getName() { return I18N.localise("binniecore." + this.getSpeciesRoot().getUID() + ".shortName"); } @@ -431,27 +465,26 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.getName(); } - public abstract boolean isDNAManipulable(ItemStack stack); - - public abstract boolean isDNAManipulable(ISpeciesType type); - + @Override @Nullable public IIndividual getConversion(final ItemStack stack) { return null; } + @Override public final IIndividual getDefaultIndividual() { return this.getSpeciesRoot().templateAsIndividual(this.getSpeciesRoot().getDefaultTemplate()); } + @Override public final ISpeciesType getDefaultType() { return this.getActiveTypes()[0]; } - public abstract ISpeciesType[] getActiveTypes(); - + @Override public abstract void addExtraAlleles(final IChromosomeType p0, final TreeSet p1); + @Override public ItemStack getConversionStack(final ItemStack stack) { IIndividual conversion = this.getConversion(stack); if (conversion == null) { @@ -460,10 +493,12 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.getSpeciesRoot().getMemberStack(conversion, this.getDefaultType()); } + @Override public final Collection getActiveKaryotype() { return Binnie.GENETICS.getActiveChromosomes(this.getSpeciesRoot()); } + @Override public ItemStack getDefaultMember(final String uid) { IIndividual individual = this.getIndividual(uid); if (individual == null) { @@ -472,6 +507,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.getSpeciesRoot().getMemberStack(individual, this.getDefaultType()); } + @Override @Nullable public IIndividual getIndividual(String uid) { IAllele[] template = this.getSpeciesRoot().getTemplate(uid); @@ -480,4 +516,44 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } return this.getSpeciesRoot().templateAsIndividual(template); } + + @Override + public int getDiscoveredSpeciesCount() { + return discoveredSpeciesCount; + } + + @Override + public int getTotalSpeciesCount() { + return totalSpeciesCount; + } + + @Override + public float getDiscoveredSpeciesPercentage() { + return discoveredSpeciesPercentage; + } + + @Override + public int getTotalSecretCount() { + return totalSecretCount; + } + + @Override + public int getDiscoveredSecretCount() { + return discoveredSecretCount; + } + + @Override + public float getDiscoveredBranchPercentage() { + return discoveredBranchPercentage; + } + + @Override + public int getTotalBranchCount() { + return totalBranchCount; + } + + @Override + public int getDiscoveredBranchCount() { + return discoveredBranchCount; + } } diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/core/src/main/java/binnie/core/genetics/ForestryAllele.java similarity index 97% rename from src/main/java/binnie/core/genetics/ForestryAllele.java rename to core/src/main/java/binnie/core/genetics/ForestryAllele.java index 3fcd3df0..0689ad20 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/core/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -1,11 +1,10 @@ package binnie.core.genetics; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import binnie.Binnie; - public class ForestryAllele { public enum Lifespan { Shortest, @@ -236,7 +235,7 @@ public class ForestryAllele { } public IAllele[] getTemplate() { - return Binnie.GENETICS.getBeeRoot().getTemplate(this.getAllele().getUID()); + return BeeManager.beeRoot.getTemplate(this.getAllele().getUID()); } } } diff --git a/src/main/java/binnie/core/genetics/Gene.java b/core/src/main/java/binnie/core/genetics/Gene.java similarity index 96% rename from src/main/java/binnie/core/genetics/Gene.java rename to core/src/main/java/binnie/core/genetics/Gene.java index 29efec3a..764cfdd9 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/core/src/main/java/binnie/core/genetics/Gene.java @@ -1,5 +1,7 @@ package binnie.core.genetics; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.api.IGene; import com.google.common.base.Preconditions; import net.minecraft.nbt.NBTTagCompound; @@ -9,8 +11,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.genetics.api.IGene; +import binnie.core.Binnie; public class Gene implements IGene { private IAllele allele; @@ -84,7 +85,7 @@ public class Gene implements IGene { return Binnie.GENETICS.getSystem(this.root).getAlleleName(this.chromosome, this.allele); } - public BreedingSystem getSystem() { + public IBreedingSystem getSystem() { return Binnie.GENETICS.getSystem(this.root); } diff --git a/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java b/core/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java similarity index 100% rename from src/main/java/binnie/core/genetics/IItemStackRepresentitive.java rename to core/src/main/java/binnie/core/genetics/IItemStackRepresentitive.java diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/core/src/main/java/binnie/core/genetics/ManagerGenetics.java similarity index 61% rename from src/main/java/binnie/core/genetics/ManagerGenetics.java rename to core/src/main/java/binnie/core/genetics/ManagerGenetics.java index f8327f9e..b71a54ac 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/core/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -1,5 +1,7 @@ package binnie.core.genetics; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.api.IItemAnalysable; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -11,16 +13,16 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; +import com.mojang.authlib.GameProfile; +import forestry.api.genetics.IBreedingTracker; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.arboriculture.ITreeRoot; -import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleFloat; @@ -30,25 +32,12 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.IButterflyRoot; -import binnie.Binnie; -import binnie.Constants; -import binnie.botany.api.genetics.IFlowerRoot; -import binnie.botany.genetics.FlowerBreedingSystem; -import binnie.botany.genetics.allele.AlleleFlowerColor; -import binnie.botany.modules.BotanyModuleUIDs; -import binnie.core.BinnieCore; +import binnie.core.Binnie; import binnie.core.ManagerBase; -import binnie.modules.ModuleManager; public class ManagerGenetics extends ManagerBase { - private final Map BREEDING_SYSTEMS; - public BreedingSystem beeBreedingSystem; - public BreedingSystem treeBreedingSystem; - public BreedingSystem mothBreedingSystem; - public BreedingSystem flowerBreedingSystem; + private final Map BREEDING_SYSTEMS; private List invalidChromosomeTypes; private Map>> chromosomeArray; @@ -58,20 +47,46 @@ public class ManagerGenetics extends ManagerBase { this.chromosomeArray = new LinkedHashMap<>(); } - @Override - public void preInit() { - if (BinnieCore.isApicultureActive()) { - this.beeBreedingSystem = new BeeBreedingSystem(); + public static boolean isAnalysable(final ItemStack stack) { + final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); + return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.GENETICS.getConversion(stack) != null; + } + + public static boolean isAnalysed(final ItemStack stack) { + if (stack.isEmpty()) { + return false; } - if (BinnieCore.isArboricultureActive()) { - this.treeBreedingSystem = new TreeBreedingSystem(); + final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); + if (ind != null) { + return ind.isAnalyzed(); } - if (BinnieCore.isLepidopteryActive()) { - this.mothBreedingSystem = new MothBreedingSystem(); - } - if (ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.FLOWERS)) { - this.flowerBreedingSystem = new FlowerBreedingSystem(); + return stack.getItem() instanceof IItemAnalysable && ((IItemAnalysable) stack.getItem()).isAnalysed(stack); + } + + public static ItemStack analyse(ItemStack stack, World world, GameProfile username) { + if (!stack.isEmpty()) { + ItemStack conv = Binnie.GENETICS.getConversionStack(stack).copy(); + if (!conv.isEmpty()) { + conv.setCount(stack.getCount()); + stack = conv; + + } + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); + if (root != null) { + final IIndividual ind = root.getMember(stack); + ind.analyze(); + IBreedingTracker breedingTracker = ind.getGenome().getSpeciesRoot().getBreedingTracker(world, username); + breedingTracker.registerBirth(ind); + final NBTTagCompound nbttagcompound = new NBTTagCompound(); + ind.writeToNBT(nbttagcompound); + stack.setTagCompound(nbttagcompound); + return stack; + } + if (stack.getItem() instanceof IItemAnalysable) { + return ((IItemAnalysable) stack.getItem()).analyse(stack); + } } + return stack; } @Override @@ -79,25 +94,9 @@ public class ManagerGenetics extends ManagerBase { this.refreshData(); } - public ITreeRoot getTreeRoot() { - return TreeManager.treeRoot; - } - - public IBeeRoot getBeeRoot() { - return BeeManager.beeRoot; - } - - public IButterflyRoot getButterflyRoot() { - return ButterflyManager.butterflyRoot; - } - - public IFlowerRoot getFlowerRoot() { - return (IFlowerRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers"); - } - @Nullable - public BreedingSystem getSystem(final String string) { - for (final BreedingSystem system : this.BREEDING_SYSTEMS.values()) { + public IBreedingSystem getSystem(final String string) { + for (final IBreedingSystem system : this.BREEDING_SYSTEMS.values()) { if (system.getIdent().equals(string)) { return system; } @@ -105,9 +104,9 @@ public class ManagerGenetics extends ManagerBase { return null; } - public BreedingSystem getSystem(final ISpeciesRoot root) { + public IBreedingSystem getSystem(final ISpeciesRoot root) { String rootUID = root.getUID(); - BreedingSystem system = this.getSystem(rootUID); + IBreedingSystem system = this.getSystem(rootUID); Preconditions.checkState(system != null, "Could not find system for species root %s", rootUID); return system; } @@ -120,18 +119,18 @@ public class ManagerGenetics extends ManagerBase { return Tolerance.values()[tol.ordinal()].getBounds(); } - public Collection getActiveSystems() { + public Collection getActiveSystems() { return this.BREEDING_SYSTEMS.values(); } - public void registerBreedingSystem(final BreedingSystem system) { + public void registerBreedingSystem(final IBreedingSystem system) { this.BREEDING_SYSTEMS.put(system.getSpeciesRoot(), system); } @Nullable - public BreedingSystem getConversionSystem(final ItemStack stack) { + public IBreedingSystem getConversionSystem(final ItemStack stack) { if (!stack.isEmpty()) { - for (final BreedingSystem system : this.getActiveSystems()) { + for (final IBreedingSystem system : this.getActiveSystems()) { if (system.getConversion(stack) != null) { return system; } @@ -142,7 +141,7 @@ public class ManagerGenetics extends ManagerBase { public ItemStack getConversionStack(final ItemStack stack) { if (!stack.isEmpty()) { - final BreedingSystem system = this.getConversionSystem(stack); + final IBreedingSystem system = this.getConversionSystem(stack); if (system != null) { return system.getConversionStack(stack); } @@ -152,7 +151,7 @@ public class ManagerGenetics extends ManagerBase { @Nullable public IIndividual getConversion(final ItemStack stack) { - final BreedingSystem system = this.getConversionSystem(stack); + final IBreedingSystem system = this.getConversionSystem(stack); return (system == null) ? null : system.getConversion(stack); } @@ -163,15 +162,15 @@ public class ManagerGenetics extends ManagerBase { private void refreshData() { this.loadAlleles(); - for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { + for (IBreedingSystem system : Binnie.GENETICS.getActiveSystems()) { system.calculateArrays(); } } private void loadAlleles() { this.invalidChromosomeTypes.clear(); - for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - BreedingSystem system = this.getSystem(root); + for (IBreedingSystem system : BREEDING_SYSTEMS.values()) { + ISpeciesRoot root = system.getSpeciesRoot(); Map> chromosomeMap = new LinkedHashMap<>(); for (IChromosomeType chromosome : root.getKaryotype()) { TreeSet alleles = new TreeSet<>(new ComparatorAllele()); @@ -219,10 +218,10 @@ public class ManagerGenetics extends ManagerBase { throw new NullPointerException("Allele is null!"); } if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); + return Float.compare(((IAlleleFloat) o1).getValue(), ((IAlleleFloat) o2).getValue()); } - if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleFlowerColor)) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); + if (o1.getClass().equals(IAlleleInteger.class) && o2.getClass().equals(IAlleleInteger.class)) { + return Integer.compare(((IAlleleInteger) o1).getValue(), ((IAlleleInteger) o2).getValue()); } if (o1.getAlleleName() != null && o2.getAlleleName() != null) { return o1.getAlleleName().compareTo(o2.getAlleleName()); diff --git a/src/main/java/binnie/core/genetics/Tolerance.java b/core/src/main/java/binnie/core/genetics/Tolerance.java similarity index 100% rename from src/main/java/binnie/core/genetics/Tolerance.java rename to core/src/main/java/binnie/core/genetics/Tolerance.java diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java similarity index 100% rename from src/main/java/binnie/core/genetics/VirtualBeeHousing.java rename to core/src/main/java/binnie/core/genetics/VirtualBeeHousing.java diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/core/src/main/java/binnie/core/genetics/VirtualHousing.java similarity index 100% rename from src/main/java/binnie/core/genetics/VirtualHousing.java rename to core/src/main/java/binnie/core/genetics/VirtualHousing.java diff --git a/src/main/java/binnie/core/genetics/package-info.java b/core/src/main/java/binnie/core/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/core/genetics/package-info.java rename to core/src/main/java/binnie/core/genetics/package-info.java diff --git a/src/main/java/binnie/core/gui/Attribute.java b/core/src/main/java/binnie/core/gui/Attribute.java similarity index 100% rename from src/main/java/binnie/core/gui/Attribute.java rename to core/src/main/java/binnie/core/gui/Attribute.java diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/core/src/main/java/binnie/core/gui/BinnieCoreGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/BinnieCoreGUI.java rename to core/src/main/java/binnie/core/gui/BinnieCoreGUI.java diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java similarity index 94% rename from src/main/java/binnie/core/gui/BinnieGUIHandler.java rename to core/src/main/java/binnie/core/gui/BinnieGUIHandler.java index 0a40d4c3..651f7cc0 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/core/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -10,7 +10,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -import binnie.core.BinnieCore; import binnie.core.gui.minecraft.Window; public final class BinnieGUIHandler implements IGuiHandler { @@ -35,7 +34,7 @@ public final class BinnieGUIHandler implements IGuiHandler { @Nullable @SideOnly(Side.CLIENT) public final Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) { - if (BinnieCore.getBinnieProxy().isSimulating(world)) { + if (!world.isRemote) { return this.getServerGuiElement(id, player, world, x, y, z); } Window window = this.getWindow(id, player, world, x, y, z, Side.CLIENT); diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/core/src/main/java/binnie/core/gui/ControlGenesisOption.java similarity index 97% rename from src/main/java/binnie/genetics/gui/ControlGenesisOption.java rename to core/src/main/java/binnie/core/gui/ControlGenesisOption.java index ba11910c..7d93d75c 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/core/src/main/java/binnie/core/gui/ControlGenesisOption.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.core.gui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/gui/CraftGUI.java b/core/src/main/java/binnie/core/gui/CraftGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/CraftGUI.java rename to core/src/main/java/binnie/core/gui/CraftGUI.java diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/core/src/main/java/binnie/core/gui/IBinnieGUID.java similarity index 100% rename from src/main/java/binnie/core/gui/IBinnieGUID.java rename to core/src/main/java/binnie/core/gui/IBinnieGUID.java diff --git a/src/main/java/binnie/core/gui/ITooltip.java b/core/src/main/java/binnie/core/gui/ITooltip.java similarity index 100% rename from src/main/java/binnie/core/gui/ITooltip.java rename to core/src/main/java/binnie/core/gui/ITooltip.java diff --git a/src/main/java/binnie/core/gui/ITooltipHelp.java b/core/src/main/java/binnie/core/gui/ITooltipHelp.java similarity index 100% rename from src/main/java/binnie/core/gui/ITooltipHelp.java rename to core/src/main/java/binnie/core/gui/ITooltipHelp.java diff --git a/src/main/java/binnie/core/gui/ITopLevelWidget.java b/core/src/main/java/binnie/core/gui/ITopLevelWidget.java similarity index 100% rename from src/main/java/binnie/core/gui/ITopLevelWidget.java rename to core/src/main/java/binnie/core/gui/ITopLevelWidget.java diff --git a/src/main/java/binnie/core/gui/IWidget.java b/core/src/main/java/binnie/core/gui/IWidget.java similarity index 100% rename from src/main/java/binnie/core/gui/IWidget.java rename to core/src/main/java/binnie/core/gui/IWidget.java diff --git a/src/main/java/binnie/core/gui/IWidgetAttribute.java b/core/src/main/java/binnie/core/gui/IWidgetAttribute.java similarity index 100% rename from src/main/java/binnie/core/gui/IWidgetAttribute.java rename to core/src/main/java/binnie/core/gui/IWidgetAttribute.java diff --git a/src/main/java/binnie/core/gui/RenderStage.java b/core/src/main/java/binnie/core/gui/RenderStage.java similarity index 100% rename from src/main/java/binnie/core/gui/RenderStage.java rename to core/src/main/java/binnie/core/gui/RenderStage.java diff --git a/src/main/java/binnie/core/gui/Tooltip.java b/core/src/main/java/binnie/core/gui/Tooltip.java similarity index 100% rename from src/main/java/binnie/core/gui/Tooltip.java rename to core/src/main/java/binnie/core/gui/Tooltip.java diff --git a/src/main/java/binnie/core/gui/TopLevelWidget.java b/core/src/main/java/binnie/core/gui/TopLevelWidget.java similarity index 100% rename from src/main/java/binnie/core/gui/TopLevelWidget.java rename to core/src/main/java/binnie/core/gui/TopLevelWidget.java diff --git a/src/main/java/binnie/core/gui/Widget.java b/core/src/main/java/binnie/core/gui/Widget.java similarity index 100% rename from src/main/java/binnie/core/gui/Widget.java rename to core/src/main/java/binnie/core/gui/Widget.java diff --git a/src/main/java/binnie/core/gui/controls/ControlCheckbox.java b/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/ControlCheckbox.java rename to core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java diff --git a/src/main/java/binnie/core/gui/controls/ControlText.java b/core/src/main/java/binnie/core/gui/controls/ControlText.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/ControlText.java rename to core/src/main/java/binnie/core/gui/controls/ControlText.java diff --git a/src/main/java/binnie/core/gui/controls/ControlTextCentered.java b/core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/ControlTextCentered.java rename to core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java diff --git a/src/main/java/binnie/core/gui/controls/ControlTextEdit.java b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/ControlTextEdit.java rename to core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java diff --git a/src/main/java/binnie/core/gui/controls/button/ControlButton.java b/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/button/ControlButton.java rename to core/src/main/java/binnie/core/gui/controls/button/ControlButton.java diff --git a/src/main/java/binnie/core/gui/controls/button/package-info.java b/core/src/main/java/binnie/core/gui/controls/button/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/button/package-info.java rename to core/src/main/java/binnie/core/gui/controls/button/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/core/Control.java b/core/src/main/java/binnie/core/gui/controls/core/Control.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/core/Control.java rename to core/src/main/java/binnie/core/gui/controls/core/Control.java diff --git a/src/main/java/binnie/core/gui/controls/core/IControlValue.java b/core/src/main/java/binnie/core/gui/controls/core/IControlValue.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/core/IControlValue.java rename to core/src/main/java/binnie/core/gui/controls/core/IControlValue.java diff --git a/src/main/java/binnie/core/gui/controls/core/IControlValues.java b/core/src/main/java/binnie/core/gui/controls/core/IControlValues.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/core/IControlValues.java rename to core/src/main/java/binnie/core/gui/controls/core/IControlValues.java diff --git a/src/main/java/binnie/core/gui/controls/core/package-info.java b/core/src/main/java/binnie/core/gui/controls/core/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/core/package-info.java rename to core/src/main/java/binnie/core/gui/controls/core/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlList.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/listbox/ControlList.java rename to core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java rename to core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/listbox/ControlOption.java rename to core/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java rename to core/src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java diff --git a/src/main/java/binnie/core/gui/controls/listbox/package-info.java b/core/src/main/java/binnie/core/gui/controls/listbox/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/listbox/package-info.java rename to core/src/main/java/binnie/core/gui/controls/listbox/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/package-info.java b/core/src/main/java/binnie/core/gui/controls/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/package-info.java rename to core/src/main/java/binnie/core/gui/controls/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/page/ControlPage.java b/core/src/main/java/binnie/core/gui/controls/page/ControlPage.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/page/ControlPage.java rename to core/src/main/java/binnie/core/gui/controls/page/ControlPage.java diff --git a/src/main/java/binnie/core/gui/controls/page/ControlPages.java b/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/page/ControlPages.java rename to core/src/main/java/binnie/core/gui/controls/page/ControlPages.java diff --git a/src/main/java/binnie/core/gui/controls/page/package-info.java b/core/src/main/java/binnie/core/gui/controls/page/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/page/package-info.java rename to core/src/main/java/binnie/core/gui/controls/page/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java rename to core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java diff --git a/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java rename to core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java diff --git a/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java rename to core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java diff --git a/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java b/core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java rename to core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java diff --git a/src/main/java/binnie/core/gui/controls/scroll/package-info.java b/core/src/main/java/binnie/core/gui/controls/scroll/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/scroll/package-info.java rename to core/src/main/java/binnie/core/gui/controls/scroll/package-info.java diff --git a/src/main/java/binnie/core/gui/controls/tab/ControlTab.java b/core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/tab/ControlTab.java rename to core/src/main/java/binnie/core/gui/controls/tab/ControlTab.java diff --git a/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java b/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java rename to core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java diff --git a/src/main/java/binnie/core/gui/controls/tab/package-info.java b/core/src/main/java/binnie/core/gui/controls/tab/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/controls/tab/package-info.java rename to core/src/main/java/binnie/core/gui/controls/tab/package-info.java diff --git a/src/main/java/binnie/core/gui/database/ControlBranchBox.java b/core/src/main/java/binnie/core/gui/database/ControlBranchBox.java similarity index 100% rename from src/main/java/binnie/core/gui/database/ControlBranchBox.java rename to core/src/main/java/binnie/core/gui/database/ControlBranchBox.java diff --git a/src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java b/core/src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java similarity index 100% rename from src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java rename to core/src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java diff --git a/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java similarity index 89% rename from src/main/java/binnie/core/gui/database/ControlBreedingProgress.java rename to core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java index 12d412ef..62487830 100644 --- a/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java +++ b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java @@ -1,9 +1,9 @@ package binnie.core.gui.database; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; @@ -20,7 +20,7 @@ class ControlBreedingProgress extends Control { private float percentage; private int colour; - public ControlBreedingProgress(final IWidget parent, final int x, final int y, final int width, final int height, final BreedingSystem system, final float percentage) { + public ControlBreedingProgress(final IWidget parent, final int x, final int y, final int width, final int height, final IBreedingSystem system, final float percentage) { super(parent, x, y, width, height); this.percentage = percentage; this.colour = system.getColour(); diff --git a/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java b/core/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java similarity index 94% rename from src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java rename to core/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java index 06fdde5e..b3ac417a 100644 --- a/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java +++ b/core/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java @@ -2,6 +2,7 @@ package binnie.core.gui.database; import javax.annotation.Nullable; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import com.mojang.authlib.GameProfile; @@ -15,8 +16,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; @@ -54,7 +54,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme public void setSpecies(final IAlleleSpecies species, EnumDiscoveryState state) { final ISpeciesRoot speciesRoot = Binnie.GENETICS.getSpeciesRoot(species); - final BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); + final IBreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); final IAllele[] template = system.getSpeciesRoot().getTemplate(species); final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(template); super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); @@ -78,7 +78,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme if (this.species == null) { return; } - BreedingSystem system = Binnie.GENETICS.getSystem(this.species.getRoot()); + IBreedingSystem system = Binnie.GENETICS.getSystem(this.species.getRoot()); switch (this.discovered) { case Show: { super.onRenderForeground(guiWidth, guiHeight); diff --git a/src/main/java/binnie/core/gui/database/ControlItemStackOption.java b/core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java similarity index 100% rename from src/main/java/binnie/core/gui/database/ControlItemStackOption.java rename to core/src/main/java/binnie/core/gui/database/ControlItemStackOption.java diff --git a/src/main/java/binnie/core/gui/database/ControlMutationBox.java b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java similarity index 91% rename from src/main/java/binnie/core/gui/database/ControlMutationBox.java rename to core/src/main/java/binnie/core/gui/database/ControlMutationBox.java index 417f25ed..10c30d6f 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationBox.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java @@ -3,10 +3,10 @@ package binnie.core.gui.database; import javax.annotation.Nullable; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.minecraft.Window; @@ -31,7 +31,7 @@ class ControlMutationBox extends ControlListBox { if (species != this.species) { this.species = species; this.movePercentage(-100.0f); - final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); + final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); if (species != null) { if (this.type == Type.Resultant) { diff --git a/src/main/java/binnie/core/gui/database/ControlMutationItem.java b/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java similarity index 93% rename from src/main/java/binnie/core/gui/database/ControlMutationItem.java rename to core/src/main/java/binnie/core/gui/database/ControlMutationItem.java index 3110b33f..9a97738d 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationItem.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationItem.java @@ -2,10 +2,10 @@ package binnie.core.gui.database; import javax.annotation.Nullable; +import binnie.core.api.genetics.IBreedingSystem; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.controls.listbox.ControlList; import binnie.core.gui.controls.listbox.ControlOption; import binnie.core.gui.minecraft.Window; @@ -25,7 +25,7 @@ class ControlMutationItem extends ControlOption { this.addSymbol = new ControlMutationSymbol(this, 24, 4, 0); this.arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1); final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isNEI(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); + final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); if (this.getValue() != null) { final boolean isMutationDiscovered = system.isMutationDiscovered(this.getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); IAlleleSpecies allele = null; diff --git a/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java similarity index 92% rename from src/main/java/binnie/core/gui/database/ControlMutationSymbol.java rename to core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index 8932daa0..de30d66a 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -1,5 +1,6 @@ package binnie.core.gui.database; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -7,7 +8,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; @@ -49,7 +49,7 @@ class ControlMutationSymbol extends Control implements ITooltip { public void setValue(final IMutation value) { this.value = value; final boolean isNEI = ((WindowAbstractDatabase) this.getTopParent()).isNEI(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); + final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); this.discovered = (isNEI || system.isMutationDiscovered(value, Window.get(this).getWorld(), Window.get(this).getUsername())); if (this.discovered) { this.setColor(16777215); @@ -63,7 +63,7 @@ class ControlMutationSymbol extends Control implements ITooltip { if (this.type == 1 && this.discovered) { final IAlleleSpecies species1 = this.value.getAllele0(); final IAlleleSpecies species2 = this.value.getAllele1(); - final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); + final IBreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final float chance = system.getChance(this.value, Window.get(this).getPlayer(), species1, species2); tooltip.add(I18N.localise(DatabaseConstants.CONTROL_KEY+ ".chance", chance)); for (final String string : this.value.getSpecialConditions()) { diff --git a/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java similarity index 100% rename from src/main/java/binnie/core/gui/database/ControlSpeciesBox.java rename to core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java diff --git a/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java similarity index 100% rename from src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java rename to core/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java diff --git a/src/main/java/binnie/core/gui/database/DatabaseConstants.java b/core/src/main/java/binnie/core/gui/database/DatabaseConstants.java similarity index 100% rename from src/main/java/binnie/core/gui/database/DatabaseConstants.java rename to core/src/main/java/binnie/core/gui/database/DatabaseConstants.java diff --git a/src/main/java/binnie/core/gui/database/DatabaseTab.java b/core/src/main/java/binnie/core/gui/database/DatabaseTab.java similarity index 100% rename from src/main/java/binnie/core/gui/database/DatabaseTab.java rename to core/src/main/java/binnie/core/gui/database/DatabaseTab.java diff --git a/src/main/java/binnie/core/gui/database/EnumDiscoveryState.java b/core/src/main/java/binnie/core/gui/database/EnumDiscoveryState.java similarity index 100% rename from src/main/java/binnie/core/gui/database/EnumDiscoveryState.java rename to core/src/main/java/binnie/core/gui/database/EnumDiscoveryState.java diff --git a/src/main/java/binnie/core/gui/database/IDatabaseMode.java b/core/src/main/java/binnie/core/gui/database/IDatabaseMode.java similarity index 100% rename from src/main/java/binnie/core/gui/database/IDatabaseMode.java rename to core/src/main/java/binnie/core/gui/database/IDatabaseMode.java diff --git a/src/main/java/binnie/core/gui/database/PageAbstract.java b/core/src/main/java/binnie/core/gui/database/PageAbstract.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageAbstract.java rename to core/src/main/java/binnie/core/gui/database/PageAbstract.java diff --git a/src/main/java/binnie/core/gui/database/PageBranch.java b/core/src/main/java/binnie/core/gui/database/PageBranch.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageBranch.java rename to core/src/main/java/binnie/core/gui/database/PageBranch.java diff --git a/src/main/java/binnie/core/gui/database/PageBranchOverview.java b/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageBranchOverview.java rename to core/src/main/java/binnie/core/gui/database/PageBranchOverview.java diff --git a/src/main/java/binnie/core/gui/database/PageBranchSpecies.java b/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageBranchSpecies.java rename to core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java diff --git a/src/main/java/binnie/core/gui/database/PageBreeder.java b/core/src/main/java/binnie/core/gui/database/PageBreeder.java similarity index 57% rename from src/main/java/binnie/core/gui/database/PageBreeder.java rename to core/src/main/java/binnie/core/gui/database/PageBreeder.java index bfb51bf2..ce6ced79 100644 --- a/src/main/java/binnie/core/gui/database/PageBreeder.java +++ b/core/src/main/java/binnie/core/gui/database/PageBreeder.java @@ -1,10 +1,10 @@ package binnie.core.gui.database; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.util.text.TextFormatting; import com.mojang.authlib.GameProfile; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.page.ControlPage; @@ -22,14 +22,14 @@ public class PageBreeder extends ControlPage { public void onPageRefresh() { this.deleteAllChildren(); - final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); + final IBreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".profile")); - new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species")); - new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".branches")); - new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); - if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species.secret")); + new ControlTextCentered(this, 75, "" + system.getDiscoveredSpeciesCount() + "/" + system.getTotalSpeciesCount() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species")); + new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.getDiscoveredSpeciesPercentage()); + new ControlTextCentered(this, 115, "" + system.getDiscoveredBranchCount() + "/" + system.getTotalBranchCount() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".branches")); + new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.getDiscoveredBranchPercentage()); + if (system.getDiscoveredSecretCount() > 0) { + new ControlTextCentered(this, 155, "" + system.getDiscoveredSecretCount() + "/" + system.getTotalSecretCount() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species.secret")); } new ControlTextCentered(this, 32, this.player.getName()); new ControlTextCentered(this, 44, TextFormatting.ITALIC + system.getEpitome()); diff --git a/src/main/java/binnie/core/gui/database/PageSpecies.java b/core/src/main/java/binnie/core/gui/database/PageSpecies.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageSpecies.java rename to core/src/main/java/binnie/core/gui/database/PageSpecies.java diff --git a/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageSpeciesClassification.java rename to core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java diff --git a/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageSpeciesMutations.java rename to core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java diff --git a/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageSpeciesOverview.java rename to core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java diff --git a/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java similarity index 100% rename from src/main/java/binnie/core/gui/database/PageSpeciesResultant.java rename to core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java diff --git a/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java similarity index 97% rename from src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java rename to core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java index 71674e74..f0def1cf 100644 --- a/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java +++ b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.entity.player.EntityPlayer; import com.mojang.authlib.GameProfile; @@ -17,7 +18,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.listbox.ControlListBox; @@ -43,7 +43,7 @@ public abstract class WindowAbstractDatabase extends Window { boolean isNEI; private int selectionBoxWidth; private Map modes; - private BreedingSystem system; + private IBreedingSystem system; @Nullable private Panel panelInformation; @Nullable @@ -53,7 +53,7 @@ public abstract class WindowAbstractDatabase extends Window { @Nullable private IAlleleSpecies gotoSpecies; - public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system, final int wid) { + public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final IBreedingSystem system, final int wid) { super(100, 192, player, null, side); this.selectionBoxWidth = 95; this.modes = new HashMap<>(); @@ -78,7 +78,7 @@ public abstract class WindowAbstractDatabase extends Window { return this.isNEI; } - public BreedingSystem getBreedingSystem() { + public IBreedingSystem getBreedingSystem() { return this.system; } diff --git a/src/main/java/binnie/core/gui/database/package-info.java b/core/src/main/java/binnie/core/gui/database/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/database/package-info.java rename to core/src/main/java/binnie/core/gui/database/package-info.java diff --git a/src/main/java/binnie/core/gui/events/Event.java b/core/src/main/java/binnie/core/gui/events/Event.java similarity index 100% rename from src/main/java/binnie/core/gui/events/Event.java rename to core/src/main/java/binnie/core/gui/events/Event.java diff --git a/src/main/java/binnie/core/gui/events/EventButtonClicked.java b/core/src/main/java/binnie/core/gui/events/EventButtonClicked.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventButtonClicked.java rename to core/src/main/java/binnie/core/gui/events/EventButtonClicked.java diff --git a/src/main/java/binnie/core/gui/events/EventHandler.java b/core/src/main/java/binnie/core/gui/events/EventHandler.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventHandler.java rename to core/src/main/java/binnie/core/gui/events/EventHandler.java diff --git a/src/main/java/binnie/core/gui/events/EventKey.java b/core/src/main/java/binnie/core/gui/events/EventKey.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventKey.java rename to core/src/main/java/binnie/core/gui/events/EventKey.java diff --git a/src/main/java/binnie/core/gui/events/EventMouse.java b/core/src/main/java/binnie/core/gui/events/EventMouse.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventMouse.java rename to core/src/main/java/binnie/core/gui/events/EventMouse.java diff --git a/src/main/java/binnie/core/gui/events/EventTextEdit.java b/core/src/main/java/binnie/core/gui/events/EventTextEdit.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventTextEdit.java rename to core/src/main/java/binnie/core/gui/events/EventTextEdit.java diff --git a/src/main/java/binnie/core/gui/events/EventValueChanged.java b/core/src/main/java/binnie/core/gui/events/EventValueChanged.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventValueChanged.java rename to core/src/main/java/binnie/core/gui/events/EventValueChanged.java diff --git a/src/main/java/binnie/core/gui/events/EventWidget.java b/core/src/main/java/binnie/core/gui/events/EventWidget.java similarity index 100% rename from src/main/java/binnie/core/gui/events/EventWidget.java rename to core/src/main/java/binnie/core/gui/events/EventWidget.java diff --git a/src/main/java/binnie/core/gui/events/package-info.java b/core/src/main/java/binnie/core/gui/events/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/events/package-info.java rename to core/src/main/java/binnie/core/gui/events/package-info.java diff --git a/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java similarity index 98% rename from src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java rename to core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java index 171f98a7..f3160944 100644 --- a/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IChromosomeType; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; diff --git a/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java similarity index 91% rename from src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java rename to core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java index 2197c769..c3df2427 100644 --- a/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java @@ -1,9 +1,13 @@ package binnie.core.gui.fieldkit; +import binnie.botany.api.BotanyAPI; import com.google.common.base.Preconditions; import javax.annotation.Nullable; +import forestry.api.apiculture.BeeManager; +import forestry.api.arboriculture.TreeManager; +import forestry.api.lepidopterology.ButterflyManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -13,7 +17,6 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; -import binnie.Binnie; import binnie.botany.api.genetics.EnumFlowerChromosome; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; @@ -53,7 +56,7 @@ public class ControlChromosome extends Control implements IControlValue tabSystems = new ControlTabBar(this, 8, 28, 23, 100, Position.LEFT, Binnie.GENETICS.getActiveSystems()) { + final ControlTabBar tabSystems = new ControlTabBar(this, 8, 28, 23, 100, Position.LEFT, Binnie.GENETICS.getActiveSystems()) { @Override - public ControlTab createTab(final int x, final int y, final int w, final int h, final BreedingSystem value) { - return new ControlTabIcon(this, x, y, w, h, value) { + public ControlTab createTab(final int x, final int y, final int w, final int h, final IBreedingSystem value) { + return new ControlTabIcon(this, x, y, w, h, value) { @Override public ItemStack getItemStack() { final ISpeciesType type = this.value.getDefaultType(); @@ -122,7 +123,7 @@ public class WindowGenesis extends Window { if (!(value instanceof BreedingSystem)) { return; } - BreedingSystem breedingSystem = (BreedingSystem) value; + IBreedingSystem breedingSystem = (IBreedingSystem) value; root = breedingSystem.getSpeciesRoot(); template = root.getDefaultTemplate(); refreshTemplate(null); @@ -184,7 +185,7 @@ public class WindowGenesis extends Window { private void refreshPickup() { this.panelPickup.deleteAllChildren(); int i = 0; - BreedingSystem system = Binnie.GENETICS.getSystem(this.root); + IBreedingSystem system = Binnie.GENETICS.getSystem(this.root); for (ISpeciesType type : system.getActiveTypes()) { IIndividual ind = this.root.templateAsIndividual(this.template); ind.analyze(); diff --git a/core/src/main/java/binnie/core/gui/genesis/package-info.java b/core/src/main/java/binnie/core/gui/genesis/package-info.java new file mode 100644 index 00000000..fc927fab --- /dev/null +++ b/core/src/main/java/binnie/core/gui/genesis/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.genesis; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/gui/geometry/Area.java b/core/src/main/java/binnie/core/gui/geometry/Area.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/Area.java rename to core/src/main/java/binnie/core/gui/geometry/Area.java diff --git a/src/main/java/binnie/core/gui/geometry/Border.java b/core/src/main/java/binnie/core/gui/geometry/Border.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/Border.java rename to core/src/main/java/binnie/core/gui/geometry/Border.java diff --git a/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java b/core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java rename to core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java diff --git a/src/main/java/binnie/core/gui/geometry/Point.java b/core/src/main/java/binnie/core/gui/geometry/Point.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/Point.java rename to core/src/main/java/binnie/core/gui/geometry/Point.java diff --git a/src/main/java/binnie/core/gui/geometry/Position.java b/core/src/main/java/binnie/core/gui/geometry/Position.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/Position.java rename to core/src/main/java/binnie/core/gui/geometry/Position.java diff --git a/src/main/java/binnie/core/gui/geometry/TextJustification.java b/core/src/main/java/binnie/core/gui/geometry/TextJustification.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/TextJustification.java rename to core/src/main/java/binnie/core/gui/geometry/TextJustification.java diff --git a/src/main/java/binnie/core/gui/geometry/package-info.java b/core/src/main/java/binnie/core/gui/geometry/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/geometry/package-info.java rename to core/src/main/java/binnie/core/gui/geometry/package-info.java diff --git a/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java rename to core/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java diff --git a/src/main/java/binnie/core/gui/minecraft/CustomSlot.java b/core/src/main/java/binnie/core/gui/minecraft/CustomSlot.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/CustomSlot.java rename to core/src/main/java/binnie/core/gui/minecraft/CustomSlot.java diff --git a/src/main/java/binnie/core/gui/minecraft/Dialog.java b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/Dialog.java rename to core/src/main/java/binnie/core/gui/minecraft/Dialog.java diff --git a/src/main/java/binnie/core/gui/minecraft/EnumColor.java b/core/src/main/java/binnie/core/gui/minecraft/EnumColor.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/EnumColor.java rename to core/src/main/java/binnie/core/gui/minecraft/EnumColor.java diff --git a/src/main/java/binnie/core/gui/minecraft/GUIIcon.java b/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java similarity index 96% rename from src/main/java/binnie/core/gui/minecraft/GUIIcon.java rename to core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java index 8a383709..fc7e5225 100644 --- a/src/main/java/binnie/core/gui/minecraft/GUIIcon.java +++ b/core/src/main/java/binnie/core/gui/minecraft/GUIIcon.java @@ -1,6 +1,6 @@ package binnie.core.gui.minecraft; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.resource.BinnieSprite; diff --git a/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java rename to core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java diff --git a/src/main/java/binnie/core/gui/minecraft/IMachineInformation.java b/core/src/main/java/binnie/core/gui/minecraft/IMachineInformation.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/IMachineInformation.java rename to core/src/main/java/binnie/core/gui/minecraft/IMachineInformation.java diff --git a/src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java b/core/src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java rename to core/src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java diff --git a/src/main/java/binnie/core/gui/minecraft/InventoryType.java b/core/src/main/java/binnie/core/gui/minecraft/InventoryType.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/InventoryType.java rename to core/src/main/java/binnie/core/gui/minecraft/InventoryType.java diff --git a/src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java rename to core/src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java diff --git a/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java b/core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java rename to core/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java diff --git a/src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java rename to core/src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java diff --git a/src/main/java/binnie/core/gui/minecraft/Window.java b/core/src/main/java/binnie/core/gui/minecraft/Window.java similarity index 99% rename from src/main/java/binnie/core/gui/minecraft/Window.java rename to core/src/main/java/binnie/core/gui/minecraft/Window.java index 58857670..d65950d2 100644 --- a/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Window.java @@ -18,7 +18,7 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; diff --git a/src/main/java/binnie/core/gui/minecraft/WindowInventory.java b/core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/WindowInventory.java rename to core/src/main/java/binnie/core/gui/minecraft/WindowInventory.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlImage.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/ControlUser.java rename to core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java b/core/src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java rename to core/src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java diff --git a/src/main/java/binnie/core/gui/minecraft/control/package-info.java b/core/src/main/java/binnie/core/gui/minecraft/control/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/control/package-info.java rename to core/src/main/java/binnie/core/gui/minecraft/control/package-info.java diff --git a/src/main/java/binnie/core/gui/minecraft/package-info.java b/core/src/main/java/binnie/core/gui/minecraft/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/minecraft/package-info.java rename to core/src/main/java/binnie/core/gui/minecraft/package-info.java diff --git a/src/main/java/binnie/core/gui/package-info.java b/core/src/main/java/binnie/core/gui/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/package-info.java rename to core/src/main/java/binnie/core/gui/package-info.java diff --git a/src/main/java/binnie/core/gui/renderer/RenderUtil.java b/core/src/main/java/binnie/core/gui/renderer/RenderUtil.java similarity index 100% rename from src/main/java/binnie/core/gui/renderer/RenderUtil.java rename to core/src/main/java/binnie/core/gui/renderer/RenderUtil.java diff --git a/src/main/java/binnie/core/gui/renderer/TextureRenderer.java b/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java similarity index 100% rename from src/main/java/binnie/core/gui/renderer/TextureRenderer.java rename to core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java diff --git a/src/main/java/binnie/core/gui/renderer/package-info.java b/core/src/main/java/binnie/core/gui/renderer/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/renderer/package-info.java rename to core/src/main/java/binnie/core/gui/renderer/package-info.java diff --git a/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java b/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java new file mode 100644 index 00000000..3d84b44b --- /dev/null +++ b/core/src/main/java/binnie/core/gui/resource/GeneticsGUITexture.java @@ -0,0 +1,6 @@ +package binnie.core.gui.resource; + +public enum GeneticsGUITexture { + Chromosome, + Chromosome2 +} diff --git a/src/main/java/binnie/core/gui/resource/IStyleSheet.java b/core/src/main/java/binnie/core/gui/resource/IStyleSheet.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/IStyleSheet.java rename to core/src/main/java/binnie/core/gui/resource/IStyleSheet.java diff --git a/src/main/java/binnie/core/gui/resource/StyleSheet.java b/core/src/main/java/binnie/core/gui/resource/StyleSheet.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/StyleSheet.java rename to core/src/main/java/binnie/core/gui/resource/StyleSheet.java diff --git a/src/main/java/binnie/core/gui/resource/StyleSheetManager.java b/core/src/main/java/binnie/core/gui/resource/StyleSheetManager.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/StyleSheetManager.java rename to core/src/main/java/binnie/core/gui/resource/StyleSheetManager.java diff --git a/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java b/core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java similarity index 83% rename from src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java rename to core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java index f5d91cd7..480b1969 100644 --- a/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java +++ b/core/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java @@ -4,14 +4,13 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.gui.resource.minecraft.PaddedTexture; import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; -import binnie.genetics.gui.punnett.ExtraBeeGUITexture; public class StyleSheetPunnett extends StyleSheet { public StyleSheetPunnett() { this.textures.put(CraftGUITexture.WINDOW, new PaddedTexture(0, 0, 160, 160, 0, BinnieCoreTexture.GUI_PUNNETT, 32, 32, 32, 32)); this.textures.put(CraftGUITexture.SLOT, new StandardTexture(160, 0, 18, 18, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(ExtraBeeGUITexture.Chromosome, new StandardTexture(160, 36, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); - this.textures.put(ExtraBeeGUITexture.Chromosome2, new StandardTexture(160, 52, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); + this.textures.put(GeneticsGUITexture.Chromosome, new StandardTexture(160, 36, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); + this.textures.put(GeneticsGUITexture.Chromosome2, new StandardTexture(160, 52, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); this.textures.put(CraftGUITexture.HELP_BUTTON, new StandardTexture(178, 0, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); this.textures.put(CraftGUITexture.INFO_BUTTON, new StandardTexture(178, 16, 16, 16, 0, BinnieCoreTexture.GUI_PUNNETT)); } diff --git a/src/main/java/binnie/core/gui/resource/Texture.java b/core/src/main/java/binnie/core/gui/resource/Texture.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/Texture.java rename to core/src/main/java/binnie/core/gui/resource/Texture.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java b/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java b/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java b/core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java b/core/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java b/core/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java b/core/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java diff --git a/src/main/java/binnie/core/gui/resource/minecraft/package-info.java b/core/src/main/java/binnie/core/gui/resource/minecraft/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/minecraft/package-info.java rename to core/src/main/java/binnie/core/gui/resource/minecraft/package-info.java diff --git a/src/main/java/binnie/core/gui/resource/package-info.java b/core/src/main/java/binnie/core/gui/resource/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/resource/package-info.java rename to core/src/main/java/binnie/core/gui/resource/package-info.java diff --git a/src/main/java/binnie/core/gui/window/Panel.java b/core/src/main/java/binnie/core/gui/window/Panel.java similarity index 100% rename from src/main/java/binnie/core/gui/window/Panel.java rename to core/src/main/java/binnie/core/gui/window/Panel.java diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java b/core/src/main/java/binnie/core/gui/window/WindowMachine.java similarity index 94% rename from src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java rename to core/src/main/java/binnie/core/gui/window/WindowMachine.java index 92a5706b..97305824 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java +++ b/core/src/main/java/binnie/core/gui/window/WindowMachine.java @@ -1,4 +1,4 @@ -package binnie.genetics.machine.craftgui; +package binnie.core.gui.window; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/gui/window/package-info.java b/core/src/main/java/binnie/core/gui/window/package-info.java similarity index 100% rename from src/main/java/binnie/core/gui/window/package-info.java rename to core/src/main/java/binnie/core/gui/window/package-info.java diff --git a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java similarity index 100% rename from src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java rename to core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/core/src/main/java/binnie/core/integration/jei/Drawables.java similarity index 100% rename from src/main/java/binnie/core/integration/jei/Drawables.java rename to core/src/main/java/binnie/core/integration/jei/Drawables.java diff --git a/src/main/java/binnie/core/integration/jei/package-info.java b/core/src/main/java/binnie/core/integration/jei/package-info.java similarity index 100% rename from src/main/java/binnie/core/integration/jei/package-info.java rename to core/src/main/java/binnie/core/integration/jei/package-info.java diff --git a/src/main/java/binnie/core/item/IItemEnum.java b/core/src/main/java/binnie/core/item/IItemEnum.java similarity index 100% rename from src/main/java/binnie/core/item/IItemEnum.java rename to core/src/main/java/binnie/core/item/IItemEnum.java diff --git a/src/main/java/binnie/core/item/IItemMiscProvider.java b/core/src/main/java/binnie/core/item/IItemMiscProvider.java similarity index 100% rename from src/main/java/binnie/core/item/IItemMiscProvider.java rename to core/src/main/java/binnie/core/item/IItemMiscProvider.java diff --git a/src/main/java/binnie/core/item/ItemCore.java b/core/src/main/java/binnie/core/item/ItemCore.java similarity index 100% rename from src/main/java/binnie/core/item/ItemCore.java rename to core/src/main/java/binnie/core/item/ItemCore.java diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/core/src/main/java/binnie/core/item/ItemFieldKit.java similarity index 99% rename from src/main/java/binnie/core/item/ItemFieldKit.java rename to core/src/main/java/binnie/core/item/ItemFieldKit.java index 544e083a..bf9e84cc 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/core/src/main/java/binnie/core/item/ItemFieldKit.java @@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/core/src/main/java/binnie/core/item/ItemGenesis.java similarity index 100% rename from src/main/java/binnie/core/item/ItemGenesis.java rename to core/src/main/java/binnie/core/item/ItemGenesis.java diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/core/src/main/java/binnie/core/item/ItemMisc.java similarity index 100% rename from src/main/java/binnie/core/item/ItemMisc.java rename to core/src/main/java/binnie/core/item/ItemMisc.java diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/core/src/main/java/binnie/core/item/ModuleItems.java similarity index 96% rename from src/main/java/binnie/core/item/ModuleItems.java rename to core/src/main/java/binnie/core/item/ModuleItems.java index 6f41f661..7e491070 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/core/src/main/java/binnie/core/item/ModuleItems.java @@ -1,6 +1,6 @@ package binnie.core.item; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/binnie/core/item/package-info.java b/core/src/main/java/binnie/core/item/package-info.java similarity index 100% rename from src/main/java/binnie/core/item/package-info.java rename to core/src/main/java/binnie/core/item/package-info.java diff --git a/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java b/core/src/main/java/binnie/core/liquid/AlcoholEffect.java similarity index 96% rename from src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java rename to core/src/main/java/binnie/core/liquid/AlcoholEffect.java index d87badf0..25ee7204 100644 --- a/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java +++ b/core/src/main/java/binnie/core/liquid/AlcoholEffect.java @@ -1,4 +1,4 @@ -package binnie.extratrees.alcohol; +package binnie.core.liquid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/core/src/main/java/binnie/core/liquid/BinnieFluid.java similarity index 100% rename from src/main/java/binnie/core/liquid/BinnieFluid.java rename to core/src/main/java/binnie/core/liquid/BinnieFluid.java diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/core/src/main/java/binnie/core/liquid/DrinkManager.java similarity index 95% rename from src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java rename to core/src/main/java/binnie/core/liquid/DrinkManager.java index 2ae73f2d..d812ce46 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/core/src/main/java/binnie/core/liquid/DrinkManager.java @@ -1,4 +1,4 @@ -package binnie.extratrees.alcohol.drink; +package binnie.core.liquid; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/core/src/main/java/binnie/core/liquid/FluidContainerType.java similarity index 100% rename from src/main/java/binnie/core/liquid/FluidContainerType.java rename to core/src/main/java/binnie/core/liquid/FluidContainerType.java diff --git a/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java b/core/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java similarity index 100% rename from src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java rename to core/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java diff --git a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java b/core/src/main/java/binnie/core/liquid/IDrinkLiquid.java similarity index 85% rename from src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java rename to core/src/main/java/binnie/core/liquid/IDrinkLiquid.java index 691233e9..10498f83 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java +++ b/core/src/main/java/binnie/core/liquid/IDrinkLiquid.java @@ -1,4 +1,4 @@ -package binnie.extratrees.alcohol.drink; +package binnie.core.liquid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/core/src/main/java/binnie/core/liquid/IFluidType.java similarity index 100% rename from src/main/java/binnie/core/liquid/IFluidType.java rename to core/src/main/java/binnie/core/liquid/IFluidType.java diff --git a/src/main/java/binnie/core/liquid/ILiquidType.java b/core/src/main/java/binnie/core/liquid/ILiquidType.java similarity index 100% rename from src/main/java/binnie/core/liquid/ILiquidType.java rename to core/src/main/java/binnie/core/liquid/ILiquidType.java diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java similarity index 97% rename from src/main/java/binnie/core/liquid/ItemFluidContainer.java rename to core/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 594f17cc..dc3e929b 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/core/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -34,10 +34,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import binnie.Binnie; -import binnie.extratrees.alcohol.AlcoholEffect; -import binnie.extratrees.alcohol.drink.DrinkManager; -import binnie.extratrees.alcohol.drink.IDrinkLiquid; +import binnie.core.Binnie; public class ItemFluidContainer extends ItemFood implements IItemModelRegister { private final FluidContainerType container; diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/core/src/main/java/binnie/core/liquid/ManagerLiquid.java similarity index 98% rename from src/main/java/binnie/core/liquid/ManagerLiquid.java rename to core/src/main/java/binnie/core/liquid/ManagerLiquid.java index 39e9fa28..1421f756 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/core/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.RecipeUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/main/java/binnie/core/liquid/package-info.java b/core/src/main/java/binnie/core/liquid/package-info.java similarity index 100% rename from src/main/java/binnie/core/liquid/package-info.java rename to core/src/main/java/binnie/core/liquid/package-info.java diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/core/src/main/java/binnie/core/machines/BlockMachine.java similarity index 97% rename from src/main/java/binnie/core/machines/BlockMachine.java rename to core/src/main/java/binnie/core/machines/BlockMachine.java index bc6a477e..a6cefbaa 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/core/src/main/java/binnie/core/machines/BlockMachine.java @@ -37,7 +37,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.utils.Translator; -import binnie.core.BinnieCore; import binnie.core.machines.component.IRender; import binnie.core.util.TileUtil; @@ -138,7 +137,7 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (!BinnieCore.getBinnieProxy().isSimulating(worldIn)) { + if (!!worldIn.isRemote) { return true; } if (playerIn.isSneaking()) { @@ -160,7 +159,7 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, entityliving, stack); - if (!BinnieCore.getBinnieProxy().isSimulating(world)) { + if (!!world.isRemote) { return; } final IMachine machine = Machine.getMachine(world.getTileEntity(pos)); diff --git a/src/main/java/binnie/core/machines/IBlockMachine.java b/core/src/main/java/binnie/core/machines/IBlockMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/IBlockMachine.java rename to core/src/main/java/binnie/core/machines/IBlockMachine.java diff --git a/src/main/java/binnie/core/machines/IMachine.java b/core/src/main/java/binnie/core/machines/IMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/IMachine.java rename to core/src/main/java/binnie/core/machines/IMachine.java diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/core/src/main/java/binnie/core/machines/IMachineType.java similarity index 51% rename from src/main/java/binnie/core/machines/IMachineType.java rename to core/src/main/java/binnie/core/machines/IMachineType.java index fbd58f68..2136f727 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/core/src/main/java/binnie/core/machines/IMachineType.java @@ -1,12 +1,9 @@ package binnie.core.machines; -import javax.annotation.Nullable; +import java.util.function.Supplier; import binnie.core.network.IOrdinaled; public interface IMachineType extends IOrdinaled { - @Nullable - Class getPackageClass(); - - boolean isActive(); + Supplier getSupplier(); } diff --git a/src/main/java/binnie/core/machines/IOwnable.java b/core/src/main/java/binnie/core/machines/IOwnable.java similarity index 100% rename from src/main/java/binnie/core/machines/IOwnable.java rename to core/src/main/java/binnie/core/machines/IOwnable.java diff --git a/src/main/java/binnie/core/machines/ItemMachine.java b/core/src/main/java/binnie/core/machines/ItemMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/ItemMachine.java rename to core/src/main/java/binnie/core/machines/ItemMachine.java diff --git a/src/main/java/binnie/core/machines/Machine.java b/core/src/main/java/binnie/core/machines/Machine.java similarity index 98% rename from src/main/java/binnie/core/machines/Machine.java rename to core/src/main/java/binnie/core/machines/Machine.java index f70c7705..f9ac8027 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/core/src/main/java/binnie/core/machines/Machine.java @@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import binnie.core.BinnieCore; import binnie.core.machines.component.IInteraction; import binnie.core.machines.component.IRender; import binnie.core.machines.network.INetwork; @@ -176,7 +175,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } public void onUpdate() { - if (BinnieCore.getBinnieProxy().isSimulating(this.getWorld())) { + if (!this.getWorld().isRemote) { for (final MachineComponent component : this.getComponents()) { component.onUpdate(); } diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/core/src/main/java/binnie/core/machines/MachineComponent.java similarity index 97% rename from src/main/java/binnie/core/machines/MachineComponent.java rename to core/src/main/java/binnie/core/machines/MachineComponent.java index dec01e07..6d08e4b2 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/core/src/main/java/binnie/core/machines/MachineComponent.java @@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import binnie.Binnie; +import binnie.core.Binnie; public class MachineComponent implements INbtReadable, INbtWritable { private IMachine machine; diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/core/src/main/java/binnie/core/machines/MachineGroup.java similarity index 82% rename from src/main/java/binnie/core/machines/MachineGroup.java rename to core/src/main/java/binnie/core/machines/MachineGroup.java index bfcb69ef..809e6aa4 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/core/src/main/java/binnie/core/machines/MachineGroup.java @@ -9,7 +9,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -41,17 +41,11 @@ public class MachineGroup { private void createPackages(IMachineType[] types) { for (IMachineType type : types) { - if (type.getPackageClass() != null) { - if (type.isActive()) { - try { - MachinePackage pack = type.getPackageClass().newInstance(); - pack.assignMetadata(type.ordinal()); - pack.setActive(type.isActive()); - this.addPackage(pack); - } catch (InstantiationException | IllegalAccessException e) { - throw new RuntimeException("Failed to create machine package " + type.toString(), e); - } - } + MachinePackage pack = type.getSupplier().get(); + if (pack != null) { + pack.assignMetadata(type.ordinal()); + pack.setActive(true); + this.addPackage(pack); } } } diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/core/src/main/java/binnie/core/machines/MachinePackage.java similarity index 100% rename from src/main/java/binnie/core/machines/MachinePackage.java rename to core/src/main/java/binnie/core/machines/MachinePackage.java diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/core/src/main/java/binnie/core/machines/MachineUtil.java similarity index 98% rename from src/main/java/binnie/core/machines/MachineUtil.java rename to core/src/main/java/binnie/core/machines/MachineUtil.java index 405974e6..7b5afe2a 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/core/src/main/java/binnie/core/machines/MachineUtil.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; -import binnie.core.BinnieCore; import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; @@ -218,6 +217,6 @@ public class MachineUtil { } public boolean isServer() { - return BinnieCore.getBinnieProxy().isSimulating(this.machine.getWorld()); + return !this.machine.getWorld().isRemote; } } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/core/src/main/java/binnie/core/machines/ManagerMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/ManagerMachine.java rename to core/src/main/java/binnie/core/machines/ManagerMachine.java diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/core/src/main/java/binnie/core/machines/TileEntityMachine.java similarity index 99% rename from src/main/java/binnie/core/machines/TileEntityMachine.java rename to core/src/main/java/binnie/core/machines/TileEntityMachine.java index 90535952..3abf998d 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/core/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -9,7 +9,7 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.machines.base.TileEntityMachineBase; import binnie.core.machines.component.IInteraction; import binnie.core.network.INetworkedEntity; diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/core/src/main/java/binnie/core/machines/base/DefaultInventory.java similarity index 100% rename from src/main/java/binnie/core/machines/base/DefaultInventory.java rename to core/src/main/java/binnie/core/machines/base/DefaultInventory.java diff --git a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java b/core/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java similarity index 100% rename from src/main/java/binnie/core/machines/base/DefaultMachineInventory.java rename to core/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java diff --git a/src/main/java/binnie/core/machines/base/DefaultPower.java b/core/src/main/java/binnie/core/machines/base/DefaultPower.java similarity index 100% rename from src/main/java/binnie/core/machines/base/DefaultPower.java rename to core/src/main/java/binnie/core/machines/base/DefaultPower.java diff --git a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java b/core/src/main/java/binnie/core/machines/base/DefaultTankContainer.java similarity index 100% rename from src/main/java/binnie/core/machines/base/DefaultTankContainer.java rename to core/src/main/java/binnie/core/machines/base/DefaultTankContainer.java diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/core/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java similarity index 100% rename from src/main/java/binnie/core/machines/base/TileEntityMachineBase.java rename to core/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java diff --git a/src/main/java/binnie/core/machines/base/package-info.java b/core/src/main/java/binnie/core/machines/base/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/base/package-info.java rename to core/src/main/java/binnie/core/machines/base/package-info.java diff --git a/src/main/java/binnie/core/machines/component/ComponentRecipe.java b/core/src/main/java/binnie/core/machines/component/ComponentRecipe.java similarity index 100% rename from src/main/java/binnie/core/machines/component/ComponentRecipe.java rename to core/src/main/java/binnie/core/machines/component/ComponentRecipe.java diff --git a/src/main/java/binnie/core/machines/component/IBuildcraft.java b/core/src/main/java/binnie/core/machines/component/IBuildcraft.java similarity index 100% rename from src/main/java/binnie/core/machines/component/IBuildcraft.java rename to core/src/main/java/binnie/core/machines/component/IBuildcraft.java diff --git a/src/main/java/binnie/core/machines/component/IComponentRecipe.java b/core/src/main/java/binnie/core/machines/component/IComponentRecipe.java similarity index 100% rename from src/main/java/binnie/core/machines/component/IComponentRecipe.java rename to core/src/main/java/binnie/core/machines/component/IComponentRecipe.java diff --git a/src/main/java/binnie/core/machines/component/IInteraction.java b/core/src/main/java/binnie/core/machines/component/IInteraction.java similarity index 100% rename from src/main/java/binnie/core/machines/component/IInteraction.java rename to core/src/main/java/binnie/core/machines/component/IInteraction.java diff --git a/src/main/java/binnie/core/machines/component/IRender.java b/core/src/main/java/binnie/core/machines/component/IRender.java similarity index 100% rename from src/main/java/binnie/core/machines/component/IRender.java rename to core/src/main/java/binnie/core/machines/component/IRender.java diff --git a/src/main/java/binnie/core/machines/component/package-info.java b/core/src/main/java/binnie/core/machines/component/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/component/package-info.java rename to core/src/main/java/binnie/core/machines/component/package-info.java diff --git a/src/main/java/binnie/core/machines/errors/CoreErrorCode.java b/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java similarity index 98% rename from src/main/java/binnie/core/machines/errors/CoreErrorCode.java rename to core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java index e93f4022..cf6b112c 100644 --- a/src/main/java/binnie/core/machines/errors/CoreErrorCode.java +++ b/core/src/main/java/binnie/core/machines/errors/CoreErrorCode.java @@ -2,7 +2,7 @@ package binnie.core.machines.errors; import javax.annotation.Nullable; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.I18N; public enum CoreErrorCode implements IErrorStateDefinition { diff --git a/src/main/java/binnie/core/machines/errors/EnumErrorType.java b/core/src/main/java/binnie/core/machines/errors/EnumErrorType.java similarity index 100% rename from src/main/java/binnie/core/machines/errors/EnumErrorType.java rename to core/src/main/java/binnie/core/machines/errors/EnumErrorType.java diff --git a/src/main/java/binnie/core/machines/errors/ErrorState.java b/core/src/main/java/binnie/core/machines/errors/ErrorState.java similarity index 100% rename from src/main/java/binnie/core/machines/errors/ErrorState.java rename to core/src/main/java/binnie/core/machines/errors/ErrorState.java diff --git a/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java b/core/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java similarity index 100% rename from src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java rename to core/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java diff --git a/src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java b/core/src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java similarity index 100% rename from src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java rename to core/src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java diff --git a/src/main/java/binnie/core/machines/errors/IErrorStateSource.java b/core/src/main/java/binnie/core/machines/errors/IErrorStateSource.java similarity index 100% rename from src/main/java/binnie/core/machines/errors/IErrorStateSource.java rename to core/src/main/java/binnie/core/machines/errors/IErrorStateSource.java diff --git a/src/main/java/binnie/core/machines/inventory/AccessDirection.java b/core/src/main/java/binnie/core/machines/inventory/AccessDirection.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/AccessDirection.java rename to core/src/main/java/binnie/core/machines/inventory/AccessDirection.java diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/core/src/main/java/binnie/core/machines/inventory/BaseSlot.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/BaseSlot.java rename to core/src/main/java/binnie/core/machines/inventory/BaseSlot.java diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java rename to core/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java b/core/src/main/java/binnie/core/machines/inventory/ComponentInventory.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/ComponentInventory.java rename to core/src/main/java/binnie/core/machines/inventory/ComponentInventory.java diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java rename to core/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java rename to core/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java rename to core/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java diff --git a/src/main/java/binnie/core/machines/inventory/IChargedSlots.java b/core/src/main/java/binnie/core/machines/inventory/IChargedSlots.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/IChargedSlots.java rename to core/src/main/java/binnie/core/machines/inventory/IChargedSlots.java diff --git a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java b/core/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/IInventoryMachine.java rename to core/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java diff --git a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java b/core/src/main/java/binnie/core/machines/inventory/IInventorySlots.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/IInventorySlots.java rename to core/src/main/java/binnie/core/machines/inventory/IInventorySlots.java diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java b/core/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java rename to core/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/core/src/main/java/binnie/core/machines/inventory/InventorySlot.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/InventorySlot.java rename to core/src/main/java/binnie/core/machines/inventory/InventorySlot.java diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/core/src/main/java/binnie/core/machines/inventory/MachineSide.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/MachineSide.java rename to core/src/main/java/binnie/core/machines/inventory/MachineSide.java diff --git a/src/main/java/binnie/core/machines/inventory/SetList.java b/core/src/main/java/binnie/core/machines/inventory/SetList.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/SetList.java rename to core/src/main/java/binnie/core/machines/inventory/SetList.java diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/core/src/main/java/binnie/core/machines/inventory/SidedAccess.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/SidedAccess.java rename to core/src/main/java/binnie/core/machines/inventory/SidedAccess.java diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/core/src/main/java/binnie/core/machines/inventory/SlotValidator.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/SlotValidator.java rename to core/src/main/java/binnie/core/machines/inventory/SlotValidator.java diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/core/src/main/java/binnie/core/machines/inventory/TankSlot.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/TankSlot.java rename to core/src/main/java/binnie/core/machines/inventory/TankSlot.java diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/core/src/main/java/binnie/core/machines/inventory/TankValidator.java similarity index 96% rename from src/main/java/binnie/core/machines/inventory/TankValidator.java rename to core/src/main/java/binnie/core/machines/inventory/TankValidator.java index 240823ec..12f5573d 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/core/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -3,7 +3,7 @@ package binnie.core.machines.inventory; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; +import binnie.core.Binnie; public abstract class TankValidator extends Validator { @Override diff --git a/src/main/java/binnie/core/machines/inventory/Validator.java b/core/src/main/java/binnie/core/machines/inventory/Validator.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/Validator.java rename to core/src/main/java/binnie/core/machines/inventory/Validator.java diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java similarity index 96% rename from src/main/java/binnie/core/machines/inventory/ValidatorSprite.java rename to core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java index 4528c371..e8b07255 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java +++ b/core/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -3,7 +3,7 @@ package binnie.core.machines.inventory; import java.util.ArrayList; import java.util.List; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.AbstractMod; import binnie.core.resource.BinnieSprite; diff --git a/src/main/java/binnie/core/machines/inventory/package-info.java b/core/src/main/java/binnie/core/machines/inventory/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/inventory/package-info.java rename to core/src/main/java/binnie/core/machines/inventory/package-info.java diff --git a/src/main/java/binnie/core/machines/network/INetwork.java b/core/src/main/java/binnie/core/machines/network/INetwork.java similarity index 100% rename from src/main/java/binnie/core/machines/network/INetwork.java rename to core/src/main/java/binnie/core/machines/network/INetwork.java diff --git a/src/main/java/binnie/core/machines/network/package-info.java b/core/src/main/java/binnie/core/machines/network/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/network/package-info.java rename to core/src/main/java/binnie/core/machines/network/package-info.java diff --git a/src/main/java/binnie/core/machines/package-info.java b/core/src/main/java/binnie/core/machines/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/package-info.java rename to core/src/main/java/binnie/core/machines/package-info.java diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java rename to core/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java diff --git a/src/main/java/binnie/core/machines/power/ComponentProcess.java b/core/src/main/java/binnie/core/machines/power/ComponentProcess.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ComponentProcess.java rename to core/src/main/java/binnie/core/machines/power/ComponentProcess.java diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java rename to core/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java b/core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java rename to core/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java diff --git a/src/main/java/binnie/core/machines/power/IPoweredMachine.java b/core/src/main/java/binnie/core/machines/power/IPoweredMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/power/IPoweredMachine.java rename to core/src/main/java/binnie/core/machines/power/IPoweredMachine.java diff --git a/src/main/java/binnie/core/machines/power/IProcess.java b/core/src/main/java/binnie/core/machines/power/IProcess.java similarity index 100% rename from src/main/java/binnie/core/machines/power/IProcess.java rename to core/src/main/java/binnie/core/machines/power/IProcess.java diff --git a/src/main/java/binnie/core/machines/power/IProcessTimed.java b/core/src/main/java/binnie/core/machines/power/IProcessTimed.java similarity index 100% rename from src/main/java/binnie/core/machines/power/IProcessTimed.java rename to core/src/main/java/binnie/core/machines/power/IProcessTimed.java diff --git a/src/main/java/binnie/core/machines/power/ITankMachine.java b/core/src/main/java/binnie/core/machines/power/ITankMachine.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ITankMachine.java rename to core/src/main/java/binnie/core/machines/power/ITankMachine.java diff --git a/src/main/java/binnie/core/machines/power/PowerInfo.java b/core/src/main/java/binnie/core/machines/power/PowerInfo.java similarity index 100% rename from src/main/java/binnie/core/machines/power/PowerInfo.java rename to core/src/main/java/binnie/core/machines/power/PowerInfo.java diff --git a/src/main/java/binnie/core/machines/power/PowerInterface.java b/core/src/main/java/binnie/core/machines/power/PowerInterface.java similarity index 100% rename from src/main/java/binnie/core/machines/power/PowerInterface.java rename to core/src/main/java/binnie/core/machines/power/PowerInterface.java diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/core/src/main/java/binnie/core/machines/power/PowerSystem.java similarity index 100% rename from src/main/java/binnie/core/machines/power/PowerSystem.java rename to core/src/main/java/binnie/core/machines/power/PowerSystem.java diff --git a/src/main/java/binnie/core/machines/power/ProcessInfo.java b/core/src/main/java/binnie/core/machines/power/ProcessInfo.java similarity index 100% rename from src/main/java/binnie/core/machines/power/ProcessInfo.java rename to core/src/main/java/binnie/core/machines/power/ProcessInfo.java diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/core/src/main/java/binnie/core/machines/power/TankInfo.java similarity index 100% rename from src/main/java/binnie/core/machines/power/TankInfo.java rename to core/src/main/java/binnie/core/machines/power/TankInfo.java diff --git a/src/main/java/binnie/core/machines/power/package-info.java b/core/src/main/java/binnie/core/machines/power/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/power/package-info.java rename to core/src/main/java/binnie/core/machines/power/package-info.java diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/core/src/main/java/binnie/core/machines/storage/Compartment.java similarity index 58% rename from src/main/java/binnie/core/machines/storage/Compartment.java rename to core/src/main/java/binnie/core/machines/storage/Compartment.java index 0307650f..029d7cf2 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/core/src/main/java/binnie/core/machines/storage/Compartment.java @@ -1,5 +1,7 @@ package binnie.core.machines.storage; +import java.util.function.Supplier; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -9,27 +11,22 @@ import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; enum Compartment implements IMachineType { - Compartment(StandardCompartment.PackageCompartment.class), - CompartmentCopper(StandardCompartment.PackageCompartmentCopper.class), - CompartmentBronze(StandardCompartment.PackageCompartmentBronze.class), - CompartmentIron(StandardCompartment.PackageCompartmentIron.class), - CompartmentGold(StandardCompartment.PackageCompartmentGold.class), - CompartmentDiamond(StandardCompartment.PackageCompartmentDiamond.class); + Compartment(StandardCompartment.PackageCompartment::new), + CompartmentCopper(StandardCompartment.PackageCompartmentCopper::new), + CompartmentBronze(StandardCompartment.PackageCompartmentBronze::new), + CompartmentIron(StandardCompartment.PackageCompartmentIron::new), + CompartmentGold(StandardCompartment.PackageCompartmentGold::new), + CompartmentDiamond(StandardCompartment.PackageCompartmentDiamond::new); - Class clss; + private final Supplier supplier; - Compartment(final Class clss) { - this.clss = clss; + Compartment(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - return true; + public Supplier getSupplier() { + return supplier; } public ItemStack get(final int i) { diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/core/src/main/java/binnie/core/machines/storage/CompartmentTab.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/CompartmentTab.java rename to core/src/main/java/binnie/core/machines/storage/CompartmentTab.java diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java rename to core/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java rename to core/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/ControlColourSelector.java rename to core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/core/src/main/java/binnie/core/machines/storage/ModuleStorage.java similarity index 98% rename from src/main/java/binnie/core/machines/storage/ModuleStorage.java rename to core/src/main/java/binnie/core/machines/storage/ModuleStorage.java index f2e89cd3..33b3ba83 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/core/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -1,6 +1,6 @@ package binnie.core.machines.storage; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.RecipeUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/core/src/main/java/binnie/core/machines/storage/StandardCompartment.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/StandardCompartment.java rename to core/src/main/java/binnie/core/machines/storage/StandardCompartment.java diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java similarity index 99% rename from src/main/java/binnie/core/machines/storage/WindowCompartment.java rename to core/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 2309ec6e..f76fa017 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import binnie.core.gui.window.WindowMachine; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -60,7 +61,6 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.gui.window.Panel; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; -import binnie.genetics.machine.craftgui.WindowMachine; public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { private final Map panels; diff --git a/src/main/java/binnie/core/machines/storage/package-info.java b/core/src/main/java/binnie/core/machines/storage/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/storage/package-info.java rename to core/src/main/java/binnie/core/machines/storage/package-info.java diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/core/src/main/java/binnie/core/machines/transfer/TransferRequest.java similarity index 100% rename from src/main/java/binnie/core/machines/transfer/TransferRequest.java rename to core/src/main/java/binnie/core/machines/transfer/TransferRequest.java diff --git a/src/main/java/binnie/core/machines/transfer/package-info.java b/core/src/main/java/binnie/core/machines/transfer/package-info.java similarity index 100% rename from src/main/java/binnie/core/machines/transfer/package-info.java rename to core/src/main/java/binnie/core/machines/transfer/package-info.java diff --git a/src/main/java/binnie/core/models/AABBModelBaker.java b/core/src/main/java/binnie/core/models/AABBModelBaker.java similarity index 100% rename from src/main/java/binnie/core/models/AABBModelBaker.java rename to core/src/main/java/binnie/core/models/AABBModelBaker.java diff --git a/src/main/java/binnie/core/models/DefaultStateMapper.java b/core/src/main/java/binnie/core/models/DefaultStateMapper.java similarity index 100% rename from src/main/java/binnie/core/models/DefaultStateMapper.java rename to core/src/main/java/binnie/core/models/DefaultStateMapper.java diff --git a/src/main/java/binnie/core/models/DoublePassBakedModel.java b/core/src/main/java/binnie/core/models/DoublePassBakedModel.java similarity index 100% rename from src/main/java/binnie/core/models/DoublePassBakedModel.java rename to core/src/main/java/binnie/core/models/DoublePassBakedModel.java diff --git a/src/main/java/binnie/core/models/ModelManager.java b/core/src/main/java/binnie/core/models/ModelManager.java similarity index 100% rename from src/main/java/binnie/core/models/ModelManager.java rename to core/src/main/java/binnie/core/models/ModelManager.java diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/core/src/main/java/binnie/core/models/ModelMutlipass.java similarity index 100% rename from src/main/java/binnie/core/models/ModelMutlipass.java rename to core/src/main/java/binnie/core/models/ModelMutlipass.java diff --git a/src/main/java/binnie/core/models/package-info.java b/core/src/main/java/binnie/core/models/package-info.java similarity index 100% rename from src/main/java/binnie/core/models/package-info.java rename to core/src/main/java/binnie/core/models/package-info.java diff --git a/src/main/java/binnie/modules/BinnieModule.java b/core/src/main/java/binnie/core/modules/BinnieModule.java similarity index 96% rename from src/main/java/binnie/modules/BinnieModule.java rename to core/src/main/java/binnie/core/modules/BinnieModule.java index 334c7722..cacec4ef 100644 --- a/src/main/java/binnie/modules/BinnieModule.java +++ b/core/src/main/java/binnie/core/modules/BinnieModule.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/binnie/modules/BlankModuleContainer.java b/core/src/main/java/binnie/core/modules/BlankModuleContainer.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/binnie/modules/BlankModuleContainer.java rename to core/src/main/java/binnie/core/modules/BlankModuleContainer.java index e40fdb7e..5bfa6025 --- a/src/main/java/binnie/modules/BlankModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/BlankModuleContainer.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -11,7 +11,7 @@ public abstract class BlankModuleContainer extends AbstractMod { public BlankModuleContainer() { super(); - this.container = new ModuleContainer(getModID(), () -> isAvailable()); + this.container = new ModuleContainer(getModID(), this::isAvailable); ModuleManager.register(container); } diff --git a/src/main/java/binnie/botany/modules/BotanyModuleUIDs.java b/core/src/main/java/binnie/core/modules/BotanyModuleUIDs.java similarity index 81% rename from src/main/java/binnie/botany/modules/BotanyModuleUIDs.java rename to core/src/main/java/binnie/core/modules/BotanyModuleUIDs.java index d995a49f..2a16bf08 100644 --- a/src/main/java/binnie/botany/modules/BotanyModuleUIDs.java +++ b/core/src/main/java/binnie/core/modules/BotanyModuleUIDs.java @@ -1,4 +1,4 @@ -package binnie.botany.modules; +package binnie.core.modules; public class BotanyModuleUIDs { public static final String CORE = "botany.core"; @@ -7,5 +7,5 @@ public class BotanyModuleUIDs { public static final String DATABASE = "botany.database"; public static final String GARDENING = "botany.gardening"; public static final String FLOWERS = "botany.flowers"; - + public static final String MACHINES = "botany.machines"; } diff --git a/src/main/java/binnie/modules/IModuleContainer.java b/core/src/main/java/binnie/core/modules/IModuleContainer.java similarity index 95% rename from src/main/java/binnie/modules/IModuleContainer.java rename to core/src/main/java/binnie/core/modules/IModuleContainer.java index 83e59d31..8b97c06f 100644 --- a/src/main/java/binnie/modules/IModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/IModuleContainer.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import java.io.File; import java.util.Set; diff --git a/src/main/java/binnie/modules/Log.java b/core/src/main/java/binnie/core/modules/Log.java similarity index 92% rename from src/main/java/binnie/modules/Log.java rename to core/src/main/java/binnie/core/modules/Log.java index f95d0852..00fcbd17 100644 --- a/src/main/java/binnie/modules/Log.java +++ b/core/src/main/java/binnie/core/modules/Log.java @@ -1,9 +1,9 @@ -package binnie.modules; +package binnie.core.modules; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import binnie.Constants; +import binnie.core.Constants; public class Log { public static void trace(String message, Object... params) { diff --git a/src/main/java/binnie/modules/Module.java b/core/src/main/java/binnie/core/modules/Module.java similarity index 94% rename from src/main/java/binnie/modules/Module.java rename to core/src/main/java/binnie/core/modules/Module.java index 676ce2fd..6d7b5ebf 100644 --- a/src/main/java/binnie/modules/Module.java +++ b/core/src/main/java/binnie/core/modules/Module.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/binnie/modules/ModuleContainer.java b/core/src/main/java/binnie/core/modules/ModuleContainer.java similarity index 97% rename from src/main/java/binnie/modules/ModuleContainer.java rename to core/src/main/java/binnie/core/modules/ModuleContainer.java index 44c81a7a..ca7aae39 100644 --- a/src/main/java/binnie/modules/ModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/ModuleContainer.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import java.io.File; import java.util.LinkedHashSet; @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import binnie.Constants; +import binnie.core.Constants; public class ModuleContainer implements IModuleContainer { diff --git a/src/main/java/binnie/modules/ModuleHelper.java b/core/src/main/java/binnie/core/modules/ModuleHelper.java similarity index 97% rename from src/main/java/binnie/modules/ModuleHelper.java rename to core/src/main/java/binnie/core/modules/ModuleHelper.java index 25c2d9f2..d9f68cbe 100644 --- a/src/main/java/binnie/modules/ModuleHelper.java +++ b/core/src/main/java/binnie/core/modules/ModuleHelper.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/java/binnie/modules/ModuleManager.java b/core/src/main/java/binnie/core/modules/ModuleManager.java similarity index 99% rename from src/main/java/binnie/modules/ModuleManager.java rename to core/src/main/java/binnie/core/modules/ModuleManager.java index d6c73244..83f57c81 100644 --- a/src/main/java/binnie/modules/ModuleManager.java +++ b/core/src/main/java/binnie/core/modules/ModuleManager.java @@ -1,4 +1,4 @@ -package binnie.modules; +package binnie.core.modules; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/binnie/core/mod/config/package-info.java b/core/src/main/java/binnie/core/modules/package-info.java similarity index 88% rename from src/main/java/binnie/core/mod/config/package-info.java rename to core/src/main/java/binnie/core/modules/package-info.java index 25b26b17..4b750960 100644 --- a/src/main/java/binnie/core/mod/config/package-info.java +++ b/core/src/main/java/binnie/core/modules/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.mod.config; +package binnie.core.modules; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java similarity index 98% rename from src/main/java/binnie/core/network/BinnieCorePacketID.java rename to core/src/main/java/binnie/core/network/BinnieCorePacketID.java index 9b519edf..8585dcf0 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import binnie.core.BinnieCore; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.gui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/core/src/main/java/binnie/core/network/BinniePacketHandler.java similarity index 98% rename from src/main/java/binnie/core/network/BinniePacketHandler.java rename to core/src/main/java/binnie/core/network/BinniePacketHandler.java index 14df0b6a..75b82903 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/core/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.AbstractMod; import binnie.core.network.packet.MessageBinnie; diff --git a/src/main/java/binnie/core/network/INetworkedEntity.java b/core/src/main/java/binnie/core/network/INetworkedEntity.java similarity index 100% rename from src/main/java/binnie/core/network/INetworkedEntity.java rename to core/src/main/java/binnie/core/network/INetworkedEntity.java diff --git a/src/main/java/binnie/core/network/IOrdinaled.java b/core/src/main/java/binnie/core/network/IOrdinaled.java similarity index 100% rename from src/main/java/binnie/core/network/IOrdinaled.java rename to core/src/main/java/binnie/core/network/IOrdinaled.java diff --git a/src/main/java/binnie/core/network/IPacketID.java b/core/src/main/java/binnie/core/network/IPacketID.java similarity index 100% rename from src/main/java/binnie/core/network/IPacketID.java rename to core/src/main/java/binnie/core/network/IPacketID.java diff --git a/src/main/java/binnie/core/network/IPacketProvider.java b/core/src/main/java/binnie/core/network/IPacketProvider.java similarity index 100% rename from src/main/java/binnie/core/network/IPacketProvider.java rename to core/src/main/java/binnie/core/network/IPacketProvider.java diff --git a/src/main/java/binnie/core/network/package-info.java b/core/src/main/java/binnie/core/network/package-info.java similarity index 100% rename from src/main/java/binnie/core/network/package-info.java rename to core/src/main/java/binnie/core/network/package-info.java diff --git a/src/main/java/binnie/core/network/packet/MessageBase.java b/core/src/main/java/binnie/core/network/packet/MessageBase.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageBase.java rename to core/src/main/java/binnie/core/network/packet/MessageBase.java diff --git a/src/main/java/binnie/core/network/packet/MessageBinnie.java b/core/src/main/java/binnie/core/network/packet/MessageBinnie.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageBinnie.java rename to core/src/main/java/binnie/core/network/packet/MessageBinnie.java diff --git a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java b/core/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageContainerUpdate.java rename to core/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/core/src/main/java/binnie/core/network/packet/MessageCoordinates.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageCoordinates.java rename to core/src/main/java/binnie/core/network/packet/MessageCoordinates.java diff --git a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java b/core/src/main/java/binnie/core/network/packet/MessageCraftGUI.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageCraftGUI.java rename to core/src/main/java/binnie/core/network/packet/MessageCraftGUI.java diff --git a/src/main/java/binnie/core/network/packet/MessageMetadata.java b/core/src/main/java/binnie/core/network/packet/MessageMetadata.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageMetadata.java rename to core/src/main/java/binnie/core/network/packet/MessageMetadata.java diff --git a/src/main/java/binnie/core/network/packet/MessageNBT.java b/core/src/main/java/binnie/core/network/packet/MessageNBT.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageNBT.java rename to core/src/main/java/binnie/core/network/packet/MessageNBT.java diff --git a/src/main/java/binnie/core/network/packet/MessageSyncTile.java b/core/src/main/java/binnie/core/network/packet/MessageSyncTile.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageSyncTile.java rename to core/src/main/java/binnie/core/network/packet/MessageSyncTile.java diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/core/src/main/java/binnie/core/network/packet/MessageUpdate.java similarity index 100% rename from src/main/java/binnie/core/network/packet/MessageUpdate.java rename to core/src/main/java/binnie/core/network/packet/MessageUpdate.java diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/core/src/main/java/binnie/core/network/packet/PacketPayload.java similarity index 100% rename from src/main/java/binnie/core/network/packet/PacketPayload.java rename to core/src/main/java/binnie/core/network/packet/PacketPayload.java diff --git a/src/main/java/binnie/core/network/packet/package-info.java b/core/src/main/java/binnie/core/network/packet/package-info.java similarity index 100% rename from src/main/java/binnie/core/network/packet/package-info.java rename to core/src/main/java/binnie/core/network/packet/package-info.java diff --git a/src/main/java/binnie/core/package-info.java b/core/src/main/java/binnie/core/package-info.java similarity index 100% rename from src/main/java/binnie/core/package-info.java rename to core/src/main/java/binnie/core/package-info.java diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/core/src/main/java/binnie/core/proxy/BinnieModProxy.java similarity index 100% rename from src/main/java/binnie/core/proxy/BinnieModProxy.java rename to core/src/main/java/binnie/core/proxy/BinnieModProxy.java diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/core/src/main/java/binnie/core/proxy/BinnieProxy.java similarity index 97% rename from src/main/java/binnie/core/proxy/BinnieProxy.java rename to core/src/main/java/binnie/core/proxy/BinnieProxy.java index 9e7b0f91..b44ca005 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/core/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -54,11 +54,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { player.openGui(mod.getMod(), id, player.world, pos.getX(), pos.getY(), pos.getZ()); } - @Override - public boolean isSimulating(final World world) { - return true; - } - public TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location) { throw new UnsupportedOperationException("Cannot call getTextureAtlasSprite on server side"); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java similarity index 97% rename from src/main/java/binnie/core/proxy/BinnieProxyClient.java rename to core/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 39a8e657..6b15c17f 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/core/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.gui.resource.minecraft.CraftGUIResourceManager; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; @@ -97,11 +97,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return true; } - @Override - public boolean isSimulating(final World world) { - return !world.isRemote; - } - @Override public World getWorld() { return this.getMinecraftInstance().world; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyServer.java b/core/src/main/java/binnie/core/proxy/BinnieProxyServer.java similarity index 100% rename from src/main/java/binnie/core/proxy/BinnieProxyServer.java rename to core/src/main/java/binnie/core/proxy/BinnieProxyServer.java diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/core/src/main/java/binnie/core/proxy/IBinnieModProxy.java similarity index 100% rename from src/main/java/binnie/core/proxy/IBinnieModProxy.java rename to core/src/main/java/binnie/core/proxy/IBinnieModProxy.java diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/core/src/main/java/binnie/core/proxy/IBinnieProxy.java similarity index 69% rename from src/main/java/binnie/core/proxy/IBinnieProxy.java rename to core/src/main/java/binnie/core/proxy/IBinnieProxy.java index 6c03a98d..bca5602d 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/core/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -31,8 +31,6 @@ public interface IBinnieProxy extends IProxyCore { void openGui(final AbstractMod p0, final int p1, final EntityPlayer p2, final BlockPos pos); - boolean isSimulating(final World p0); - World getWorld(); //EntityPlayer getPlayer(); @@ -52,24 +50,4 @@ public interface IBinnieProxy extends IProxyCore { boolean isDebug(); void registerBlockRenderer(final Object p0); - - //String localise(final String string); - - //void sendToPlayer(final MessageBase packet, final EntityPlayer entityplayer); - - //void sendToServer(final MessageBase packet); - - //void sendNetworkEntityPacket(final INetworkedEntity entity); - - //TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location); - - //void reloadSprites(); - - //void registerSprite(ResourceLocation location); - - //short getUniqueTextureUID(); - - //boolean checkTexture(final BinnieResource location); - - //IIcon getIcon(final IIconRegister p0, final String p1, final String p2); } diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/core/src/main/java/binnie/core/proxy/IProxyCore.java similarity index 100% rename from src/main/java/binnie/core/proxy/IProxyCore.java rename to core/src/main/java/binnie/core/proxy/IProxyCore.java diff --git a/src/main/java/binnie/core/proxy/package-info.java b/core/src/main/java/binnie/core/proxy/package-info.java similarity index 100% rename from src/main/java/binnie/core/proxy/package-info.java rename to core/src/main/java/binnie/core/proxy/package-info.java diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/core/src/main/java/binnie/core/resource/BinnieResource.java similarity index 100% rename from src/main/java/binnie/core/resource/BinnieResource.java rename to core/src/main/java/binnie/core/resource/BinnieResource.java diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/core/src/main/java/binnie/core/resource/BinnieSprite.java similarity index 97% rename from src/main/java/binnie/core/resource/BinnieSprite.java rename to core/src/main/java/binnie/core/resource/BinnieSprite.java index 25ec7741..ff704803 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/core/src/main/java/binnie/core/resource/BinnieSprite.java @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.AbstractMod; public class BinnieSprite extends BinnieResource { diff --git a/src/main/java/binnie/core/resource/IBinnieTexture.java b/core/src/main/java/binnie/core/resource/IBinnieTexture.java similarity index 100% rename from src/main/java/binnie/core/resource/IBinnieTexture.java rename to core/src/main/java/binnie/core/resource/IBinnieTexture.java diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/core/src/main/java/binnie/core/resource/ManagerResource.java similarity index 100% rename from src/main/java/binnie/core/resource/ManagerResource.java rename to core/src/main/java/binnie/core/resource/ManagerResource.java diff --git a/src/main/java/binnie/core/resource/ResourceType.java b/core/src/main/java/binnie/core/resource/ResourceType.java similarity index 100% rename from src/main/java/binnie/core/resource/ResourceType.java rename to core/src/main/java/binnie/core/resource/ResourceType.java diff --git a/src/main/java/binnie/core/resource/package-info.java b/core/src/main/java/binnie/core/resource/package-info.java similarity index 100% rename from src/main/java/binnie/core/resource/package-info.java rename to core/src/main/java/binnie/core/resource/package-info.java diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java similarity index 97% rename from src/main/java/binnie/core/texture/BinnieCoreTexture.java rename to core/src/main/java/binnie/core/texture/BinnieCoreTexture.java index cba78810..b7d07dde 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/core/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/core/texture/package-info.java b/core/src/main/java/binnie/core/texture/package-info.java similarity index 100% rename from src/main/java/binnie/core/texture/package-info.java rename to core/src/main/java/binnie/core/texture/package-info.java diff --git a/src/main/java/binnie/core/triggers/ActionProvider.java b/core/src/main/java/binnie/core/triggers/ActionProvider.java similarity index 100% rename from src/main/java/binnie/core/triggers/ActionProvider.java rename to core/src/main/java/binnie/core/triggers/ActionProvider.java diff --git a/src/main/java/binnie/core/triggers/BinnieAction.java b/core/src/main/java/binnie/core/triggers/BinnieAction.java similarity index 100% rename from src/main/java/binnie/core/triggers/BinnieAction.java rename to core/src/main/java/binnie/core/triggers/BinnieAction.java diff --git a/src/main/java/binnie/core/triggers/BinnieTrigger.java b/core/src/main/java/binnie/core/triggers/BinnieTrigger.java similarity index 100% rename from src/main/java/binnie/core/triggers/BinnieTrigger.java rename to core/src/main/java/binnie/core/triggers/BinnieTrigger.java diff --git a/src/main/java/binnie/core/triggers/ModuleTrigger.java b/core/src/main/java/binnie/core/triggers/ModuleTrigger.java similarity index 100% rename from src/main/java/binnie/core/triggers/ModuleTrigger.java rename to core/src/main/java/binnie/core/triggers/ModuleTrigger.java diff --git a/src/main/java/binnie/core/triggers/TriggerData.java b/core/src/main/java/binnie/core/triggers/TriggerData.java similarity index 100% rename from src/main/java/binnie/core/triggers/TriggerData.java rename to core/src/main/java/binnie/core/triggers/TriggerData.java diff --git a/src/main/java/binnie/core/triggers/TriggerInventory.java b/core/src/main/java/binnie/core/triggers/TriggerInventory.java similarity index 100% rename from src/main/java/binnie/core/triggers/TriggerInventory.java rename to core/src/main/java/binnie/core/triggers/TriggerInventory.java diff --git a/src/main/java/binnie/core/triggers/TriggerPower.java b/core/src/main/java/binnie/core/triggers/TriggerPower.java similarity index 100% rename from src/main/java/binnie/core/triggers/TriggerPower.java rename to core/src/main/java/binnie/core/triggers/TriggerPower.java diff --git a/src/main/java/binnie/core/triggers/TriggerProvider.java b/core/src/main/java/binnie/core/triggers/TriggerProvider.java similarity index 100% rename from src/main/java/binnie/core/triggers/TriggerProvider.java rename to core/src/main/java/binnie/core/triggers/TriggerProvider.java diff --git a/src/main/java/binnie/core/triggers/TriggerWorking.java b/core/src/main/java/binnie/core/triggers/TriggerWorking.java similarity index 100% rename from src/main/java/binnie/core/triggers/TriggerWorking.java rename to core/src/main/java/binnie/core/triggers/TriggerWorking.java diff --git a/src/main/java/binnie/core/triggers/package-info.java b/core/src/main/java/binnie/core/triggers/package-info.java similarity index 100% rename from src/main/java/binnie/core/triggers/package-info.java rename to core/src/main/java/binnie/core/triggers/package-info.java diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/core/src/main/java/binnie/core/util/FakeCraftingWorld.java similarity index 100% rename from src/main/java/binnie/core/util/FakeCraftingWorld.java rename to core/src/main/java/binnie/core/util/FakeCraftingWorld.java diff --git a/src/main/java/binnie/core/util/FakeMapStorage.java b/core/src/main/java/binnie/core/util/FakeMapStorage.java similarity index 100% rename from src/main/java/binnie/core/util/FakeMapStorage.java rename to core/src/main/java/binnie/core/util/FakeMapStorage.java diff --git a/src/main/java/binnie/core/util/FakeSaveHandler.java b/core/src/main/java/binnie/core/util/FakeSaveHandler.java similarity index 100% rename from src/main/java/binnie/core/util/FakeSaveHandler.java rename to core/src/main/java/binnie/core/util/FakeSaveHandler.java diff --git a/src/main/java/binnie/core/util/FieldsAreNonnullByDefault.java b/core/src/main/java/binnie/core/util/FieldsAreNonnullByDefault.java similarity index 100% rename from src/main/java/binnie/core/util/FieldsAreNonnullByDefault.java rename to core/src/main/java/binnie/core/util/FieldsAreNonnullByDefault.java diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/core/src/main/java/binnie/core/util/FluidStackSet.java similarity index 100% rename from src/main/java/binnie/core/util/FluidStackSet.java rename to core/src/main/java/binnie/core/util/FluidStackSet.java diff --git a/src/main/java/binnie/core/util/FluidStackUtil.java b/core/src/main/java/binnie/core/util/FluidStackUtil.java similarity index 100% rename from src/main/java/binnie/core/util/FluidStackUtil.java rename to core/src/main/java/binnie/core/util/FluidStackUtil.java diff --git a/src/main/java/binnie/core/util/I18N.java b/core/src/main/java/binnie/core/util/I18N.java similarity index 100% rename from src/main/java/binnie/core/util/I18N.java rename to core/src/main/java/binnie/core/util/I18N.java diff --git a/src/main/java/binnie/core/util/IValidator.java b/core/src/main/java/binnie/core/util/IValidator.java similarity index 100% rename from src/main/java/binnie/core/util/IValidator.java rename to core/src/main/java/binnie/core/util/IValidator.java diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/core/src/main/java/binnie/core/util/ItemStackSet.java similarity index 100% rename from src/main/java/binnie/core/util/ItemStackSet.java rename to core/src/main/java/binnie/core/util/ItemStackSet.java diff --git a/src/main/java/binnie/core/util/ItemStackUtil.java b/core/src/main/java/binnie/core/util/ItemStackUtil.java similarity index 100% rename from src/main/java/binnie/core/util/ItemStackUtil.java rename to core/src/main/java/binnie/core/util/ItemStackUtil.java diff --git a/src/main/java/binnie/core/util/OreDictionaryUtil.java b/core/src/main/java/binnie/core/util/OreDictionaryUtil.java similarity index 100% rename from src/main/java/binnie/core/util/OreDictionaryUtil.java rename to core/src/main/java/binnie/core/util/OreDictionaryUtil.java diff --git a/src/main/java/binnie/core/util/RecipeUtil.java b/core/src/main/java/binnie/core/util/RecipeUtil.java similarity index 100% rename from src/main/java/binnie/core/util/RecipeUtil.java rename to core/src/main/java/binnie/core/util/RecipeUtil.java diff --git a/src/main/java/binnie/core/util/TileUtil.java b/core/src/main/java/binnie/core/util/TileUtil.java similarity index 100% rename from src/main/java/binnie/core/util/TileUtil.java rename to core/src/main/java/binnie/core/util/TileUtil.java diff --git a/src/main/java/binnie/core/util/UniqueFluidStackSet.java b/core/src/main/java/binnie/core/util/UniqueFluidStackSet.java similarity index 100% rename from src/main/java/binnie/core/util/UniqueFluidStackSet.java rename to core/src/main/java/binnie/core/util/UniqueFluidStackSet.java diff --git a/src/main/java/binnie/core/util/UniqueItemStackSet.java b/core/src/main/java/binnie/core/util/UniqueItemStackSet.java similarity index 100% rename from src/main/java/binnie/core/util/UniqueItemStackSet.java rename to core/src/main/java/binnie/core/util/UniqueItemStackSet.java diff --git a/src/main/java/binnie/core/util/package-info.java b/core/src/main/java/binnie/core/util/package-info.java similarity index 100% rename from src/main/java/binnie/core/util/package-info.java rename to core/src/main/java/binnie/core/util/package-info.java diff --git a/src/main/resources/assets/binniecore/blockstates/cylinder.json b/core/src/main/resources/assets/binniecore/blockstates/cylinder.json similarity index 100% rename from src/main/resources/assets/binniecore/blockstates/cylinder.json rename to core/src/main/resources/assets/binniecore/blockstates/cylinder.json diff --git a/src/main/resources/assets/binniecore/blockstates/glass.json b/core/src/main/resources/assets/binniecore/blockstates/glass.json similarity index 100% rename from src/main/resources/assets/binniecore/blockstates/glass.json rename to core/src/main/resources/assets/binniecore/blockstates/glass.json diff --git a/src/main/resources/assets/binniecore/blockstates/storage.json b/core/src/main/resources/assets/binniecore/blockstates/storage.json similarity index 100% rename from src/main/resources/assets/binniecore/blockstates/storage.json rename to core/src/main/resources/assets/binniecore/blockstates/storage.json diff --git a/src/main/resources/assets/binniecore/gui/stylesheet.json b/core/src/main/resources/assets/binniecore/gui/stylesheet.json similarity index 100% rename from src/main/resources/assets/binniecore/gui/stylesheet.json rename to core/src/main/resources/assets/binniecore/gui/stylesheet.json diff --git a/src/main/resources/assets/binniecore/lang/en_GB.lang b/core/src/main/resources/assets/binniecore/lang/en_GB.lang similarity index 100% rename from src/main/resources/assets/binniecore/lang/en_GB.lang rename to core/src/main/resources/assets/binniecore/lang/en_GB.lang diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/core/src/main/resources/assets/binniecore/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/binniecore/lang/en_US.lang rename to core/src/main/resources/assets/binniecore/lang/en_US.lang diff --git a/src/main/resources/assets/binniecore/models/block/machine.json b/core/src/main/resources/assets/binniecore/models/block/machine.json similarity index 100% rename from src/main/resources/assets/binniecore/models/block/machine.json rename to core/src/main/resources/assets/binniecore/models/block/machine.json diff --git a/src/main/resources/assets/binniecore/models/block/storage.json b/core/src/main/resources/assets/binniecore/models/block/storage.json similarity index 100% rename from src/main/resources/assets/binniecore/models/block/storage.json rename to core/src/main/resources/assets/binniecore/models/block/storage.json diff --git a/src/main/resources/assets/binniecore/models/item/cylinder_empty.json b/core/src/main/resources/assets/binniecore/models/item/cylinder_empty.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/cylinder_empty.json rename to core/src/main/resources/assets/binniecore/models/item/cylinder_empty.json diff --git a/src/main/resources/assets/binniecore/models/item/field_kit.json b/core/src/main/resources/assets/binniecore/models/item/field_kit.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/field_kit.json rename to core/src/main/resources/assets/binniecore/models/item/field_kit.json diff --git a/src/main/resources/assets/binniecore/models/item/field_kit1.json b/core/src/main/resources/assets/binniecore/models/item/field_kit1.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/field_kit1.json rename to core/src/main/resources/assets/binniecore/models/item/field_kit1.json diff --git a/src/main/resources/assets/binniecore/models/item/field_kit2.json b/core/src/main/resources/assets/binniecore/models/item/field_kit2.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/field_kit2.json rename to core/src/main/resources/assets/binniecore/models/item/field_kit2.json diff --git a/src/main/resources/assets/binniecore/models/item/field_kit3.json b/core/src/main/resources/assets/binniecore/models/item/field_kit3.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/field_kit3.json rename to core/src/main/resources/assets/binniecore/models/item/field_kit3.json diff --git a/src/main/resources/assets/binniecore/models/item/genesis.json b/core/src/main/resources/assets/binniecore/models/item/genesis.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/genesis.json rename to core/src/main/resources/assets/binniecore/models/item/genesis.json diff --git a/src/main/resources/assets/binniecore/models/item/glass_empty.json b/core/src/main/resources/assets/binniecore/models/item/glass_empty.json similarity index 100% rename from src/main/resources/assets/binniecore/models/item/glass_empty.json rename to core/src/main/resources/assets/binniecore/models/item/glass_empty.json diff --git a/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png b/core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png rename to core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png diff --git a/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png.mcmeta b/core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png.mcmeta similarity index 100% rename from src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png.mcmeta rename to core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.png.mcmeta diff --git a/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.txt b/core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.txt similarity index 100% rename from src/main/resources/assets/binniecore/textures/blocks/liquids/blank.txt rename to core/src/main/resources/assets/binniecore/textures/blocks/liquids/blank.txt diff --git a/src/main/resources/assets/binniecore/textures/gui/breeding.png b/core/src/main/resources/assets/binniecore/textures/gui/breeding.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/breeding.png rename to core/src/main/resources/assets/binniecore/textures/gui/breeding.png diff --git a/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png b/core/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png rename to core/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png diff --git a/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png.mcmeta b/core/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png.mcmeta similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png.mcmeta rename to core/src/main/resources/assets/binniecore/textures/gui/craftgui-controls.png.mcmeta diff --git a/src/main/resources/assets/binniecore/textures/gui/craftgui-panels.png b/core/src/main/resources/assets/binniecore/textures/gui/craftgui-panels.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/craftgui-panels.png rename to core/src/main/resources/assets/binniecore/textures/gui/craftgui-panels.png diff --git a/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png b/core/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png rename to core/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png diff --git a/src/main/resources/assets/binniecore/textures/gui/guianalyst.png b/core/src/main/resources/assets/binniecore/textures/gui/guianalyst.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/guianalyst.png rename to core/src/main/resources/assets/binniecore/textures/gui/guianalyst.png diff --git a/src/main/resources/assets/binniecore/textures/gui/message.png b/core/src/main/resources/assets/binniecore/textures/gui/message.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/message.png rename to core/src/main/resources/assets/binniecore/textures/gui/message.png diff --git a/src/main/resources/assets/binniecore/textures/gui/punnett.png b/core/src/main/resources/assets/binniecore/textures/gui/punnett.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/gui/punnett.png rename to core/src/main/resources/assets/binniecore/textures/gui/punnett.png diff --git a/src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png b/core/src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png rename to core/src/main/resources/assets/binniecore/textures/items/actions/cancel_task.png diff --git a/src/main/resources/assets/binniecore/textures/items/actions/pause_process.png b/core/src/main/resources/assets/binniecore/textures/items/actions/pause_process.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/actions/pause_process.png rename to core/src/main/resources/assets/binniecore/textures/items/actions/pause_process.png diff --git a/src/main/resources/assets/binniecore/textures/items/field_kit.png b/core/src/main/resources/assets/binniecore/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/field_kit.png rename to core/src/main/resources/assets/binniecore/textures/items/field_kit.png diff --git a/src/main/resources/assets/binniecore/textures/items/field_kit1.png b/core/src/main/resources/assets/binniecore/textures/items/field_kit1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/field_kit1.png rename to core/src/main/resources/assets/binniecore/textures/items/field_kit1.png diff --git a/src/main/resources/assets/binniecore/textures/items/field_kit2.png b/core/src/main/resources/assets/binniecore/textures/items/field_kit2.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/field_kit2.png rename to core/src/main/resources/assets/binniecore/textures/items/field_kit2.png diff --git a/src/main/resources/assets/binniecore/textures/items/field_kit3.png b/core/src/main/resources/assets/binniecore/textures/items/field_kit3.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/field_kit3.png rename to core/src/main/resources/assets/binniecore/textures/items/field_kit3.png diff --git a/src/main/resources/assets/binniecore/textures/items/genesis.png b/core/src/main/resources/assets/binniecore/textures/items/genesis.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/genesis.png rename to core/src/main/resources/assets/binniecore/textures/items/genesis.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.0.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.add.0.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.1.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.add.1.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.1.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.add.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.add.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.allday.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.allday.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.allday.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.allday.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.0.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.0.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.1.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.1.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.1.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.arrow.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.day.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.day.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.day.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.day.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.fire.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.fire.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.fire.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.fire.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.night.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.night.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.night.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.night.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.nofire.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.nofire.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.nofire.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.nofire.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.norain.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.norain.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.norain.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.norain.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.nosky.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.nosky.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.nosky.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.nosky.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.rain.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.rain.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.rain.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.rain.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/analyst.sky.png b/core/src/main/resources/assets/binniecore/textures/items/gui/analyst.sky.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/analyst.sky.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/analyst.sky.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-down.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-down.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-down.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-down.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-downleft.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-downleft.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-downleft.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-downleft.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-downright.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-downright.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-downright.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-downright.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-left.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-left.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-left.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-left.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftdown.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftdown.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-leftdown.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftdown.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftup.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftup.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-leftup.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-leftup.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-right.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-right.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-right.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-right.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightdown.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightdown.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-rightdown.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightdown.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightup.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightup.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-rightup.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-rightup.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-tldown.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-tldown.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-tldown.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-tldown.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-up.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-up.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-up.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-up.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-upbl.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upbl.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-upbl.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upbl.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-upleft.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upleft.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-upleft.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upleft.png diff --git a/src/main/resources/assets/binniecore/textures/items/gui/arrow-upright.png b/core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upright.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/gui/arrow-upright.png rename to core/src/main/resources/assets/binniecore/textures/items/gui/arrow-upright.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/desert.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/desert.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/desert.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/desert.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/end.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/end.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/end.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/end.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/forest.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/forest.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/forest.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/forest.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/frozenriver.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/frozenriver.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/frozenriver.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/frozenriver.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/hills.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/hills.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/hills.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/hills.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/jungle.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/jungle.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/jungle.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/jungle.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/mushroom.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/mushroom.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/mushroom.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/mushroom.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/nether.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/nether.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/nether.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/nether.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/ocean.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/ocean.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/ocean.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/ocean.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/plains.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/plains.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/plains.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/plains.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/river.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/river.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/river.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/river.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/snow.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/snow.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/snow.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/snow.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/swamp.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/swamp.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/swamp.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/swamp.png diff --git a/src/main/resources/assets/binniecore/textures/items/habitats/taiga.png b/core/src/main/resources/assets/binniecore/textures/items/habitats/taiga.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/habitats/taiga.png rename to core/src/main/resources/assets/binniecore/textures/items/habitats/taiga.png diff --git a/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.bottle.png b/core/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.bottle.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/liquids/cylinder.bottle.png rename to core/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.bottle.png diff --git a/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.contents.png b/core/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.contents.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/liquids/cylinder.contents.png rename to core/src/main/resources/assets/binniecore/textures/items/liquids/cylinder.contents.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/can_work.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/can_work.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/can_work.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/can_work.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/cannot_work.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/is_not_working.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/is_working.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/is_working.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/is_working.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/is_working.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/power_full.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/power_full.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/power_full.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/power_full.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/power_high.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/power_high.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/power_high.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/power_high.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/power_low.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/power_low.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/power_low.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/power_low.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/power_medium.png diff --git a/src/main/resources/assets/binniecore/textures/items/triggers/power_none.png b/core/src/main/resources/assets/binniecore/textures/items/triggers/power_none.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/triggers/power_none.png rename to core/src/main/resources/assets/binniecore/textures/items/triggers/power_none.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/bee.0.png b/core/src/main/resources/assets/binniecore/textures/items/validator/bee.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/bee.0.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/bee.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/bee.1.png b/core/src/main/resources/assets/binniecore/textures/items/validator/bee.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/bee.1.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/bee.1.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/block.0.png b/core/src/main/resources/assets/binniecore/textures/items/validator/block.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/block.0.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/block.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/block.1.png b/core/src/main/resources/assets/binniecore/textures/items/validator/block.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/block.1.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/block.1.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/circuit.0.png b/core/src/main/resources/assets/binniecore/textures/items/validator/circuit.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/circuit.0.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/circuit.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/circuit.1.png b/core/src/main/resources/assets/binniecore/textures/items/validator/circuit.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/circuit.1.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/circuit.1.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/frame.0.png b/core/src/main/resources/assets/binniecore/textures/items/validator/frame.0.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/frame.0.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/frame.0.png diff --git a/src/main/resources/assets/binniecore/textures/items/validator/frame.1.png b/core/src/main/resources/assets/binniecore/textures/items/validator/frame.1.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/items/validator/frame.1.png rename to core/src/main/resources/assets/binniecore/textures/items/validator/frame.1.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment_bronze.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment_copper.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment_copper.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment_copper.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment_copper.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment_diamond.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment_gold.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment_gold.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment_gold.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment_gold.png diff --git a/src/main/resources/assets/binniecore/textures/tile/compartment_iron.png b/core/src/main/resources/assets/binniecore/textures/tile/compartment_iron.png similarity index 100% rename from src/main/resources/assets/binniecore/textures/tile/compartment_iron.png rename to core/src/main/resources/assets/binniecore/textures/tile/compartment_iron.png diff --git a/src/main/resources/mcmod.info b/core/src/main/resources/mcmod.info similarity index 100% rename from src/main/resources/mcmod.info rename to core/src/main/resources/mcmod.info diff --git a/extrabees/build.gradle b/extrabees/build.gradle new file mode 100644 index 00000000..3b04871c --- /dev/null +++ b/extrabees/build.gradle @@ -0,0 +1,6 @@ +archivesBaseName = 'extrabees-' + mcversion + +dependencies { + compile project(":api") + compile project(":core") +} diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java similarity index 93% rename from src/main/java/binnie/extrabees/ExtraBees.java rename to extrabees/src/main/java/binnie/extrabees/ExtraBees.java index c005df8f..521a300e 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,8 @@ package binnie.extrabees; +import binnie.core.Binnie; +import binnie.extrabees.api.ExtraBeesAPI; +import binnie.extrabees.genetics.BeeBreedingSystem; import com.google.common.collect.Lists; import java.io.File; @@ -30,7 +33,7 @@ import forestry.core.gui.GuiIdRegistry; import forestry.core.gui.GuiType; import forestry.core.proxy.Proxies; -import binnie.Constants; +import binnie.core.Constants; import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart; import binnie.extrabees.genetics.ExtraBeeDefinition; import binnie.extrabees.genetics.ExtraBeesFlowers; @@ -63,7 +66,7 @@ public class ExtraBees { @SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesClientProxy", serverSide = "binnie.extrabees.proxy.ExtraBeesCommonProxy") public static ExtraBeesCommonProxy proxy; - + public ExtraBees(){ MinecraftForge.EVENT_BUS.register(this); } @@ -98,6 +101,10 @@ public class ExtraBees { throw new RuntimeException(e); } Proxies.render.registerModels(); + + BeeBreedingSystem beeBreedingSystem = new BeeBreedingSystem(); + ExtraBeesAPI.beeBreedingSystem = beeBreedingSystem; + Binnie.GENETICS.registerBreedingSystem(beeBreedingSystem); } @Mod.EventHandler diff --git a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java b/extrabees/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicLighting.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicRainShield.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java b/extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java rename to extrabees/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java diff --git a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java b/extrabees/src/main/java/binnie/extrabees/alveary/BlockAlveary.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/BlockAlveary.java rename to extrabees/src/main/java/binnie/extrabees/alveary/BlockAlveary.java diff --git a/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java b/extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java rename to extrabees/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/extrabees/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java rename to extrabees/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java diff --git a/src/main/java/binnie/extrabees/alveary/package-info.java b/extrabees/src/main/java/binnie/extrabees/alveary/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/alveary/package-info.java rename to extrabees/src/main/java/binnie/extrabees/alveary/package-info.java diff --git a/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java b/extrabees/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java similarity index 100% rename from src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java rename to extrabees/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java diff --git a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java b/extrabees/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java similarity index 100% rename from src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java rename to extrabees/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java diff --git a/src/main/java/binnie/extrabees/blocks/package-info.java b/extrabees/src/main/java/binnie/extrabees/blocks/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/blocks/package-info.java rename to extrabees/src/main/java/binnie/extrabees/blocks/package-info.java diff --git a/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java b/extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java similarity index 100% rename from src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java rename to extrabees/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java diff --git a/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java b/extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java similarity index 100% rename from src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java rename to extrabees/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java diff --git a/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java b/extrabees/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java similarity index 100% rename from src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java rename to extrabees/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java diff --git a/src/main/java/binnie/extrabees/circuit/BinnieCircuitSocketType.java b/extrabees/src/main/java/binnie/extrabees/circuit/BinnieCircuitSocketType.java similarity index 100% rename from src/main/java/binnie/extrabees/circuit/BinnieCircuitSocketType.java rename to extrabees/src/main/java/binnie/extrabees/circuit/BinnieCircuitSocketType.java diff --git a/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java b/extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java similarity index 100% rename from src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java rename to extrabees/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java diff --git a/src/main/java/binnie/extrabees/circuit/package-info.java b/extrabees/src/main/java/binnie/extrabees/circuit/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/circuit/package-info.java rename to extrabees/src/main/java/binnie/extrabees/circuit/package-info.java diff --git a/src/main/java/binnie/extrabees/client/BeeModelProvider.java b/extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java similarity index 100% rename from src/main/java/binnie/extrabees/client/BeeModelProvider.java rename to extrabees/src/main/java/binnie/extrabees/client/BeeModelProvider.java diff --git a/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java b/extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/ContainerMutator.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java b/extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java diff --git a/src/main/java/binnie/extrabees/client/gui/package-info.java b/extrabees/src/main/java/binnie/extrabees/client/gui/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/client/gui/package-info.java rename to extrabees/src/main/java/binnie/extrabees/client/gui/package-info.java diff --git a/src/main/java/binnie/extrabees/client/package-info.java b/extrabees/src/main/java/binnie/extrabees/client/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/client/package-info.java rename to extrabees/src/main/java/binnie/extrabees/client/package-info.java diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java similarity index 91% rename from src/main/java/binnie/core/genetics/BeeBreedingSystem.java rename to extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java index 5d07e4e5..ad6a2d7c 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/BeeBreedingSystem.java @@ -1,8 +1,13 @@ -package binnie.core.genetics; +package binnie.extrabees.genetics; import javax.annotation.Nullable; import java.util.TreeSet; +import binnie.core.genetics.BreedingSystem; +import binnie.core.genetics.ForestryAllele; +import binnie.core.genetics.Tolerance; +import binnie.core.genetics.VirtualBeeHousing; +import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,10 +25,10 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.util.I18N; -class BeeBreedingSystem extends BreedingSystem { +public class BeeBreedingSystem extends BreedingSystem { public BeeBreedingSystem() { this.iconUndiscovered = Binnie.RESOURCE.getUndiscoveredBeeSprite(); @@ -44,7 +49,7 @@ class BeeBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.GENETICS.getBeeRoot(); + return BeeManager.beeRoot; } @Override diff --git a/src/main/java/binnie/extrabees/genetics/ConditionPerson.java b/extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/ConditionPerson.java rename to extrabees/src/main/java/binnie/extrabees/genetics/ConditionPerson.java diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java similarity index 99% rename from src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java rename to extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java index 44c8f133..ff24316e 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java @@ -13,7 +13,7 @@ import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.EnumAllele; import binnie.extrabees.genetics.effect.ExtraBeesEffect; -import binnie.genetics.genetics.AlleleHelper; +import binnie.core.genetics.AlleleHelper; @SuppressWarnings("Duplicates") public enum ExtraBeeBranchDefinition implements IBranchDefinition { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java similarity index 99% rename from src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java rename to extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java index 3f7a845c..b8745647 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java @@ -35,7 +35,7 @@ import forestry.core.genetics.alleles.EnumAllele; import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.extrabees.items.ItemHoneyComb; import binnie.extrabees.items.types.EnumHoneyComb; -import binnie.genetics.genetics.AlleleHelper; +import binnie.core.genetics.AlleleHelper; public enum ExtraBeeDefinition implements IBeeDefinition { /* BARREN BRANCH */ diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java rename to extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java rename to extrabees/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java rename to extrabees/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java rename to extrabees/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java rename to extrabees/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java diff --git a/src/main/java/binnie/extrabees/genetics/effect/package-info.java b/extrabees/src/main/java/binnie/extrabees/genetics/effect/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/effect/package-info.java rename to extrabees/src/main/java/binnie/extrabees/genetics/effect/package-info.java diff --git a/src/main/java/binnie/extrabees/genetics/package-info.java b/extrabees/src/main/java/binnie/extrabees/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/genetics/package-info.java rename to extrabees/src/main/java/binnie/extrabees/genetics/package-info.java diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java similarity index 100% rename from src/main/java/binnie/extrabees/init/BlockRegister.java rename to extrabees/src/main/java/binnie/extrabees/init/BlockRegister.java diff --git a/src/main/java/binnie/extrabees/init/FluidRegister.java b/extrabees/src/main/java/binnie/extrabees/init/FluidRegister.java similarity index 100% rename from src/main/java/binnie/extrabees/init/FluidRegister.java rename to extrabees/src/main/java/binnie/extrabees/init/FluidRegister.java diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java similarity index 100% rename from src/main/java/binnie/extrabees/init/ItemRegister.java rename to extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java similarity index 100% rename from src/main/java/binnie/extrabees/init/RecipeRegister.java rename to extrabees/src/main/java/binnie/extrabees/init/RecipeRegister.java diff --git a/src/main/java/binnie/extrabees/init/package-info.java b/extrabees/src/main/java/binnie/extrabees/init/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/init/package-info.java rename to extrabees/src/main/java/binnie/extrabees/init/package-info.java diff --git a/src/main/java/binnie/extrabees/items/IItemModelProvider.java b/extrabees/src/main/java/binnie/extrabees/items/IItemModelProvider.java similarity index 100% rename from src/main/java/binnie/extrabees/items/IItemModelProvider.java rename to extrabees/src/main/java/binnie/extrabees/items/IItemModelProvider.java diff --git a/src/main/java/binnie/extrabees/items/ItemBeehive.java b/extrabees/src/main/java/binnie/extrabees/items/ItemBeehive.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemBeehive.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemBeehive.java diff --git a/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java b/extrabees/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemBlockAlveary.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java diff --git a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java b/extrabees/src/main/java/binnie/extrabees/items/ItemHiveFrame.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemHiveFrame.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemHiveFrame.java diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyComb.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemHoneyComb.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemHoneyComb.java diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java b/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java b/extrabees/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemHoneyDrop.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java diff --git a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java b/extrabees/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java diff --git a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java b/extrabees/src/main/java/binnie/extrabees/items/ItemMiscProduct.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemMiscProduct.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemMiscProduct.java diff --git a/src/main/java/binnie/extrabees/items/ItemProduct.java b/extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemProduct.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemProduct.java diff --git a/src/main/java/binnie/extrabees/items/ItemPropolis.java b/extrabees/src/main/java/binnie/extrabees/items/ItemPropolis.java similarity index 100% rename from src/main/java/binnie/extrabees/items/ItemPropolis.java rename to extrabees/src/main/java/binnie/extrabees/items/ItemPropolis.java diff --git a/src/main/java/binnie/extrabees/items/package-info.java b/extrabees/src/main/java/binnie/extrabees/items/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/items/package-info.java rename to extrabees/src/main/java/binnie/extrabees/items/package-info.java diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java rename to extrabees/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java rename to extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java rename to extrabees/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java diff --git a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java b/extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/EnumPropolis.java rename to extrabees/src/main/java/binnie/extrabees/items/types/EnumPropolis.java diff --git a/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java b/extrabees/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java rename to extrabees/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java diff --git a/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java b/extrabees/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/IEBEnumItem.java rename to extrabees/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java diff --git a/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java b/extrabees/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java rename to extrabees/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java diff --git a/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java b/extrabees/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/IndustrialFrame.java rename to extrabees/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java diff --git a/src/main/java/binnie/extrabees/items/types/package-info.java b/extrabees/src/main/java/binnie/extrabees/items/types/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/items/types/package-info.java rename to extrabees/src/main/java/binnie/extrabees/items/types/package-info.java diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java similarity index 100% rename from src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java rename to extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java b/extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java similarity index 100% rename from src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java rename to extrabees/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java diff --git a/src/main/java/binnie/extrabees/proxy/package-info.java b/extrabees/src/main/java/binnie/extrabees/proxy/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/proxy/package-info.java rename to extrabees/src/main/java/binnie/extrabees/proxy/package-info.java diff --git a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java b/extrabees/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java rename to extrabees/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java diff --git a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/BeeModifierLogic.java rename to extrabees/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java diff --git a/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java b/extrabees/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java rename to extrabees/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java diff --git a/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java b/extrabees/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/EnumBeeModifier.java rename to extrabees/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java diff --git a/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java b/extrabees/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java rename to extrabees/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java diff --git a/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java b/extrabees/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java rename to extrabees/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java diff --git a/src/main/java/binnie/extrabees/utils/HiveDrop.java b/extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/HiveDrop.java rename to extrabees/src/main/java/binnie/extrabees/utils/HiveDrop.java diff --git a/src/main/java/binnie/extrabees/utils/MaterialBeehive.java b/extrabees/src/main/java/binnie/extrabees/utils/MaterialBeehive.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/MaterialBeehive.java rename to extrabees/src/main/java/binnie/extrabees/utils/MaterialBeehive.java diff --git a/src/main/java/binnie/extrabees/utils/Utils.java b/extrabees/src/main/java/binnie/extrabees/utils/Utils.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/Utils.java rename to extrabees/src/main/java/binnie/extrabees/utils/Utils.java diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java b/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/config/ConfigHandler.java rename to extrabees/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java b/extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java rename to extrabees/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java diff --git a/src/main/java/binnie/extrabees/utils/config/IConfigurable.java b/extrabees/src/main/java/binnie/extrabees/utils/config/IConfigurable.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/config/IConfigurable.java rename to extrabees/src/main/java/binnie/extrabees/utils/config/IConfigurable.java diff --git a/src/main/java/binnie/extrabees/utils/config/package-info.java b/extrabees/src/main/java/binnie/extrabees/utils/config/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/config/package-info.java rename to extrabees/src/main/java/binnie/extrabees/utils/config/package-info.java diff --git a/src/main/java/binnie/extrabees/utils/package-info.java b/extrabees/src/main/java/binnie/extrabees/utils/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/utils/package-info.java rename to extrabees/src/main/java/binnie/extrabees/utils/package-info.java diff --git a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/WorldGenHive.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHive.java diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java diff --git a/src/main/java/binnie/extrabees/worldgen/package-info.java b/extrabees/src/main/java/binnie/extrabees/worldgen/package-info.java similarity index 100% rename from src/main/java/binnie/extrabees/worldgen/package-info.java rename to extrabees/src/main/java/binnie/extrabees/worldgen/package-info.java diff --git a/src/main/resources/assets/extrabees/blockstates/alveary.json b/extrabees/src/main/resources/assets/extrabees/blockstates/alveary.json similarity index 100% rename from src/main/resources/assets/extrabees/blockstates/alveary.json rename to extrabees/src/main/resources/assets/extrabees/blockstates/alveary.json diff --git a/src/main/resources/assets/extrabees/blockstates/ectoplasm.json b/extrabees/src/main/resources/assets/extrabees/blockstates/ectoplasm.json similarity index 100% rename from src/main/resources/assets/extrabees/blockstates/ectoplasm.json rename to extrabees/src/main/resources/assets/extrabees/blockstates/ectoplasm.json diff --git a/src/main/resources/assets/extrabees/blockstates/hive.json b/extrabees/src/main/resources/assets/extrabees/blockstates/hive.json similarity index 100% rename from src/main/resources/assets/extrabees/blockstates/hive.json rename to extrabees/src/main/resources/assets/extrabees/blockstates/hive.json diff --git a/src/main/resources/assets/extrabees/lang/en_GB.lang b/extrabees/src/main/resources/assets/extrabees/lang/en_GB.lang similarity index 100% rename from src/main/resources/assets/extrabees/lang/en_GB.lang rename to extrabees/src/main/resources/assets/extrabees/lang/en_GB.lang diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/extrabees/src/main/resources/assets/extrabees/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/extrabees/lang/en_US.lang rename to extrabees/src/main/resources/assets/extrabees/lang/en_US.lang diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json b/extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json rename to extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cage.json diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json b/extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json rename to extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.clay.json diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json b/extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json rename to extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.cocoa.json diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json b/extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json rename to extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.debug.json diff --git a/src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json b/extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json rename to extrabees/src/main/resources/assets/extrabees/models/item/frames/hive_frame.soul.json diff --git a/src/main/resources/assets/extrabees/models/item/honey_comb.json b/extrabees/src/main/resources/assets/extrabees/models/item/honey_comb.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/honey_comb.json rename to extrabees/src/main/resources/assets/extrabees/models/item/honey_comb.json diff --git a/src/main/resources/assets/extrabees/models/item/honey_crystal.json b/extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/honey_crystal.json rename to extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal.json diff --git a/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json b/extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json rename to extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal_empty.json diff --git a/src/main/resources/assets/extrabees/models/item/honey_crystal_full.json b/extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal_full.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/honey_crystal_full.json rename to extrabees/src/main/resources/assets/extrabees/models/item/honey_crystal_full.json diff --git a/src/main/resources/assets/extrabees/models/item/honey_drop.json b/extrabees/src/main/resources/assets/extrabees/models/item/honey_drop.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/honey_drop.json rename to extrabees/src/main/resources/assets/extrabees/models/item/honey_drop.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/blutonium_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/clay_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/clay_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/clay_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/clay_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/coal_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/coal_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/coal_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/coal_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/copper_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/copper_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/copper_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/copper_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/cyanite_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/diamond_shard.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_black.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_black.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_black.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_black.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_blue.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_blue.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_blue.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_blue.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_brown.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_brown.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_green.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_green.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_green.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_green.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_red.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_red.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_red.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_red.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_white.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_white.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_white.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_white.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/dye_yellow.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/emerald_shard.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/gold_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/gold_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/iron_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/iron_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/lapis_shard.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/lead_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/lead_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/nickel_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/platinum_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/radioactive_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/ruby_shard.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/sapphire_shard.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/scented_gear.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/scented_gear.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/silver_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/silver_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/tin_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/tin_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/tin_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/tin_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/titanium_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/tungsten_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/yellorium_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json b/extrabees/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json rename to extrabees/src/main/resources/assets/extrabees/models/item/misc/zinc_dust.json diff --git a/src/main/resources/assets/extrabees/models/item/propolis.json b/extrabees/src/main/resources/assets/extrabees/models/item/propolis.json similarity index 100% rename from src/main/resources/assets/extrabees/models/item/propolis.json rename to extrabees/src/main/resources/assets/extrabees/models/item/propolis.json diff --git a/src/main/resources/assets/extrabees/textures/blocks/ectoplasm.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/ectoplasm.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/ectoplasm.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/ectoplasm.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/marble.0.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/marble.0.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/marble.0.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/marble.0.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/marble.1.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/marble.1.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/marble.1.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/marble.1.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/nether.0.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/nether.0.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/nether.0.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/nether.0.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/nether.1.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/nether.1.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/nether.1.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/nether.1.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/rock.0.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/rock.0.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/rock.0.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/rock.0.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/rock.1.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/rock.1.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/rock.1.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/rock.1.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/water.0.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/water.0.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/water.0.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/water.0.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/hive/water.1.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/water.1.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/hive/water.1.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/hive/water.1.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png.mcmeta b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png.mcmeta similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png.mcmeta rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.png.mcmeta diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.txt b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.txt similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/acid.txt rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/acid.txt diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png.mcmeta b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png.mcmeta similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png.mcmeta rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.png.mcmeta diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.txt b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.txt similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.txt rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/liquidnitrogen.txt diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png.mcmeta b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png.mcmeta similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png.mcmeta rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.png.mcmeta diff --git a/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.txt b/extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.txt similarity index 100% rename from src/main/resources/assets/extrabees/textures/blocks/liquids/poison.txt rename to extrabees/src/main/resources/assets/extrabees/textures/blocks/liquids/poison.txt diff --git a/src/main/resources/assets/extrabees/textures/fx/fx.png b/extrabees/src/main/resources/assets/extrabees/textures/fx/fx.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/fx/fx.png rename to extrabees/src/main/resources/assets/extrabees/textures/fx/fx.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guiframe.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guiframe.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guiframe.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guiframe.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guihatchery.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guihatchery.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guihatchery.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guihatchery.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guimutator.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guimutator.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guimutator.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guimutator.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guinull.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guinull.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guinull.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull2.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guinull2.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guinull2.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guinull2.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull3.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guinull3.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guinull3.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guinull3.png diff --git a/src/main/resources/assets/extrabees/textures/gui/guistimulator.png b/extrabees/src/main/resources/assets/extrabees/textures/gui/guistimulator.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/gui/guistimulator.png rename to extrabees/src/main/resources/assets/extrabees/textures/gui/guistimulator.png diff --git a/src/main/resources/assets/extrabees/textures/items/beekeeping_page.png b/extrabees/src/main/resources/assets/extrabees/textures/items/beekeeping_page.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/beekeeping_page.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/beekeeping_page.png diff --git a/src/main/resources/assets/extrabees/textures/items/field_glass.png b/extrabees/src/main/resources/assets/extrabees/textures/items/field_glass.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/field_glass.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/field_glass.png diff --git a/src/main/resources/assets/extrabees/textures/items/field_kit.png b/extrabees/src/main/resources/assets/extrabees/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/field_kit.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/field_kit.png diff --git a/src/main/resources/assets/extrabees/textures/items/frame_cage.png b/extrabees/src/main/resources/assets/extrabees/textures/items/frame_cage.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frame_cage.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/frame_cage.png diff --git a/src/main/resources/assets/extrabees/textures/items/frame_clay.png b/extrabees/src/main/resources/assets/extrabees/textures/items/frame_clay.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frame_clay.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/frame_clay.png diff --git a/src/main/resources/assets/extrabees/textures/items/frame_cocoa.png b/extrabees/src/main/resources/assets/extrabees/textures/items/frame_cocoa.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frame_cocoa.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/frame_cocoa.png diff --git a/src/main/resources/assets/extrabees/textures/items/frame_debug.png b/extrabees/src/main/resources/assets/extrabees/textures/items/frame_debug.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frame_debug.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/frame_debug.png diff --git a/src/main/resources/assets/extrabees/textures/items/frame_soul.png b/extrabees/src/main/resources/assets/extrabees/textures/items/frame_soul.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/frame_soul.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/frame_soul.png diff --git a/src/main/resources/assets/extrabees/textures/items/honey_crystal.png b/extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/honey_crystal.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal.png diff --git a/src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png b/extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal_empty.png diff --git a/src/main/resources/assets/extrabees/textures/items/honey_crystal_full.png b/extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal_full.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/honey_crystal_full.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/honey_crystal_full.png diff --git a/src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png b/extrabees/src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/icon/discovered_bee.png diff --git a/src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png b/extrabees/src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/icon/undiscovered_bee.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/blutonium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/clay_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/coal_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/copper_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/cyanite_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/diamond_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_black.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_black.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_black.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_black.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_blue.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_brown.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_green.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_green.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_green.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_green.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_red.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_red.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_red.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_red.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_white.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_white.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_white.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_white.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/dye_yellow.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/emerald_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/gold_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/iron_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/lapis_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/lead_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/nickel_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/platinum_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/radioactive_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/ruby_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/sapphire_shard.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/scented_gear.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/silver_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/tin_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/titanium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/tungsten_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/yellorium_dust.png diff --git a/src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png b/extrabees/src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png rename to extrabees/src/main/resources/assets/extrabees/textures/items/misc/zinc_dust.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png diff --git a/src/main/resources/assets/extrabees/textures/tile/logo.png b/extrabees/src/main/resources/assets/extrabees/textures/tile/logo.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/tile/logo.png rename to extrabees/src/main/resources/assets/extrabees/textures/tile/logo.png diff --git a/extratrees/build.gradle b/extratrees/build.gradle new file mode 100644 index 00000000..7e8f48b9 --- /dev/null +++ b/extratrees/build.gradle @@ -0,0 +1,6 @@ +archivesBaseName = 'extratrees-' + mcversion + +dependencies { + compile project(":api") + compile project(":core") +} diff --git a/src/main/java/binnie/extratrees/CreativeTabCarpentry.java b/extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java similarity index 100% rename from src/main/java/binnie/extratrees/CreativeTabCarpentry.java rename to extratrees/src/main/java/binnie/extratrees/CreativeTabCarpentry.java diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java similarity index 80% rename from src/main/java/binnie/extratrees/ExtraTrees.java rename to extratrees/src/main/java/binnie/extratrees/ExtraTrees.java index a2478eb8..4b3d20fc 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,9 @@ package binnie.extratrees; +import binnie.core.Binnie; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.extratrees.genetics.MothBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -8,7 +12,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; @@ -17,7 +21,7 @@ import binnie.extratrees.block.ModuleBlocks; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.proxy.Proxy; -import binnie.modules.BlankModuleContainer; +import binnie.core.modules.BlankModuleContainer; @Mod( modid = Constants.EXTRA_TREES_MOD_ID, @@ -33,6 +37,8 @@ public class ExtraTrees extends BlankModuleContainer { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") public static Proxy proxy; + public static IBreedingSystem treeBreedingSystem; + public static IBreedingSystem mothBreedingSystem; public ExtraTrees() { super(); @@ -42,6 +48,10 @@ public class ExtraTrees extends BlankModuleContainer { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { super.preInit(evt); + treeBreedingSystem = new TreeBreedingSystem(); + mothBreedingSystem = new MothBreedingSystem(); + Binnie.GENETICS.registerBreedingSystem(treeBreedingSystem); + Binnie.GENETICS.registerBreedingSystem(mothBreedingSystem); } @Mod.EventHandler diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Alcohol.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/Alcohol.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Alcohol.java index ded007d0..54a1724f 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/extratrees/alcohol/Cocktail.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Cocktail.java similarity index 99% rename from src/main/java/binnie/extratrees/alcohol/Cocktail.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Cocktail.java index 9d284b3d..bfbdda44 100644 --- a/src/main/java/binnie/extratrees/alcohol/Cocktail.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Cocktail.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Objects; import binnie.extratrees.alcohol.drink.DrinkLiquid; -import binnie.extratrees.alcohol.drink.DrinkManager; +import binnie.core.liquid.DrinkManager; public enum Cocktail { Bellini("Bellini", Glassware.Flute, 15974764), diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Glassware.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/Glassware.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Glassware.java index b0714b94..29338cd6 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.I18N; public enum Glassware { diff --git a/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java b/extratrees/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java diff --git a/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java b/extratrees/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Juice.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/Juice.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Juice.java index 087da6ea..3926f270 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -4,8 +4,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Liqueur.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/Liqueur.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Liqueur.java index 60b32cb2..ecd63c4e 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -4,8 +4,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/extratrees/src/main/java/binnie/extratrees/alcohol/MiscFluid.java similarity index 97% rename from src/main/java/binnie/extratrees/alcohol/MiscFluid.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index e5e294f6..df96108c 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -4,8 +4,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/extratrees/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 09084a6b..ee817ac1 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -15,15 +15,15 @@ import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; import forestry.core.fluids.Fluids; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.Mods; import binnie.core.liquid.IFluidType; import binnie.core.resource.BinnieSprite; import binnie.core.util.OreDictionaryUtil; import binnie.extratrees.ExtraTrees; import binnie.extratrees.alcohol.drink.DrinkLiquid; -import binnie.extratrees.alcohol.drink.DrinkManager; +import binnie.core.liquid.DrinkManager; import binnie.extratrees.alcohol.drink.ItemDrink; import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; import binnie.extratrees.api.recipes.IBreweryManager; @@ -33,8 +33,8 @@ import binnie.extratrees.item.ExtraTreeItems; import binnie.extratrees.item.Food; import binnie.extratrees.machines.distillery.DistilleryLogic; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.ALCOHOL, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Alcohol", unlocalizedDescription = "extratrees.module.alcohol") public class ModuleAlcohol extends Module { diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/extratrees/src/main/java/binnie/extratrees/alcohol/Spirit.java similarity index 98% rename from src/main/java/binnie/extratrees/alcohol/Spirit.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/Spirit.java index 6551e0e3..247b1c5d 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -4,8 +4,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java similarity index 93% rename from src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java index 034063d0..abdbfb61 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java @@ -1,8 +1,9 @@ package binnie.extratrees.alcohol.drink; +import binnie.core.liquid.IDrinkLiquid; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; +import binnie.core.Binnie; public class DrinkLiquid implements IDrinkLiquid { private final String name; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java similarity index 95% rename from src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java index 2334bdef..1513fea8 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java @@ -1,5 +1,6 @@ package binnie.extratrees.alcohol.drink; +import binnie.core.liquid.DrinkManager; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java similarity index 97% rename from src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index 26cec271..891f5ff0 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -1,7 +1,9 @@ package binnie.extratrees.alcohol.drink; +import binnie.core.liquid.DrinkManager; +import binnie.core.liquid.IDrinkLiquid; import binnie.extratrees.alcohol.Alcohol; -import binnie.extratrees.alcohol.AlcoholEffect; +import binnie.core.liquid.AlcoholEffect; import binnie.extratrees.alcohol.Glassware; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java diff --git a/src/main/java/binnie/extratrees/alcohol/drink/package-info.java b/extratrees/src/main/java/binnie/extratrees/alcohol/drink/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/drink/package-info.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/drink/package-info.java diff --git a/src/main/java/binnie/extratrees/alcohol/package-info.java b/extratrees/src/main/java/binnie/extratrees/alcohol/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/alcohol/package-info.java rename to extratrees/src/main/java/binnie/extratrees/alcohol/package-info.java diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/extratrees/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java similarity index 99% rename from src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java rename to extratrees/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 36249ef2..45982397 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/extratrees/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -39,7 +39,7 @@ import forestry.api.core.Tabs; import forestry.core.blocks.IColoredBlock; import forestry.core.proxy.Proxies; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.property.PropertyETType; import binnie.extratrees.genetics.ETTreeDefinition; diff --git a/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java b/extratrees/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java similarity index 99% rename from src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java rename to extratrees/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java index 2af03860..27dbd126 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java +++ b/extratrees/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java @@ -33,7 +33,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.core.IModelManager; import forestry.arboriculture.blocks.BlockAbstractLeaves; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.property.PropertyETType; import binnie.extratrees.genetics.ETTreeDefinition; diff --git a/src/main/java/binnie/extratrees/block/BlockHops.java b/extratrees/src/main/java/binnie/extratrees/block/BlockHops.java similarity index 100% rename from src/main/java/binnie/extratrees/block/BlockHops.java rename to extratrees/src/main/java/binnie/extratrees/block/BlockHops.java diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/extratrees/src/main/java/binnie/extratrees/block/EnumETLog.java similarity index 99% rename from src/main/java/binnie/extratrees/block/EnumETLog.java rename to extratrees/src/main/java/binnie/extratrees/block/EnumETLog.java index 65eb130f..806a29c9 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/extratrees/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -4,7 +4,7 @@ import java.util.Locale; import forestry.api.arboriculture.IWoodType; -import binnie.Constants; +import binnie.core.Constants; public enum EnumETLog implements IWoodType { Apple("Apple", PlankType.ExtraTreePlanks.Apple), diff --git a/src/main/java/binnie/extratrees/block/EnumShrubLog.java b/extratrees/src/main/java/binnie/extratrees/block/EnumShrubLog.java similarity index 100% rename from src/main/java/binnie/extratrees/block/EnumShrubLog.java rename to extratrees/src/main/java/binnie/extratrees/block/EnumShrubLog.java diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/extratrees/src/main/java/binnie/extratrees/block/FruitPod.java similarity index 100% rename from src/main/java/binnie/extratrees/block/FruitPod.java rename to extratrees/src/main/java/binnie/extratrees/block/FruitPod.java diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/extratrees/src/main/java/binnie/extratrees/block/GateItemRenderer.java similarity index 100% rename from src/main/java/binnie/extratrees/block/GateItemRenderer.java rename to extratrees/src/main/java/binnie/extratrees/block/GateItemRenderer.java diff --git a/src/main/java/binnie/extratrees/block/IFenceProvider.java b/extratrees/src/main/java/binnie/extratrees/block/IFenceProvider.java similarity index 100% rename from src/main/java/binnie/extratrees/block/IFenceProvider.java rename to extratrees/src/main/java/binnie/extratrees/block/IFenceProvider.java diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/extratrees/src/main/java/binnie/extratrees/block/IPlankType.java similarity index 100% rename from src/main/java/binnie/extratrees/block/IPlankType.java rename to extratrees/src/main/java/binnie/extratrees/block/IPlankType.java diff --git a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java b/extratrees/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java similarity index 100% rename from src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java rename to extratrees/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/extratrees/src/main/java/binnie/extratrees/block/ModuleBlocks.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/binnie/extratrees/block/ModuleBlocks.java rename to extratrees/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 3c30abaa..85b0ddd7 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/extratrees/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -55,7 +55,7 @@ import forestry.core.fluids.Fluids; import forestry.core.utils.OreDictUtil; import forestry.plugins.ForestryPluginUids; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.block.ItemMetadata; @@ -84,8 +84,8 @@ import binnie.extratrees.genetics.FruitSprite; import binnie.extratrees.item.ExtraTreeLiquid; import binnie.extratrees.modules.ExtraTreesModuleUIDs; import binnie.extratrees.village.VillageCreationExtraTrees; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.WOOD, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Wood", unlocalizedDescription = "extratrees.module.wood") public class ModuleBlocks extends Module { diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/extratrees/src/main/java/binnie/extratrees/block/PlankType.java similarity index 99% rename from src/main/java/binnie/extratrees/block/PlankType.java rename to extratrees/src/main/java/binnie/extratrees/block/PlankType.java index 2238ce04..7d9d23e7 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/extratrees/src/main/java/binnie/extratrees/block/PlankType.java @@ -15,7 +15,7 @@ import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/extratrees/src/main/java/binnie/extratrees/block/WoodManager.java similarity index 99% rename from src/main/java/binnie/extratrees/block/WoodManager.java rename to extratrees/src/main/java/binnie/extratrees/block/WoodManager.java index 5076b527..83610606 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/extratrees/src/main/java/binnie/extratrees/block/WoodManager.java @@ -19,7 +19,7 @@ import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; import forestry.core.utils.Translator; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.decor.FenceDescription; diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/extratrees/src/main/java/binnie/extratrees/block/decor/BlockHedge.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/BlockHedge.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/BlockHedge.java diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/extratrees/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java similarity index 98% rename from src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 8998ed2f..e69e8b95 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -41,9 +41,9 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.BlockMetadata; +import binnie.core.api.block.IBlockMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/extratrees/block/decor/FenceDescription.java b/extratrees/src/main/java/binnie/extratrees/block/decor/FenceDescription.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/FenceDescription.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/FenceDescription.java diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/extratrees/src/main/java/binnie/extratrees/block/decor/FenceType.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/FenceType.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/FenceType.java diff --git a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java b/extratrees/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java diff --git a/src/main/java/binnie/extratrees/block/decor/IBlockFence.java b/extratrees/src/main/java/binnie/extratrees/block/decor/IBlockFence.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/IBlockFence.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/IBlockFence.java diff --git a/src/main/java/binnie/extratrees/block/decor/ItemHedge.java b/extratrees/src/main/java/binnie/extratrees/block/decor/ItemHedge.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/ItemHedge.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/ItemHedge.java diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java similarity index 98% rename from src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 196200de..7336f336 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -1,6 +1,6 @@ package binnie.extratrees.block.decor; -import binnie.Constants; +import binnie.core.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java similarity index 98% rename from src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index d8bc6aa2..816bdd84 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -3,7 +3,7 @@ package binnie.extratrees.block.decor; import java.util.ArrayList; import java.util.List; -import binnie.Constants; +import binnie.core.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java similarity index 98% rename from src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 65cd4c41..ffd6b6e7 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/extratrees/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -1,6 +1,6 @@ package binnie.extratrees.block.decor; -import binnie.Constants; +import binnie.core.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/block/decor/package-info.java b/extratrees/src/main/java/binnie/extratrees/block/decor/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/block/decor/package-info.java rename to extratrees/src/main/java/binnie/extratrees/block/decor/package-info.java diff --git a/src/main/java/binnie/extratrees/block/package-info.java b/extratrees/src/main/java/binnie/extratrees/block/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/block/package-info.java rename to extratrees/src/main/java/binnie/extratrees/block/package-info.java diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/extratrees/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java similarity index 100% rename from src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java rename to extratrees/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETType.java b/extratrees/src/main/java/binnie/extratrees/block/property/PropertyETType.java similarity index 100% rename from src/main/java/binnie/extratrees/block/property/PropertyETType.java rename to extratrees/src/main/java/binnie/extratrees/block/property/PropertyETType.java diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/extratrees/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java similarity index 100% rename from src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java rename to extratrees/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java diff --git a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java b/extratrees/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java similarity index 100% rename from src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java rename to extratrees/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java diff --git a/src/main/java/binnie/extratrees/block/property/package-info.java b/extratrees/src/main/java/binnie/extratrees/block/property/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/block/property/package-info.java rename to extratrees/src/main/java/binnie/extratrees/block/property/package-info.java diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETDoor.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETDoor.java similarity index 99% rename from src/main/java/binnie/extratrees/block/wood/BlockETDoor.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockETDoor.java index 52f75bdb..39296e29 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETDoor.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETDoor.java @@ -33,7 +33,7 @@ import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.proxy.ProxyArboricultureClient; import forestry.core.blocks.IColoredBlock; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumETLog; public class BlockETDoor extends BlockDoor implements IWoodTyped, IItemModelRegister, IStateMapperRegister, IColoredBlock { diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETFence.java similarity index 98% rename from src/main/java/binnie/extratrees/block/wood/BlockETFence.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index 6b8946d7..a5677748 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -10,7 +10,7 @@ import forestry.api.core.IStateMapperRegister; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.BlockForestryFence; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETLog.java similarity index 97% rename from src/main/java/binnie/extratrees/block/wood/BlockETLog.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index abd8fa47..9e8812b5 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -8,7 +8,7 @@ import net.minecraft.util.ResourceLocation; import forestry.arboriculture.blocks.BlockForestryLog; import forestry.arboriculture.blocks.PropertyWoodType; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java similarity index 97% rename from src/main/java/binnie/extratrees/block/wood/BlockETPlank.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index af5aab57..2a2c0c7e 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import forestry.arboriculture.blocks.BlockForestryPlanks; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java similarity index 98% rename from src/main/java/binnie/extratrees/block/wood/BlockETSlab.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 80facde4..5bd222bc 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import forestry.arboriculture.blocks.BlockForestrySlab; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.property.PropertyETWoodType; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java similarity index 99% rename from src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index 6596fa99..4a4f9082 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/extratrees/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -39,7 +39,7 @@ import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.arboriculture.IWoodTyped; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.block.EnumShrubLog; public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { diff --git a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java b/extratrees/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java similarity index 100% rename from src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java diff --git a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWoodDoor.java b/extratrees/src/main/java/binnie/extratrees/block/wood/ItemBlockETWoodDoor.java similarity index 100% rename from src/main/java/binnie/extratrees/block/wood/ItemBlockETWoodDoor.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/ItemBlockETWoodDoor.java diff --git a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java b/extratrees/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java similarity index 100% rename from src/main/java/binnie/extratrees/block/wood/ItemETSlab.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java diff --git a/src/main/java/binnie/extratrees/block/wood/package-info.java b/extratrees/src/main/java/binnie/extratrees/block/wood/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/block/wood/package-info.java rename to extratrees/src/main/java/binnie/extratrees/block/wood/package-info.java diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java similarity index 100% rename from src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java similarity index 97% rename from src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 84b8527c..26800c38 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -12,8 +12,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import binnie.core.block.BlockMetadata; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.BlockMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.util.I18N; public class BlockCarpentryPanel extends BlockCarpentry { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockDesign.java similarity index 98% rename from src/main/java/binnie/extratrees/carpentry/BlockDesign.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 78fe96a5..0dbe20b9 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -3,6 +3,7 @@ package binnie.extratrees.carpentry; import javax.annotation.Nullable; import java.util.List; +import binnie.extratrees.api.carpentry.DesignerManager; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -45,9 +46,9 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import binnie.core.block.BlockMetadata; +import binnie.core.api.block.BlockMetadata; import binnie.core.block.IMultipassBlock; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; import binnie.core.models.ModelMutlipass; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java similarity index 98% rename from src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index cefd1542..ce604d6e 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -25,7 +25,7 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java similarity index 100% rename from src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignBlock.java similarity index 100% rename from src/main/java/binnie/extratrees/carpentry/DesignBlock.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/DesignBlock.java diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java similarity index 97% rename from src/main/java/binnie/extratrees/carpentry/DesignSystem.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index fc8c7622..998e40a9 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -4,6 +4,8 @@ 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; diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/extratrees/src/main/java/binnie/extratrees/carpentry/EnumDesign.java similarity index 99% rename from src/main/java/binnie/extratrees/carpentry/EnumDesign.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index a608b322..c5ad5580 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -8,6 +8,8 @@ import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.carpentry.EnumPattern; +import binnie.extratrees.api.carpentry.Layout; public enum EnumDesign implements IDesign { Blank("blank"), diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java similarity index 81% rename from src/main/java/binnie/extratrees/carpentry/GlassType.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java index 8ec7e1f8..6fd959ee 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -4,17 +4,27 @@ import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; +import binnie.botany.api.genetics.EnumFlowerColor; +import binnie.core.Constants; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.modules.ModuleCeramic; -import binnie.core.block.TileEntityMetadata; + +import binnie.core.api.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; public class GlassType implements IDesignMaterial { static Map types; + @ObjectHolder(Constants.BOTANY_MOD_ID) + public static final class Botany { + @ObjectHolder("stained") + @Nullable + public static final Block stained = Blocks.AIR; + } + static { GlassType.types = new LinkedHashMap<>(); for (final StandardColor c : StandardColor.values()) { @@ -63,7 +73,11 @@ public class GlassType implements IDesignMaterial { if (this.id < 128) { return new ItemStack(Blocks.STAINED_GLASS, 1, this.id); } - return TileEntityMetadata.getItemStack(ModuleCeramic.stained, this.id - 128); + Block stained = Botany.stained; + if (stained != null) { + return TileEntityMetadata.getItemStack(stained, this.id - 128); + } + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java b/extratrees/src/main/java/binnie/extratrees/carpentry/ItemDesign.java similarity index 93% rename from src/main/java/binnie/extratrees/carpentry/ItemDesign.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/ItemDesign.java index 8287280a..55b5c552 100644 --- a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/ItemDesign.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.IColoredItem; import binnie.core.block.ItemMetadata; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; public class ItemDesign extends ItemMetadata implements IColoredItem { diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/extratrees/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java similarity index 96% rename from src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 6bdbd78a..fb397140 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -9,16 +9,16 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; -import binnie.Constants; -import binnie.core.block.TileEntityMetadata; +import binnie.core.Constants; +import binnie.core.api.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.CARPENTRY, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Carpentry", unlocalizedDescription = "extratrees.module.carpentry") public class ModuleCarpentry extends Module { diff --git a/src/main/java/binnie/extratrees/carpentry/package-info.java b/extratrees/src/main/java/binnie/extratrees/carpentry/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/carpentry/package-info.java rename to extratrees/src/main/java/binnie/extratrees/carpentry/package-info.java diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java similarity index 71% rename from src/main/java/binnie/extratrees/config/ConfigurationMain.java rename to extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java index 56c65da3..c8ad45e8 100644 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -1,8 +1,8 @@ package binnie.extratrees.config; -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropBoolean; +import binnie.core.config.ConfigFile; +import binnie.core.config.ConfigProperty; +import binnie.core.config.PropBoolean; @ConfigFile(filename = "/config/forestry/extratrees/main.conf") public class ConfigurationMain { diff --git a/src/main/java/binnie/extratrees/config/package-info.java b/extratrees/src/main/java/binnie/extratrees/config/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/config/package-info.java rename to extratrees/src/main/java/binnie/extratrees/config/package-info.java diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/extratrees/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java similarity index 97% rename from src/main/java/binnie/extratrees/core/ExtraTreeTexture.java rename to extratrees/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index bd24d9a2..81784dce 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/extratrees/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/extratrees/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java similarity index 100% rename from src/main/java/binnie/extratrees/core/ExtraTreesGUID.java rename to extratrees/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/extratrees/src/main/java/binnie/extratrees/core/ModuleCore.java similarity index 98% rename from src/main/java/binnie/extratrees/core/ModuleCore.java rename to extratrees/src/main/java/binnie/extratrees/core/ModuleCore.java index ca73b01c..2f6771d9 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/extratrees/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -18,8 +18,8 @@ import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.IStillManager; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.Mods; import binnie.core.item.ItemMisc; import binnie.core.liquid.ManagerLiquid; @@ -33,8 +33,8 @@ import binnie.extratrees.item.ItemETFood; import binnie.extratrees.item.ItemHammer; import binnie.extratrees.item.ItemHops; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.CORE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, coreModule = true, name = "Core", unlocalizedDescription = "extratrees.module.core") public class ModuleCore extends Module { diff --git a/src/main/java/binnie/extratrees/core/package-info.java b/extratrees/src/main/java/binnie/extratrees/core/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/core/package-info.java rename to extratrees/src/main/java/binnie/extratrees/core/package-info.java diff --git a/src/main/java/binnie/extratrees/gen/TreeGenBase.java b/extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/TreeGenBase.java rename to extratrees/src/main/java/binnie/extratrees/gen/TreeGenBase.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenAlder.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenAlder.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenAlder.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenApple.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenApple.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenApple.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenAsh.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenAsh.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenAsh.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenBanana.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenBanana.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenBanana.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenBeech.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenBeech.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenBeech.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenConifer.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenConifer.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenConifer.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenDefault.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenDefault.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenDefault.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenFir.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenFir.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenFir.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenFir.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenHolly.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenHolly.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenHolly.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenJungle.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenJungle.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenJungle.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenLazy.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenLazy.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenLazy.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenMaple.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenMaple.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenMaple.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenPalm.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenPalm.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenPalm.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenPoplar.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPrune.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenPrune.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenPrune.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenPrune.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenShrub.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenShrub.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenShrub.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenSorbus.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenSpruce.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTilia.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTilia.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenTilia.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenTilia.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenTree.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree2.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree2.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenTree2.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree2.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree3.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree3.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenTree3.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenTree3.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTropical.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenTropical.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenTropical.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenTropical.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenUtils.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenUtils.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenUtils.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenUtils.java diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/extratrees/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/WorldGenWalnut.java rename to extratrees/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java diff --git a/src/main/java/binnie/extratrees/gen/package-info.java b/extratrees/src/main/java/binnie/extratrees/gen/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/gen/package-info.java rename to extratrees/src/main/java/binnie/extratrees/gen/package-info.java diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java similarity index 99% rename from src/main/java/binnie/extratrees/genetics/AlleleETFruit.java rename to extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 33c4c232..7e6e88d7 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -1,5 +1,6 @@ package binnie.extratrees.genetics; +import binnie.extratrees.ExtraTrees; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -34,8 +35,7 @@ import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; import forestry.core.genetics.alleles.AlleleCategorized; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.I18N; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; @@ -304,7 +304,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF throw new RuntimeException(e); } } - for (final IAlleleSpecies tree : Binnie.GENETICS.treeBreedingSystem.getAllSpecies()) { + for (final IAlleleSpecies tree : ExtraTrees.treeBreedingSystem.getAllSpecies()) { if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/extratrees/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java similarity index 99% rename from src/main/java/binnie/extratrees/genetics/ButterflySpecies.java rename to extratrees/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index e71dd057..51d1f523 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -22,7 +22,7 @@ import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.IButterflyDefinition; import forestry.lepidopterology.genetics.MothDefinition; -import binnie.Constants; +import binnie.core.Constants; public enum ButterflySpecies implements IButterflyDefinition { White_Admiral("White Admiral", "Limenitis camilla", 16448250), diff --git a/src/main/java/binnie/extratrees/genetics/ETFruitFamily.java b/extratrees/src/main/java/binnie/extratrees/genetics/ETFruitFamily.java similarity index 100% rename from src/main/java/binnie/extratrees/genetics/ETFruitFamily.java rename to extratrees/src/main/java/binnie/extratrees/genetics/ETFruitFamily.java diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/extratrees/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java similarity index 100% rename from src/main/java/binnie/extratrees/genetics/ETLeafProvider.java rename to extratrees/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java similarity index 99% rename from src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java rename to extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 860f0cea..94dcd09c 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -53,7 +53,7 @@ import forestry.arboriculture.worldgen.WorldGenPlum; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.tiles.TileUtil; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.EnumShrubLog; diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java similarity index 100% rename from src/main/java/binnie/extratrees/genetics/EnumSaplingType.java rename to extratrees/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java similarity index 98% rename from src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java rename to extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 6304a97e..0b371445 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import forestry.api.arboriculture.TreeManager; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -18,8 +19,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; -import binnie.Binnie; - public class ExtraTreeMutation implements ITreeMutation { int chance; boolean isSecret; @@ -33,7 +32,7 @@ public class ExtraTreeMutation implements ITreeMutation { private float height; public ExtraTreeMutation(final IAlleleSpecies allele0, final IAlleleSpecies allele1, final IAlleleSpecies result, final int chance) { - this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result), chance); + this(allele0, allele1, TreeManager.treeRoot.getTemplate(result), chance); } public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { @@ -47,7 +46,7 @@ public class ExtraTreeMutation implements ITreeMutation { this.allele1 = (IAlleleTreeSpecies) allele1; this.template = template; this.chance = chance; - Binnie.GENETICS.getTreeRoot().registerMutation(this); + TreeManager.treeRoot.registerMutation(this); } public static void init() { @@ -238,7 +237,7 @@ public class ExtraTreeMutation implements ITreeMutation { @Override public ITreeRoot getRoot() { - return Binnie.GENETICS.getTreeRoot(); + return TreeManager.treeRoot; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/extratrees/src/main/java/binnie/extratrees/genetics/FruitSprite.java similarity index 96% rename from src/main/java/binnie/extratrees/genetics/FruitSprite.java rename to extratrees/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 850aa2df..9f86faf0 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -9,7 +9,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; public enum FruitSprite { TINY, diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java similarity index 92% rename from src/main/java/binnie/core/genetics/MothBreedingSystem.java rename to extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java index b67d62aa..05483c26 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/MothBreedingSystem.java @@ -1,7 +1,11 @@ -package binnie.core.genetics; +package binnie.extratrees.genetics; import java.util.TreeSet; +import binnie.core.genetics.BreedingSystem; +import binnie.core.genetics.ForestryAllele; +import binnie.core.genetics.Tolerance; +import forestry.api.lepidopterology.ButterflyManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,11 +21,11 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.ILepidopteristTracker; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; -class MothBreedingSystem extends BreedingSystem { +public class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscovered_moth"); this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discovered_moth"); @@ -34,7 +38,7 @@ class MothBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.GENETICS.getButterflyRoot(); + return ButterflyManager.butterflyRoot; } @Override diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java similarity index 98% rename from src/main/java/binnie/core/genetics/TreeBreedingSystem.java rename to extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java index 6b1dccd0..6725dfbc 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/TreeBreedingSystem.java @@ -1,4 +1,4 @@ -package binnie.core.genetics; +package binnie.extratrees.genetics; import javax.annotation.Nullable; import java.util.ArrayList; @@ -8,6 +8,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import binnie.core.genetics.BreedingSystem; +import binnie.core.genetics.ForestryAllele; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -34,7 +36,7 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.ExtraTrees; @@ -67,7 +69,7 @@ public class TreeBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.GENETICS.getTreeRoot(); + return TreeManager.treeRoot; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java similarity index 100% rename from src/main/java/binnie/extratrees/genetics/WoodProvider.java rename to extratrees/src/main/java/binnie/extratrees/genetics/WoodProvider.java diff --git a/src/main/java/binnie/extratrees/genetics/package-info.java b/extratrees/src/main/java/binnie/extratrees/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/genetics/package-info.java rename to extratrees/src/main/java/binnie/extratrees/genetics/package-info.java diff --git a/src/main/java/binnie/extratrees/gui/WindowSetSquare.java b/extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/WindowSetSquare.java rename to extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java diff --git a/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java b/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java diff --git a/src/main/java/binnie/extratrees/gui/database/PageFruit.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java similarity index 75% rename from src/main/java/binnie/extratrees/gui/database/PageFruit.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java index 4cb7c792..2c5e00bd 100644 --- a/src/main/java/binnie/extratrees/gui/database/PageFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; @@ -35,7 +35,13 @@ public class PageFruit extends PageAbstract { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), I18N.localise("extratrees.gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MIDDLE_CENTER); - final Collection trees = this.treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); + TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem(); + final Collection trees; + if (this.treesThatBearFruit) { + trees = breedingSystem.getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); + } else { + trees = breedingSystem.getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); + } new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java diff --git a/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java similarity index 80% rename from src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java index c13846de..11963736 100644 --- a/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; @@ -31,7 +31,8 @@ public class PagePlanksTrees extends PageAbstract { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), species.getDisplayName(), TextJustification.MIDDLE_CENTER); - final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); + TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem(); + final Collection trees = breedingSystem.getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java diff --git a/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java similarity index 94% rename from src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java index a4cb639d..b3861d85 100644 --- a/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.extratrees.ExtraTrees; +import forestry.api.arboriculture.TreeManager; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -22,8 +25,6 @@ import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; @@ -53,11 +54,11 @@ public class PageSpeciesTreeGenome extends PageSpecies { @Override public void onValueChanged(final IAlleleSpecies species) { this.deleteAllChildren(); - final IAllele[] template = Binnie.GENETICS.getTreeRoot().getTemplate(species.getUID()); + final IAllele[] template = TreeManager.treeRoot.getTemplate(species.getUID()); if (template == null) { return; } - final ITree tree = Binnie.GENETICS.getTreeRoot().templateAsIndividual(template); + final ITree tree = TreeManager.treeRoot.templateAsIndividual(template); final ITreeGenome genome = tree.getGenome(); final IAlleleTreeSpecies treeSpecies = genome.getPrimary(); @@ -72,7 +73,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { int y = 0; final int th = 14; final int th2 = 18; - final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem; + final IBreedingSystem syst = ExtraTrees.treeBreedingSystem; new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFT); y += th; new ControlText(contents, new Area(0, y, w2, th), I18N.localise("binniecore.gui.temperature.short") + " : ", TextJustification.MIDDLE_RIGHT); diff --git a/src/main/java/binnie/extratrees/gui/database/PageWood.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java similarity index 80% rename from src/main/java/binnie/extratrees/gui/database/PageWood.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java index e7899dd4..7aa05478 100644 --- a/src/main/java/binnie/extratrees/gui/database/PageWood.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; @@ -31,7 +31,8 @@ public class PageWood extends PageAbstract { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), this.getValue().toString(), TextJustification.MIDDLE_CENTER); - final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); + TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem(); + final Collection trees = breedingSystem.getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java similarity index 92% rename from src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index ebb3ac26..76098487 100644 --- a/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -8,9 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.database.ControlItemStackOption; @@ -37,7 +36,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxPlanks; public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.GENETICS.treeBreedingSystem, 120); + super(player, side, nei, ExtraTrees.treeBreedingSystem, 120); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { @@ -65,7 +64,8 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { return new ControlItemStackOption(this.getContent(), value, y); } }; - controlListBox.setOptions(((TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem()).allFruits); + TreeBreedingSystem breedingSystem = (TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem(); + controlListBox.setOptions(breedingSystem.allFruits); this.listBox = controlListBox; } }); @@ -79,7 +79,8 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { return new ControlItemStackOption(this.getContent(), value, y); } }; - controlListBox.setOptions(((TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem()).allWoods); + TreeBreedingSystem breedingSystem = (TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem(); + controlListBox.setOptions(breedingSystem.allWoods); this.listBox = controlListBox; } }); diff --git a/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java similarity index 96% rename from src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java index 568bb326..bf29f1d2 100644 --- a/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageBranchOverview; @@ -21,7 +20,7 @@ import binnie.extratrees.ExtraTrees; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.GENETICS.mothBreedingSystem, 160); + super(player, side, nei, ExtraTrees.mothBreedingSystem, 160); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/extratrees/gui/database/package-info.java b/extratrees/src/main/java/binnie/extratrees/gui/database/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/database/package-info.java rename to extratrees/src/main/java/binnie/extratrees/gui/database/package-info.java diff --git a/src/main/java/binnie/extratrees/gui/package-info.java b/extratrees/src/main/java/binnie/extratrees/gui/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/gui/package-info.java rename to extratrees/src/main/java/binnie/extratrees/gui/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java similarity index 93% rename from src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java index 70733e18..0f888ac9 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java @@ -7,14 +7,14 @@ import java.util.Set; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Optional; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.integration.crafttweaker.handlers.BreweryRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.DistilleryRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.FruitPressRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.LumbermillRecipeHandler; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; import crafttweaker.CraftTweakerAPI; @BinnieModule(moduleID = ExtraTreesModuleUIDs.CRAFT_TWEAKER, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Craft Tweaker", unlocalizedDescription = "extratrees.module.crafttweaker") diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java b/extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java rename to extratrees/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index b2386961..a01bafbd --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.integration.jei.Drawables; import binnie.extratrees.alcohol.ModuleAlcohol; import binnie.extratrees.block.ModuleBlocks; @@ -25,7 +25,7 @@ import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeMaker; import binnie.extratrees.integration.jei.multifence.MultiFenceRecipeRegistryPlugin; import binnie.extratrees.machines.ExtraTreeMachine; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; diff --git a/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/RecipeUids.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/package-info.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/integration/jei/package-info.java rename to extratrees/src/main/java/binnie/extratrees/integration/jei/package-info.java diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/extratrees/src/main/java/binnie/extratrees/item/ExtraTreeItems.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ExtraTreeItems.java rename to extratrees/src/main/java/binnie/extratrees/item/ExtraTreeItems.java diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/extratrees/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java similarity index 96% rename from src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java rename to extratrees/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index 5ae56efc..6831bfca 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/extratrees/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -4,8 +4,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.ILiquidType; diff --git a/src/main/java/binnie/extratrees/item/Food.java b/extratrees/src/main/java/binnie/extratrees/item/Food.java similarity index 100% rename from src/main/java/binnie/extratrees/item/Food.java rename to extratrees/src/main/java/binnie/extratrees/item/Food.java diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/extratrees/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemArboristDatabase.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/extratrees/src/main/java/binnie/extratrees/item/ItemETFood.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemETFood.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemETFood.java diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/extratrees/src/main/java/binnie/extratrees/item/ItemHammer.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemHammer.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemHammer.java diff --git a/src/main/java/binnie/extratrees/item/ItemHops.java b/extratrees/src/main/java/binnie/extratrees/item/ItemHops.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemHops.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemHops.java diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/extratrees/src/main/java/binnie/extratrees/item/ItemMothDatabase.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemMothDatabase.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemMothDatabase.java diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/extratrees/src/main/java/binnie/extratrees/item/ItemSetSquare.java similarity index 100% rename from src/main/java/binnie/extratrees/item/ItemSetSquare.java rename to extratrees/src/main/java/binnie/extratrees/item/ItemSetSquare.java diff --git a/src/main/java/binnie/extratrees/item/package-info.java b/extratrees/src/main/java/binnie/extratrees/item/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/item/package-info.java rename to extratrees/src/main/java/binnie/extratrees/item/package-info.java diff --git a/src/main/java/binnie/extratrees/kitchen/BottleRack.java b/extratrees/src/main/java/binnie/extratrees/kitchen/BottleRack.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/BottleRack.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/BottleRack.java diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java old mode 100755 new mode 100644 similarity index 65% rename from src/main/java/binnie/extratrees/kitchen/KitchenMachine.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index 5eb2e920..a093c134 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -1,6 +1,6 @@ package binnie.extratrees.kitchen; -import javax.annotation.Nullable; +import java.util.function.Supplier; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,25 +11,19 @@ import binnie.core.machines.TileEntityMachine; public enum KitchenMachine implements IMachineType { // TODO implement - Worktop(null), - Cupboard(null), - BottleRack(BottleRack.PackageBottleRack.class); + Worktop(() -> null), + Cupboard(() -> null), + BottleRack(binnie.extratrees.kitchen.BottleRack.PackageBottleRack::new); - @Nullable - Class clss; + private final Supplier supplier; - KitchenMachine(@Nullable final Class clss) { - this.clss = clss; + KitchenMachine(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - return this.clss != null; + public Supplier getSupplier() { + return supplier; } public ItemStack get(final int i) { diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/extratrees/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java similarity index 88% rename from src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index 5edba75f..5ea02499 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -3,10 +3,10 @@ package binnie.extratrees.kitchen; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import binnie.Constants; +import binnie.core.Constants; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.KITCHEN, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Kitchen", unlocalizedDescription = "extratrees.module.kitchen") public class ModuleKitchen extends Module { diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java diff --git a/src/main/java/binnie/extratrees/kitchen/package-info.java b/extratrees/src/main/java/binnie/extratrees/kitchen/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/kitchen/package-info.java rename to extratrees/src/main/java/binnie/extratrees/kitchen/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/DummyManagers.java b/extratrees/src/main/java/binnie/extratrees/machines/DummyManagers.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/DummyManagers.java rename to extratrees/src/main/java/binnie/extratrees/machines/DummyManagers.java diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java old mode 100755 new mode 100644 similarity index 58% rename from src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index 6473cecc..a6810929 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,13 +1,16 @@ package binnie.extratrees.machines; +import java.util.function.Supplier; + +import binnie.extratrees.machines.designer.DesignerType; +import binnie.extratrees.machines.designer.PackageDesigner; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import binnie.Constants; -import binnie.botany.modules.BotanyModuleUIDs; +import binnie.core.Constants; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; @@ -17,44 +20,50 @@ import binnie.core.machines.component.IInteraction; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.brewery.BreweryMachine; -import binnie.extratrees.machines.designer.Designer; import binnie.extratrees.machines.distillery.DistilleryMachine; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import binnie.extratrees.machines.lumbermill.LumbermillMachine; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; public enum ExtraTreeMachine implements IMachineType { - Lumbermill(LumbermillMachine.class), - Woodworker(Designer.PackageWoodworker.class), - Panelworker(Designer.PackagePanelworker.class), - Nursery(binnie.extratrees.machines.nursery.Nursery.PackageNursery.class), - Press(FruitPressMachine.class), - BREWERY(BreweryMachine.class), - Distillery(DistilleryMachine.class), - Glassworker(Designer.PackageGlassworker.class), - Tileworker(Designer.PackageTileworker.class); + Lumbermill(LumbermillMachine::new), + Woodworker(() -> { + if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) { + return new PackageDesigner(DesignerType.Woodworker); + } + return null; + }), + Panelworker(() -> { + if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) { + return new PackageDesigner(DesignerType.Panelworker); + } + return null; + }), + Nursery(() -> { + // TODO: implement + // binnie.extratrees.machines.nursery.Nursery.PackageNursery::new + return null; + }), + Press(FruitPressMachine::new), + BREWERY(BreweryMachine::new), + Distillery(DistilleryMachine::new), + Glassworker(() -> { + if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) { + return new PackageDesigner(DesignerType.GlassWorker); + } + return null; + }); - Class clss; + Supplier supplier; - ExtraTreeMachine(final Class clss) { - this.clss = clss; + ExtraTreeMachine(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - if (this == ExtraTreeMachine.Tileworker) { - return ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.CERAMIC); - } - if(this == Glassworker || this == Woodworker || this == Panelworker){ - return ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY); - } - return this != ExtraTreeMachine.Nursery; + public Supplier getSupplier() { + return this.supplier; } public ItemStack get(final int i) { diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java similarity index 98% rename from src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java rename to extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java index ef6a333e..0e5199c2 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines; import javax.annotation.Nullable; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.machines.errors.CoreErrorCode; import binnie.core.machines.errors.EnumErrorType; import binnie.core.machines.errors.ErrorStateRegistry; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/ModuleMachine.java similarity index 92% rename from src/main/java/binnie/extratrees/machines/ModuleMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 99fbf165..789ad1c6 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -6,7 +6,7 @@ import net.minecraft.init.Items; import forestry.api.core.Tabs; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.machines.MachineGroup; @@ -21,9 +21,9 @@ import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager; import binnie.extratrees.machines.nursery.TileEntityNursery; import binnie.extratrees.modules.ExtraTreesModuleUIDs; -import binnie.modules.BinnieModule; -import binnie.modules.Module; -import binnie.modules.ModuleManager; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; +import binnie.core.modules.ModuleManager; @BinnieModule(moduleID = ExtraTreesModuleUIDs.MACHINES, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Machines", unlocalizedDescription = "extratrees.module.machines") public class ModuleMachine extends Module { @@ -70,7 +70,6 @@ public class ModuleMachine extends Module { recipeUtil.addRecipe("woodworker", ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing")); recipeUtil.addRecipe("panelworker", ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing")); recipeUtil.addRecipe("glassworker", ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing")); - recipeUtil.addRecipe("tileworker", ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing")); } LumbermillRecipeManager.calculateProducts(); } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java similarity index 99% rename from src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java index 80977097..933d9dfc 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.liquid.ManagerLiquid; import binnie.core.util.FluidStackUtil; import binnie.core.util.OreDictionaryUtil; diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryCrafting.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryGrain.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryIngredient.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/SlotValidatorBreweryYeast.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentInput.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentInput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentInput.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentInput.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentOutput.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentOutput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentOutput.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/TankValidatorFermentOutput.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/WindowBrewery.java diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/brewery/window/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/Designer.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/Designer.java new file mode 100644 index 00000000..eded3d8f --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/Designer.java @@ -0,0 +1,7 @@ +package binnie.extratrees.machines.designer; + +public abstract class Designer { + public static int BEESWAX_SLOT = 0; + public static int DESIGN_SLOT_1 = 1; + public static int DESIGN_SLOT_2 = 2; +} diff --git a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/DesignerType.java similarity index 82% rename from src/main/java/binnie/extratrees/machines/designer/DesignerType.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/DesignerType.java index 19296796..2f001b38 100644 --- a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/DesignerType.java @@ -2,8 +2,6 @@ package binnie.extratrees.machines.designer; import net.minecraft.item.ItemStack; -import binnie.botany.ceramic.CeramicDesignSystem; -import binnie.botany.modules.ModuleCeramic; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; @@ -13,11 +11,10 @@ import binnie.extratrees.carpentry.DesignSystem; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.carpentry.ModuleCarpentry; -public enum DesignerType { +public enum DesignerType implements IDesignerType { Woodworker("woodworker"), Panelworker("panelworker"), - GlassWorker("glassworker"), - Tileworker("tileworker"); + GlassWorker("glassworker"); private final String name; @@ -25,20 +22,19 @@ public enum DesignerType { this.name = name; } + @Override public IDesignSystem getSystem() { switch (this) { case GlassWorker: { return DesignSystem.Glass; } - case Tileworker: { - return CeramicDesignSystem.instance; - } default: { return DesignSystem.Wood; } } } + @Override public ItemStack getBlock(final IDesignMaterial type1, IDesignMaterial type2, final IDesign design) { int stackSize = 2; if (design == EnumDesign.Blank) { @@ -58,19 +54,18 @@ public enum DesignerType { case Panelworker: { return ModuleCarpentry.blockPanel; } - case Tileworker: { - return ModuleCeramic.ceramicTile; - } default: { return ModuleCarpentry.blockCarpentry; } } } + @Override public ItemStack getDisplayStack(final IDesign design) { return this.getBlock(this.getSystem().getDefaultMaterial(), this.getSystem().getDefaultMaterial2(), design); } + @Override public String getMaterialTooltip() { switch (this) { case GlassWorker: { @@ -79,9 +74,6 @@ public enum DesignerType { case Panelworker: { return I18N.localise("extratrees.machine.machine.designer.material.panel"); } - case Tileworker: { - return I18N.localise("extratrees.machine.machine.designer.material.tile"); - } case Woodworker: { return I18N.localise("extratrees.machine.machine.designer.material.wood"); } @@ -91,6 +83,7 @@ public enum DesignerType { } } + @Override public String getName() { return name; } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/IDesignerType.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/IDesignerType.java new file mode 100644 index 00000000..d62af8f2 --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/IDesignerType.java @@ -0,0 +1,14 @@ +package binnie.extratrees.machines.designer; + +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import net.minecraft.item.ItemStack; + +public interface IDesignerType { + IDesignSystem getSystem(); + ItemStack getBlock(IDesignMaterial type1, IDesignMaterial type2, IDesign design); + String getMaterialTooltip(); + ItemStack getDisplayStack(final IDesign design); + String getName(); +} diff --git a/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java similarity index 85% rename from src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java index d3815f20..6b699816 100644 --- a/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java @@ -9,10 +9,10 @@ import binnie.extratrees.machines.designer.window.ComponentDesignerRecipe; import binnie.extratrees.machines.designer.window.SlotValidatorBeeswax; import binnie.extratrees.machines.designer.window.SlotValidatorPlanks; -public abstract class PackageDesigner extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { - DesignerType type; +public final class PackageDesigner extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { + private final IDesignerType type; - public PackageDesigner(final DesignerType type) { + public PackageDesigner(final IDesignerType type) { super(type.getName(), false); this.type = type; } diff --git a/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java similarity index 95% rename from src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java index 9d73b729..297eadce 100644 --- a/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java @@ -3,6 +3,7 @@ package binnie.extratrees.machines.designer.window; import javax.annotation.Nullable; import java.util.Map; +import binnie.extratrees.machines.designer.IDesignerType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -21,13 +22,12 @@ import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.machines.ExtraTreesErrorCode; import binnie.extratrees.machines.designer.Designer; -import binnie.extratrees.machines.designer.DesignerType; public class ComponentDesignerRecipe extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource { - public DesignerType type; + public IDesignerType type; private IDesign design; - public ComponentDesignerRecipe(final Machine machine, final DesignerType type) { + public ComponentDesignerRecipe(final Machine machine, final IDesignerType type) { super(machine); this.design = EnumDesign.Diamond; this.type = type; @@ -148,7 +148,7 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone } } - public DesignerType getDesignerType() { + public IDesignerType getDesignerType() { return this.type; } } \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java diff --git a/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java diff --git a/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java similarity index 78% rename from src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java index 9c5fded5..d761d7d8 100644 --- a/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.designer.window; +import binnie.extratrees.machines.designer.IDesignerType; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; import binnie.extratrees.machines.ModuleMachine; -import binnie.extratrees.machines.designer.DesignerType; public class SlotValidatorBeeswax extends SlotValidator { - DesignerType type; + private final IDesignerType type; - public SlotValidatorBeeswax(final DesignerType type) { + public SlotValidatorBeeswax(final IDesignerType type) { super(ModuleMachine.spritePolish); this.type = type; } diff --git a/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java similarity index 79% rename from src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java index 43f39b91..8d68f6db 100644 --- a/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.designer.window; +import binnie.extratrees.machines.designer.IDesignerType; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.machines.designer.DesignerType; public class SlotValidatorPlanks extends SlotValidator { - DesignerType type; + private final IDesignerType type; - public SlotValidatorPlanks(final DesignerType type) { + public SlotValidatorPlanks(final IDesignerType type) { super(SlotValidator.spriteBlock); this.type = type; } diff --git a/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java similarity index 96% rename from src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java index e23bb31a..56253abe 100644 --- a/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java @@ -2,6 +2,7 @@ package binnie.extratrees.machines.designer.window; import javax.annotation.Nullable; +import binnie.extratrees.machines.designer.IDesignerType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -27,7 +28,6 @@ import binnie.core.machines.Machine; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.designer.Designer; -import binnie.extratrees.machines.designer.DesignerType; public class WindowDesigner extends Window { ControlTextEdit textEdit; @@ -77,7 +77,7 @@ public class WindowDesigner extends Window { return "Woodworker"; } - public DesignerType getDesignerType() { + public IDesignerType getDesignerType() { return Machine.getInterface(ComponentDesignerRecipe.class, this.getInventory()).getDesignerType(); } } diff --git a/src/main/java/binnie/extratrees/machines/designer/window/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/designer/window/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/designer/window/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/distillery/window/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/Infuser.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/Infuser.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/Infuser.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/Infuser.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserMachine.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/InfuserRecipes.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserInput.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserInput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserInput.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserInput.java diff --git a/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserOutput.java b/extratrees/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserOutput.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserOutput.java rename to extratrees/src/main/java/binnie/extratrees/machines/infuser/TankValidatorInfuserOutput.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/WindowLumbermill.java diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java rename to extratrees/src/main/java/binnie/extratrees/machines/nursery/ModelNursery.java diff --git a/src/main/java/binnie/extratrees/machines/nursery/Nursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/nursery/Nursery.java rename to extratrees/src/main/java/binnie/extratrees/machines/nursery/Nursery.java diff --git a/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java rename to extratrees/src/main/java/binnie/extratrees/machines/nursery/TileEntityNursery.java diff --git a/src/main/java/binnie/extratrees/machines/nursery/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/nursery/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/nursery/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/nursery/package-info.java diff --git a/src/main/java/binnie/extratrees/machines/package-info.java b/extratrees/src/main/java/binnie/extratrees/machines/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/machines/package-info.java rename to extratrees/src/main/java/binnie/extratrees/machines/package-info.java diff --git a/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java b/extratrees/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java similarity index 100% rename from src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java rename to extratrees/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/extratrees/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java similarity index 100% rename from src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java rename to extratrees/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java diff --git a/src/main/java/binnie/extratrees/models/ModelMultiFence.java b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java similarity index 99% rename from src/main/java/binnie/extratrees/models/ModelMultiFence.java rename to extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java index e7e1618d..c950c747 100644 --- a/src/main/java/binnie/extratrees/models/ModelMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java @@ -17,7 +17,7 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.ModelBlockCached; -import binnie.core.block.TileEntityMetadata; +import binnie.core.api.block.TileEntityMetadata; import binnie.core.models.AABBModelBaker; import binnie.core.models.ModelManager; import binnie.extratrees.block.WoodManager; diff --git a/src/main/java/binnie/extratrees/models/package-info.java b/extratrees/src/main/java/binnie/extratrees/models/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/models/package-info.java rename to extratrees/src/main/java/binnie/extratrees/models/package-info.java diff --git a/src/main/java/binnie/extratrees/modules/ExtraTreesModuleUIDs.java b/extratrees/src/main/java/binnie/extratrees/modules/ExtraTreesModuleUIDs.java similarity index 100% rename from src/main/java/binnie/extratrees/modules/ExtraTreesModuleUIDs.java rename to extratrees/src/main/java/binnie/extratrees/modules/ExtraTreesModuleUIDs.java diff --git a/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java similarity index 91% rename from src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java rename to extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java index c4755a82..4b4b9149 100644 --- a/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java @@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack; import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.BinnieCore; import binnie.core.liquid.ManagerLiquid; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ItemMothDatabase; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.MOTH_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.moth") public class ModuleMothDatabase extends Module { diff --git a/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java similarity index 90% rename from src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java rename to extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java index 3df30090..efc9c81f 100644 --- a/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java @@ -8,13 +8,13 @@ import net.minecraft.item.ItemStack; import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.liquid.ManagerLiquid; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ItemArboristDatabase; -import binnie.modules.BinnieModule; -import binnie.modules.Module; +import binnie.core.modules.BinnieModule; +import binnie.core.modules.Module; @BinnieModule(moduleID = ExtraTreesModuleUIDs.TREE_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.tree") public class ModuleTreeDatabase extends Module { diff --git a/src/main/java/binnie/extratrees/package-info.java b/extratrees/src/main/java/binnie/extratrees/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/package-info.java rename to extratrees/src/main/java/binnie/extratrees/package-info.java diff --git a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java b/extratrees/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java similarity index 100% rename from src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java rename to extratrees/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java diff --git a/src/main/java/binnie/extratrees/proxy/Proxy.java b/extratrees/src/main/java/binnie/extratrees/proxy/Proxy.java similarity index 100% rename from src/main/java/binnie/extratrees/proxy/Proxy.java rename to extratrees/src/main/java/binnie/extratrees/proxy/Proxy.java diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java similarity index 99% rename from src/main/java/binnie/extratrees/proxy/ProxyClient.java rename to extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java index 3df171b6..e3808b11 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/extratrees/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.arboriculture.PluginArboriculture; import forestry.core.models.BlockModelEntry; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.models.ModelManager; import binnie.extratrees.block.BlockETDecorativeLeaves; import binnie.extratrees.block.BlockETDefaultLeaves; diff --git a/src/main/java/binnie/extratrees/proxy/ProxyServer.java b/extratrees/src/main/java/binnie/extratrees/proxy/ProxyServer.java similarity index 100% rename from src/main/java/binnie/extratrees/proxy/ProxyServer.java rename to extratrees/src/main/java/binnie/extratrees/proxy/ProxyServer.java diff --git a/src/main/java/binnie/extratrees/proxy/package-info.java b/extratrees/src/main/java/binnie/extratrees/proxy/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/proxy/package-info.java rename to extratrees/src/main/java/binnie/extratrees/proxy/package-info.java diff --git a/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java b/extratrees/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java similarity index 100% rename from src/main/java/binnie/extratrees/village/ComponentVillageGrove.java rename to extratrees/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java diff --git a/src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java similarity index 97% rename from src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java rename to extratrees/src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java index 0c38b647..c1c46114 100644 --- a/src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/village/VillageCreationExtraTrees.java @@ -12,7 +12,7 @@ import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.fml.common.registry.VillagerRegistry; -import binnie.Constants; +import binnie.core.Constants; public class VillageCreationExtraTrees implements VillagerRegistry.IVillageCreationHandler { diff --git a/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java similarity index 100% rename from src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java rename to extratrees/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java diff --git a/src/main/java/binnie/extratrees/village/VillageHopeField.java b/extratrees/src/main/java/binnie/extratrees/village/VillageHopeField.java similarity index 100% rename from src/main/java/binnie/extratrees/village/VillageHopeField.java rename to extratrees/src/main/java/binnie/extratrees/village/VillageHopeField.java diff --git a/src/main/java/binnie/extratrees/village/package-info.java b/extratrees/src/main/java/binnie/extratrees/village/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/village/package-info.java rename to extratrees/src/main/java/binnie/extratrees/village/package-info.java diff --git a/src/main/java/binnie/extratrees/worldgen/BlockType.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/BlockType.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/BlockType.java diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java b/extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java b/extratrees/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java diff --git a/src/main/java/binnie/extratrees/worldgen/package-info.java b/extratrees/src/main/java/binnie/extratrees/worldgen/package-info.java similarity index 100% rename from src/main/java/binnie/extratrees/worldgen/package-info.java rename to extratrees/src/main/java/binnie/extratrees/worldgen/package-info.java diff --git a/src/main/resources/assets/extratrees/blockstates/germlings.json b/extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/germlings.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/beermug.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/beermug.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/beermug.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/beermug.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/cocktail.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/cocktail.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/cocktail.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/cocktail.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/collins.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/collins.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/collins.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/collins.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/cordial.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/cordial.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/cordial.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/cordial.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/coupe.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/coupe.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/coupe.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/coupe.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/flute.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/flute.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/flute.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/flute.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/highball.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/highball.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/highball.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/highball.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/hurricane.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/hurricane.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/hurricane.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/hurricane.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/margarita.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/margarita.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/margarita.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/margarita.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/oldfashioned.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/oldfashioned.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/oldfashioned.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/oldfashioned.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/pint.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/pint.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/pint.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/pint.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/sherry.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/sherry.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/sherry.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/sherry.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/shot.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/shot.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/shot.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/shot.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/snifter.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/snifter.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/snifter.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/snifter.json diff --git a/src/main/resources/assets/extratrees/blockstates/glassware/wine.json b/extratrees/src/main/resources/assets/extratrees/blockstates/glassware/wine.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/glassware/wine.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/glassware/wine.json diff --git a/src/main/resources/assets/extratrees/blockstates/hops.json b/extratrees/src/main/resources/assets/extratrees/blockstates/hops.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/hops.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/hops.json diff --git a/src/main/resources/assets/extratrees/blockstates/machine.json b/extratrees/src/main/resources/assets/extratrees/blockstates/machine.json similarity index 91% rename from src/main/resources/assets/extratrees/blockstates/machine.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/machine.json index fb79cf6b..0b3dc972 100644 --- a/src/main/resources/assets/extratrees/blockstates/machine.json +++ b/extratrees/src/main/resources/assets/extratrees/blockstates/machine.json @@ -48,11 +48,7 @@ "texture": "extratrees:blocks/paneler" } }, - "8": { - "textures":{ - "texture": "extratrees:blocks/tileworker" - } - }, + "8": {}, "9": {}, "10": {}, "11": {}, diff --git a/src/main/resources/assets/extratrees/blockstates/pods/banana.json b/extratrees/src/main/resources/assets/extratrees/blockstates/pods/banana.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/pods/banana.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/pods/banana.json diff --git a/src/main/resources/assets/extratrees/blockstates/pods/brazil.json b/extratrees/src/main/resources/assets/extratrees/blockstates/pods/brazil.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/pods/brazil.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/pods/brazil.json diff --git a/src/main/resources/assets/extratrees/blockstates/pods/coconut.json b/extratrees/src/main/resources/assets/extratrees/blockstates/pods/coconut.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/pods/coconut.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/pods/coconut.json diff --git a/src/main/resources/assets/extratrees/blockstates/pods/plantain.json b/extratrees/src/main/resources/assets/extratrees/blockstates/pods/plantain.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/pods/plantain.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/pods/plantain.json diff --git a/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json b/extratrees/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/pods/redbanana.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json diff --git a/src/main/resources/assets/extratrees/blockstates/shrub_log.json b/extratrees/src/main/resources/assets/extratrees/blockstates/shrub_log.json similarity index 100% rename from src/main/resources/assets/extratrees/blockstates/shrub_log.json rename to extratrees/src/main/resources/assets/extratrees/blockstates/shrub_log.json diff --git a/src/main/resources/assets/extratrees/lang/en_GB.lang b/extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang similarity index 100% rename from src/main/resources/assets/extratrees/lang/en_GB.lang rename to extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang similarity index 99% rename from src/main/resources/assets/extratrees/lang/en_US.lang rename to extratrees/src/main/resources/assets/extratrees/lang/en_US.lang index 9e4926c6..7b8b202f 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/extratrees/src/main/resources/assets/extratrees/lang/en_US.lang @@ -57,9 +57,6 @@ extratrees.machine.machine.panelworker.info=The Panelworker creates patterned wo extratrees.machine.machine.glassworker=Glassworker extratrees.machine.machine.glassworker.info=The Glassworker creates patterned stained glass. -extratrees.machine.machine.tileworker=Tileworker -extratrees.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles. - ################################################## ## Modules diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_0.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_0.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/banana_0.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_0.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_1.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_1.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/banana_1.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_1.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_2.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_2.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/banana_2.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/banana_2.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/brazil_0.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/brazil_1.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/brazil_2.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/coconut_0.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/coconut_1.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/coconut_2.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/plantain_0.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/plantain_1.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/plantain_2.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json b/extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json rename to extratrees/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/base_sapling.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_conifer.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_default.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_default.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_default.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_default.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_fruit.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_jungle.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_palm.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_poplar.json diff --git a/src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json b/extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json rename to extratrees/src/main/resources/assets/extratrees/models/block/saplings/tree_shrub.json diff --git a/src/main/resources/assets/extratrees/models/block/shrub_side.json b/extratrees/src/main/resources/assets/extratrees/models/block/shrub_side.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/shrub_side.json rename to extratrees/src/main/resources/assets/extratrees/models/block/shrub_side.json diff --git a/src/main/resources/assets/extratrees/models/block/shrub_trunk.json b/extratrees/src/main/resources/assets/extratrees/models/block/shrub_trunk.json similarity index 100% rename from src/main/resources/assets/extratrees/models/block/shrub_trunk.json rename to extratrees/src/main/resources/assets/extratrees/models/block/shrub_trunk.json diff --git a/src/main/resources/assets/extratrees/models/item/arborist_database.json b/extratrees/src/main/resources/assets/extratrees/models/item/arborist_database.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/arborist_database.json rename to extratrees/src/main/resources/assets/extratrees/models/item/arborist_database.json diff --git a/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json b/extratrees/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/carpentry_hammer.json rename to extratrees/src/main/resources/assets/extratrees/models/item/carpentry_hammer.json diff --git a/src/main/resources/assets/extratrees/models/item/door.json b/extratrees/src/main/resources/assets/extratrees/models/item/door.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/door.json rename to extratrees/src/main/resources/assets/extratrees/models/item/door.json diff --git a/src/main/resources/assets/extratrees/models/item/durable_hammer.json b/extratrees/src/main/resources/assets/extratrees/models/item/durable_hammer.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/durable_hammer.json rename to extratrees/src/main/resources/assets/extratrees/models/item/durable_hammer.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/abiu.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/abiu.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/abiu.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/abiu.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/acorn.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/acorn.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/acorn.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/acorn.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/allspice.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/allspice.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/allspice.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/allspice.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/almond.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/almond.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/almond.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/almond.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/amla.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/amla.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/amla.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/amla.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/apricot.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/apricot.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/apricot.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/apricot.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/avacado.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/avacado.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/avacado.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/avacado.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/bael.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/bael.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/bael.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/bael.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/banana.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/banana.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/banana.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/banana.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/beechnut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/beechnut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/beechnut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/beechnut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/ber.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/ber.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/ber.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/ber.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/black_cherry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/black_cherry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/black_cherry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/black_cherry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/blackberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/blackberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/blackberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/blackberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/blackcurrant.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/blackcurrant.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/blackcurrant.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/blackcurrant.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/blackthorn.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/blackthorn.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/blackthorn.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/blackthorn.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/blueberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/blueberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/blueberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/blueberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/brazil_nut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/brazil_nut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/brazil_nut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/brazil_nut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/buddha_hand.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/buddha_hand.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/buddha_hand.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/buddha_hand.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/butternut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/butternut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/butternut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/butternut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/candlenut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/candlenut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/candlenut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/candlenut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/cashew.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/cashew.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/cashew.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/cashew.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/cherry_plum.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/cherry_plum.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/cherry_plum.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/cherry_plum.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/chilli.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/chilli.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/chilli.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/chilli.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/citron.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/citron.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/citron.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/citron.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/clove.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/clove.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/clove.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/clove.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/coconut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/coconut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/coconut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/coconut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/coffee.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/coffee.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/coffee.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/coffee.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/crabapple.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/crabapple.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/crabapple.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/crabapple.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/cranberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/cranberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/cranberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/cranberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/damson_plum.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/damson_plum.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/damson_plum.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/damson_plum.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/elderberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/elderberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/elderberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/elderberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/fig.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/fig.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/fig.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/fig.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/finger_lime.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/finger_lime.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/finger_lime.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/finger_lime.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/gingko_nut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/gingko_nut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/gingko_nut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/gingko_nut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/golden_raspberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/golden_raspberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/golden_raspberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/golden_raspberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/gooseberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/gooseberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/gooseberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/gooseberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/grapefruit.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/grapefruit.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/grapefruit.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/grapefruit.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/hazelnut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/hazelnut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/hazelnut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/hazelnut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/hickory_nut.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/hickory_nut.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/hickory_nut.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/hickory_nut.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/juniper.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/juniper.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/juniper.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/juniper.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/kaki.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/kaki.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/kaki.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/kaki.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/key_lime.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/key_lime.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/key_lime.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/key_lime.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/kumquat.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/kumquat.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/kumquat.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/kumquat.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/lime.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/lime.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/lime.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/lime.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/macadamia.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/macadamia.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/macadamia.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/macadamia.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/manderin.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/manderin.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/manderin.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/manderin.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/mango.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/mango.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/mango.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/mango.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/nectarine.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/nectarine.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/nectarine.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/nectarine.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/nutmeg.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/nutmeg.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/nutmeg.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/nutmeg.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/olive.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/olive.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/olive.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/olive.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/orange.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/orange.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/orange.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/orange.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/osange_orange.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/osange_orange.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/osange_orange.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/osange_orange.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/papayimar.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/papayimar.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/papayimar.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/papayimar.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/peach.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/peach.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/peach.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/peach.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/pear.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/pear.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/pear.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/pear.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/pecan.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/pecan.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/pecan.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/pecan.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/plantain.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/plantain.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/plantain.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/plantain.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/pomelo.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/pomelo.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/pomelo.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/pomelo.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/quince.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/quince.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/quince.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/quince.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/rainier_cherry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/rainier_cherry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/rainier_cherry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/rainier_cherry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/raspberry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/raspberry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/raspberry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/raspberry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/red_banana.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/red_banana.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/red_banana.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/red_banana.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/redcurrant.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/redcurrant.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/redcurrant.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/redcurrant.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/sand_pear.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/sand_pear.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/sand_pear.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/sand_pear.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/satsuma.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/satsuma.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/satsuma.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/satsuma.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/sour_cherry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/sour_cherry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/sour_cherry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/sour_cherry.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/star_anise.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/star_anise.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/star_anise.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/star_anise.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/starfruit.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/starfruit.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/starfruit.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/starfruit.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/tangerine.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/tangerine.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/tangerine.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/tangerine.json diff --git a/src/main/resources/assets/extratrees/models/item/foods/wild_cherry.json b/extratrees/src/main/resources/assets/extratrees/models/item/foods/wild_cherry.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/foods/wild_cherry.json rename to extratrees/src/main/resources/assets/extratrees/models/item/foods/wild_cherry.json diff --git a/src/main/resources/assets/extratrees/models/item/hops.json b/extratrees/src/main/resources/assets/extratrees/models/item/hops.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/hops.json rename to extratrees/src/main/resources/assets/extratrees/models/item/hops.json diff --git a/src/main/resources/assets/extratrees/models/item/lepi_database.json b/extratrees/src/main/resources/assets/extratrees/models/item/lepi_database.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/lepi_database.json rename to extratrees/src/main/resources/assets/extratrees/models/item/lepi_database.json diff --git a/src/main/resources/assets/extratrees/models/item/master_arborist_database.json b/extratrees/src/main/resources/assets/extratrees/models/item/master_arborist_database.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/master_arborist_database.json rename to extratrees/src/main/resources/assets/extratrees/models/item/master_arborist_database.json diff --git a/src/main/resources/assets/extratrees/models/item/master_lepi_database.json b/extratrees/src/main/resources/assets/extratrees/models/item/master_lepi_database.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/master_lepi_database.json rename to extratrees/src/main/resources/assets/extratrees/models/item/master_lepi_database.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/bark.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/bark.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/bark.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/bark.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/glass_fitting.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/grain_barley.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_barley.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/grain_corn.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_corn.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_roasted.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/grain_rye.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_rye.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/grain_wheat.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/proven_gear.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/proven_gear.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/sawdust.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/sawdust.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/sawdust.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/sawdust.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/wood_wax.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/wood_wax.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeast.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/yeast.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/yeast.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/yeast.json diff --git a/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json b/extratrees/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json rename to extratrees/src/main/resources/assets/extratrees/models/item/misc/yeast_lager.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_conifer.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_default.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_default.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_default.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_default.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_fruit.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_jungle.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_palm.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_poplar.json diff --git a/src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json b/extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json rename to extratrees/src/main/resources/assets/extratrees/models/item/saplings/tree_shrub.json diff --git a/src/main/resources/assets/extratrees/models/item/shrub_trunk.json b/extratrees/src/main/resources/assets/extratrees/models/item/shrub_trunk.json similarity index 100% rename from src/main/resources/assets/extratrees/models/item/shrub_trunk.json rename to extratrees/src/main/resources/assets/extratrees/models/item/shrub_trunk.json diff --git a/src/main/resources/assets/extratrees/textures/blocks/brewery.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/brewery.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/brewery.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/brewery.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/carpenter.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/carpenter.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/carpenter.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/carpenter.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/distillery.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/distillery.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/distillery.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/distillery.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.double.lower.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.double.lower.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.double.lower.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.double.lower.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.double.upper.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.double.upper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.double.upper.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.double.upper.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.full.lower.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.full.lower.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.full.lower.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.full.lower.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.full.upper.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.full.upper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.full.upper.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.full.upper.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.solid.lower.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.solid.lower.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.solid.lower.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.solid.lower.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.solid.upper.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.solid.upper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.solid.upper.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.solid.upper.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.standard.lower.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.standard.lower.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.standard.lower.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.standard.lower.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/door.standard.upper.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/door.standard.upper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/door.standard.upper.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/door.standard.upper.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/average.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/average.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/average.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/average.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/large.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/large.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/large.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/large.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/larger.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/larger.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/larger.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/larger.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/pear.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/pear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/pear.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/pear.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/small.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/small.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/small.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/small.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/fruit/tiny.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/tiny.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/fruit/tiny.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/fruit/tiny.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredcurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/barredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/blank.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/blank.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/blank.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/blank.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/blank.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/blank.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/blank.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/blank.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/chequered.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/chequered.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/chequered.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/circle.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/circle.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/circle.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/circle.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/circle.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/circle.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/circle.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/circle.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/corner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/corner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/creeper4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/crossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/crossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/crossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedsplitbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/curvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal1edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal2edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal3edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonal4edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalcurvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalhalved2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonalstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diagonaltsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diamond.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/diamond.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/diamond.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem1.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/emblem5.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/halved.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/halved.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/halved.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/halved.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/halved2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/halved2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/halved2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettera4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterb4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letterf4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/letters4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/letters4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/lettert4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/multiply.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/multiply.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/multiply.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/octagon.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/octagon.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/octagon.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatebarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatestripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ornatethinbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/overlappedsplitbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/plus.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/plus.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/plus.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/plus.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/plus.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/plus.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/plus.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/plus.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ringed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/ringed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/ringed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/roundedbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/saltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/saltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/saltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitbarredtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/splitcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/squared.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/squared.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/squared.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/squared.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/squared.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/squared.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/squared.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/squared.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/striped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/striped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/striped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/striped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/striped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/striped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/striped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/stripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal1edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal2edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal3edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickdiagonal4edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thickroundedbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicksaltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thicktsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thincurvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thindiagonalstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinedged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinsaltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thinstripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/thintsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tiled.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tiled.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tiled.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/tsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/verythincorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/glass/wavybarredalt2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/incubator.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/incubator.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/incubator.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/incubator.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/infuser.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/infuser.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/infuser.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/infuser.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/kitchen/plain.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/kitchen/plain.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/kitchen/plain.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/kitchen/plain.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png.mcmeta b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png.mcmeta similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png.mcmeta rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.png.mcmeta diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.txt b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.txt similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/latex.txt rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/latex.txt diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png.mcmeta b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png.mcmeta similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png.mcmeta rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid.png.mcmeta diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/liquid2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/liquid2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png.mcmeta b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png.mcmeta similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png.mcmeta rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.png.mcmeta diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.txt b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.txt similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/resin.txt rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/resin.txt diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png.mcmeta b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png.mcmeta similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png.mcmeta rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.png.mcmeta diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.txt b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.txt similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/sap.txt rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/sap.txt diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png.mcmeta b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png.mcmeta similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png.mcmeta rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.png.mcmeta diff --git a/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.txt b/extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.txt similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.txt rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/liquids/turpentine.txt diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/alder_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/alder_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/apple_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/apple_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/ash_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/ash_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/banana_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/banana_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/beech_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/beech_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/box_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/box_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/brazilwood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/butternut_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cedar_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cherry_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cinnamon_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/cypress_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elder_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elder_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elm_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/elm_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus2_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus3_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/eucalyptus_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fig_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fig_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fir_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/fir_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/gingko_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hawthorn_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hazel_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hemlock_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hickory_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/holly_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/holly_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/hornbeam_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/iroko_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/locust_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/locust_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/logwood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maclura_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maple_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/maple_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/olive_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/olive_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pear_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pear_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/pinkivory_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/purpleheart_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rosewood_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/rowan_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/sweetgum_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/syzgium_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/whitebeam_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/yew_bark.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/logs/yew_trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/paneler.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/paneler.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/paneler.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/paneler.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredcurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/barredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/blank.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/blank.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/blank.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/bottom.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/chequered.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/circle.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/circle.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/circle.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/corner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/creeper4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/crossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedsplitbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/curvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal1edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal2edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal3edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonal4edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalbend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalcurvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalhalved2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonalstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diagonaltsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/diamond.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/east.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/east.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/east.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/east.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/east.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/east.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/east.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/east.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem1.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/emblem5.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/halved.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/halved.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/halved2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettera4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterb4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letterf4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/letters4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/lettert4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/multiply.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/north.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/north.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/north.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/north.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/north.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/north.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/north.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/north.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/octagon.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatebarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatestripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ornatethinbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/overlappedsplitbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/plus.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/plus.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/plus.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/ringed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/roundedbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/saltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/south.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/south.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/south.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/south.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/south.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/south.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/south.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/south.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitbarredtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/splitcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/squared.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/squared.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/squared.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.base.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.base.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped.base.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped.base.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.base.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.base.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.base.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/striped2.base.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/stripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal1edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal2edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal3edged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickdiagonal4edged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thickroundedbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicksaltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thicktsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinbarredend4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedbarredcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedcrossed.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thincurvedtsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thindiagonalstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinedged4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinsaltire.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.base.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.base.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.base.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped.base.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.base.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.base.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.base.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstriped2.base.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thinstripedcorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/thintsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tiled.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/top.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/top.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/top.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/top.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/top.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/top.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/top.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/top.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/tsection4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner3.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/verythincorner4.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarred2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/wavybarredalt2.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/west.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/west.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/west.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/west.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/patterns/west.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/west.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/patterns/west.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/patterns/west.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/alder.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/alder.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/alder.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/alder.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/apple.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/apple.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/apple.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/apple.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/ash.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/ash.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/ash.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/ash.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/banana.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/banana.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/banana.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/banana.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/beech.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/beech.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/beech.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/beech.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/box.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/box.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/box.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/box.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/brazilwood.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/brazilwood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/brazilwood.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/brazilwood.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/butternut.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/butternut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/butternut.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/butternut.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/cedar.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/cedar.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/cedar.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/cedar.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/citrus.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/citrus.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/citrus.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/citrus.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/cypress.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/cypress.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/cypress.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/cypress.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/elder.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/elder.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/elder.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/elder.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/elm.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/elm.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/elm.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/elm.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/eucalyptus.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/eucalyptus.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/eucalyptus.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/eucalyptus.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/fig.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/fig.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/fig.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/fig.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/fir.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/fir.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/fir.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/fir.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/gingko.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/gingko.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/gingko.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/gingko.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/hawthorn.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hawthorn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/hawthorn.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hawthorn.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/hazel.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hazel.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/hazel.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hazel.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/hemlock.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hemlock.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/hemlock.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hemlock.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/hickory.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hickory.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/hickory.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hickory.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/holly.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/holly.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/holly.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/holly.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/hornbeam.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hornbeam.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/hornbeam.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/hornbeam.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/iroko.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/iroko.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/iroko.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/iroko.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/locust.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/locust.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/locust.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/locust.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/logwood.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/logwood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/logwood.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/logwood.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/maclura.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/maclura.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/maclura.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/maclura.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/maple.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/maple.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/maple.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/maple.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/olive.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/olive.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/olive.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/olive.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/pear.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/pear.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pear.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/pine.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pine.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/pine.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pine.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/pinkivory.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pinkivory.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/pinkivory.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/pinkivory.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/plum.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/plum.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/plum.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/plum.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/purpleheart.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/purpleheart.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/purpleheart.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/purpleheart.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/rosewood.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/rosewood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/rosewood.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/rosewood.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/rowan.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/rowan.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/rowan.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/rowan.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/sweetgum.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/sweetgum.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/sweetgum.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/sweetgum.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/syzgium.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/syzgium.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/syzgium.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/syzgium.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/whitebeam.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/whitebeam.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/whitebeam.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/whitebeam.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/yew.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/yew.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/planks/yew.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/planks/yew.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/banana.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/banana.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/banana.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/banana.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/banana.2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/banana.2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/banana.2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/brazil.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/brazil.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/brazil.2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/brazil.2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/coconut.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/coconut.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/coconut.2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/coconut.2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/plantain.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/plantain.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/plantain.2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/plantain.2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.0.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.0.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.1.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.1.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.2.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.2.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/pods/redbanana.2.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/press.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/press.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/press.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/press.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/conifer.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/default.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/default.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/default.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/default.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/default.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/default.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/default.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/default.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/fruit.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/jungle.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/palm.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/palm.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/palm.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/poplar.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_acacia.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/sapling.tree_poplar.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.leaves.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.leaves.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.leaves.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.leaves.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.trunk.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.trunk.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.trunk.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/saplings/shrub.trunk.png diff --git a/src/main/resources/assets/extratrees/textures/blocks/sawmill.png b/extratrees/src/main/resources/assets/extratrees/textures/blocks/sawmill.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/blocks/sawmill.png rename to extratrees/src/main/resources/assets/extratrees/textures/blocks/sawmill.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/camberwell_beauty.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/camberwell_beauty.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/camberwell_beauty.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/camberwell_beauty.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/crimson_rose.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/crimson_rose.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/crimson_rose.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/crimson_rose.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/gatekeeper.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/gatekeeper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/gatekeeper.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/gatekeeper.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/golden_birdwing.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/golden_birdwing.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/golden_birdwing.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/golden_birdwing.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/kaiser_i_hind.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/kaiser_i_hind.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/kaiser_i_hind.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/kaiser_i_hind.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/marbled_white.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/marbled_white.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/marbled_white.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/marbled_white.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/marsh_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/marsh_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/marsh_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/marsh_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/meadow_brown.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/meadow_brown.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/meadow_brown.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/meadow_brown.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/monarch.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/monarch.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/monarch.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/monarch.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/painted_lady.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/painted_lady.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/painted_lady.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/painted_lady.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/peacock.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/peacock.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/peacock.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/peacock.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/pearl_bordered_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/pearl_bordered_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/pearl_bordered_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/pearl_bordered_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/purple_emperor.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/purple_emperor.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/purple_emperor.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/purple_emperor.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/queen_of_spain_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/queen_of_spain_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/queen_of_spain_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/queen_of_spain_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/red_admiral.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/red_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/red_admiral.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/red_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/ringlet.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/ringlet.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/ringlet.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/ringlet.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/scotch_angus.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/scotch_angus.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/scotch_angus.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/scotch_angus.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/small_heath.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/small_heath.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/small_heath.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/small_heath.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/small_tortoiseshell.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/small_tortoiseshell.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/small_tortoiseshell.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/small_tortoiseshell.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/speckled_wood.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/speckled_wood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/speckled_wood.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/speckled_wood.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/wall.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/wall.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/wall.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/wall.png diff --git a/src/main/resources/assets/extratrees/textures/entity/butterflies/white_admiral.png b/extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/white_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/entity/butterflies/white_admiral.png rename to extratrees/src/main/resources/assets/extratrees/textures/entity/butterflies/white_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/gui/Lumbermill.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/Lumbermill.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/Lumbermill.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/Lumbermill.png diff --git a/src/main/resources/assets/extratrees/textures/gui/Lumbermill2.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/Lumbermill2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/Lumbermill2.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/Lumbermill2.png diff --git a/src/main/resources/assets/extratrees/textures/gui/Woodworker.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/Woodworker.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/Woodworker.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/Woodworker.png diff --git a/src/main/resources/assets/extratrees/textures/gui/Woodworker2.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/Woodworker2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/Woodworker2.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/Woodworker2.png diff --git a/src/main/resources/assets/extratrees/textures/gui/gui.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/gui.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/gui.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/gui.png diff --git a/src/main/resources/assets/extratrees/textures/gui/moth_database.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/moth_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/moth_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/moth_database.png diff --git a/src/main/resources/assets/extratrees/textures/gui/moth_database2.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/moth_database2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/moth_database2.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/moth_database2.png diff --git a/src/main/resources/assets/extratrees/textures/gui/tree_database.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/tree_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/tree_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/tree_database.png diff --git a/src/main/resources/assets/extratrees/textures/gui/tree_database2.png b/extratrees/src/main/resources/assets/extratrees/textures/gui/tree_database2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/gui/tree_database2.png rename to extratrees/src/main/resources/assets/extratrees/textures/gui/tree_database2.png diff --git a/src/main/resources/assets/extratrees/textures/items/arborist_database.png b/extratrees/src/main/resources/assets/extratrees/textures/items/arborist_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/arborist_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/arborist_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/wall.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png b/extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png diff --git a/src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png b/extratrees/src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/carpentry_hammer.png diff --git a/src/main/resources/assets/extratrees/textures/items/door.double.png b/extratrees/src/main/resources/assets/extratrees/textures/items/door.double.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/door.double.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/door.double.png diff --git a/src/main/resources/assets/extratrees/textures/items/door.full.png b/extratrees/src/main/resources/assets/extratrees/textures/items/door.full.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/door.full.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/door.full.png diff --git a/src/main/resources/assets/extratrees/textures/items/door.solid.png b/extratrees/src/main/resources/assets/extratrees/textures/items/door.solid.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/door.solid.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/door.solid.png diff --git a/src/main/resources/assets/extratrees/textures/items/door.standard.png b/extratrees/src/main/resources/assets/extratrees/textures/items/door.standard.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/door.standard.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/door.standard.png diff --git a/src/main/resources/assets/extratrees/textures/items/durable_hammer.png b/extratrees/src/main/resources/assets/extratrees/textures/items/durable_hammer.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/durable_hammer.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/durable_hammer.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/abiu.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/abiu.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/abiu.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/abiu.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/acorn.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/acorn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/acorn.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/acorn.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/allspice.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/allspice.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/allspice.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/allspice.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/almond.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/almond.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/almond.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/almond.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/amla.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/amla.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/amla.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/amla.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/apricot.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/apricot.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/apricot.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/apricot.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/avacado.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/avacado.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/avacado.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/avacado.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/bael.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/bael.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/bael.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/bael.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/banana.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/banana.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/banana.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/banana.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/bay_laurel.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/bay_rum_berry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/beechnut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/beechnut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/beechnut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/beechnut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/ber.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/ber.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/ber.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/ber.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/black_cherry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/black_cherry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/black_cherry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/black_cherry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/black_walnut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/black_walnut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/black_walnut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/black_walnut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/blackberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/blackberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/blackberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/blackberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/blackcurrant.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/blackcurrant.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/blackcurrant.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/blackcurrant.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/blackthorn.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/blackthorn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/blackthorn.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/blackthorn.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/blueberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/blueberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/blueberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/blueberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/brazil_nut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/brazil_nut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/brazil_nut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/brazil_nut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/breadnut001.PNG b/extratrees/src/main/resources/assets/extratrees/textures/items/food/breadnut001.PNG similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/breadnut001.PNG rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/breadnut001.PNG diff --git a/src/main/resources/assets/extratrees/textures/items/food/buddha_hand.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/buddha_hand.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/buddha_hand.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/buddha_hand.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/bunya_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/butternut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/butternut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/butternut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/butternut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/candlenut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/candlenut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/candlenut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/candlenut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/cashew.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/cashew.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/cashew.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/cashew.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/cherry_plum.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/cherry_plum.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/cherry_plum.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/cherry_plum.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/chilli.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/chilli.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/chilli.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/chilli.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/cinnamon_sticks001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/citron.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/citron.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/citron.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/citron.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/clove.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/clove.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/clove.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/clove.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/coconut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/coconut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/coconut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/coconut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/coffee.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/coffee.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/coffee.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/coffee.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/crabapple.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/crabapple.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/crabapple.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/crabapple.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/cranberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/cranberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/cranberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/cranberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/curry_leaf001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/damson_plum.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/damson_plum.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/damson_plum.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/damson_plum.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/elderberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/elderberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/elderberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/elderberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/fig.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/fig.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/fig.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/fig.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/finger_lime.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/finger_lime.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_blackish001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_green_001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_orange_001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/finger_lime_yellow001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/fruit_progress.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/gingko_nut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/gingko_nut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/gingko_nut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/gingko_nut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/golden_raspberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/golden_raspberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/golden_raspberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/golden_raspberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/gooseberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/gooseberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/gooseberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/gooseberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/grapefruit.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/grapefruit.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/grapefruit.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/grapefruit.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/guava001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/guava001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/guava001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/guava001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/hazelnut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/hazelnut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/hazelnut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/hazelnut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/heartnut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/heartnut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/heartnut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/heartnut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/hickory_nut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/hickory_nut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/hickory_nut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/hickory_nut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/hickory_nut_003.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/hickory_nut_003.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/hickory_nut_003.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/hickory_nut_003.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/ice_cream_bean002.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/jackfruit001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/jackfruit001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/jackfruit001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/jackfruit001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/jujube001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/jujube001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/jujube001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/jujube001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/juniper.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/juniper.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/juniper.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/juniper.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/kaki.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/kaki.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/kaki.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/kaki.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/key_lime.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/key_lime.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/key_lime.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/key_lime.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/kluwak001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/kluwak001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/kluwak001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/kluwak001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/kola_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/kukui_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/kumquat.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/kumquat.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/kumquat.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/kumquat.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/lemon2_006.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/lemon2_006.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/lemon2_006.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/lemon2_006.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/lime.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/lime.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/lime.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/lime.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/longan001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/longan001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/longan001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/longan001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/loquat001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/loquat001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/loquat001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/loquat001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/lychee001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/lychee001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/lychee001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/lychee001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/macadamia.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/macadamia.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/macadamia.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/macadamia.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/mamey_sapote001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/manderin.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/manderin.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/manderin.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/manderin.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/mango.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/mango.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/mango.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/mango.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/mangosteen001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/mangosteen001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/mangosteen001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/mangosteen001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/mongongo001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/mongongo001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/mongongo001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/mongongo001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/monkey_puzzle_nut.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/nectarine.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/nectarine.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/nectarine.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/nectarine.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/nutmeg.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/nutmeg.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/nutmeg.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/nutmeg.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/ohia_ai001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/olive.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/olive.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/olive.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/olive.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/orange.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/orange.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/orange.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/orange.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/osange_orange.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/osange_orange.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/osange_orange.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/osange_orange.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/papayimar.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/papayimar.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/papayimar.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/papayimar.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/paradise_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/passion_fruit001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/peach.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/peach.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/peach.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/peach.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pear.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pear.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pear.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pecan.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pecan.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pecan.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pecan.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/peruvian_pepper001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pine_nut001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pistachio001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pistachio001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pistachio001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pistachio001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/plantain.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/plantain.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/plantain.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/plantain.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pomegranate001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pomegranate001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pomegranate001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pomegranate001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/pomelo.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/pomelo.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/pomelo.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/pomelo.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/quince.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/quince.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/quince.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/quince.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/rainier_cherry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/rainier_cherry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/rainier_cherry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/rainier_cherry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/raspberry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/raspberry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/raspberry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/raspberry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/red_banana.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/red_banana.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/red_banana.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/red_banana.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/redcurrant.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/redcurrant.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/redcurrant.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/redcurrant.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/sand_pear.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/sand_pear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/sand_pear.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/sand_pear.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/sapodilla001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/sapodilla001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/sapodilla001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/sapodilla001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/satsuma.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/satsuma.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/satsuma.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/satsuma.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/sour_cherry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/sour_cherry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/sour_cherry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/sour_cherry.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/soursop001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/soursop001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/soursop001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/soursop001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/star_anise.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/star_anise.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/star_anise.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/star_anise.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/starfruit.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/starfruit.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/starfruit.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/starfruit.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/tamarillo001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/tamarillo001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/tamarillo001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/tamarillo001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/tangerine.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/tangerine.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/tangerine.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/tangerine.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/tropical_apricot001.png diff --git a/src/main/resources/assets/extratrees/textures/items/food/wild_cherry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/food/wild_cherry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/food/wild_cherry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/food/wild_cherry.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/beermug.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/beermug.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/beermug.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/beermug.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/beermug.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/beermug.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/beermug.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cocktail.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cocktail.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cocktail.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cocktail.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/collins.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/collins.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/collins.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/collins.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/collins.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/collins.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/collins.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cordial.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cordial.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cordial.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cordial.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/cordial.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/cordial.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/cordial.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/coupe.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/coupe.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/coupe.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/coupe.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/coupe.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/coupe.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/coupe.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/flute.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/flute.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/flute.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/flute.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/flute.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/flute.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/flute.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/highball.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/highball.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/highball.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/highball.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/highball.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/highball.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/highball.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/hurricane.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/hurricane.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/hurricane.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/hurricane.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/margarita.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/margarita.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/margarita.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/margarita.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/margarita.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/margarita.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/margarita.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/oldfashioned.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/pint.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/pint.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/pint.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/pint.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/pint.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/pint.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/pint.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/sherry.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/sherry.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/sherry.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/sherry.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/sherry.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/sherry.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/sherry.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/shot.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/shot.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/shot.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/shot.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/shot.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/shot.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/shot.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/snifter.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/snifter.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/snifter.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/snifter.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/snifter.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/snifter.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/snifter.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/wine.contents.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.contents.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/wine.contents.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.contents.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/wine.glass.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.glass.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/wine.glass.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.glass.png diff --git a/src/main/resources/assets/extratrees/textures/items/glassware/wine.png b/extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/glassware/wine.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/glassware/wine.png diff --git a/src/main/resources/assets/extratrees/textures/items/hops.png b/extratrees/src/main/resources/assets/extratrees/textures/items/hops.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/hops.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/hops.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png b/extratrees/src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/icon/discovered_moth.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png b/extratrees/src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/icon/discovered_tree.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png b/extratrees/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_moth.png diff --git a/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png b/extratrees/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/icon/undiscovered_tree.png diff --git a/src/main/resources/assets/extratrees/textures/items/lepi_database.png b/extratrees/src/main/resources/assets/extratrees/textures/items/lepi_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/lepi_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/lepi_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/master_arborist_database.png b/extratrees/src/main/resources/assets/extratrees/textures/items/master_arborist_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/master_arborist_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/master_arborist_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/master_lepi_database.png b/extratrees/src/main/resources/assets/extratrees/textures/items/master_lepi_database.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/master_lepi_database.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/master_lepi_database.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/bark.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/bark.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/bark.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/bark.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/glass_fitting.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_barley.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_corn.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_roasted.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_rye.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/grain_wheat.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/proven_gear.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/sawdust.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/sawdust.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/sawdust.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/sawdust.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/wood_wax.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/yeast.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/yeast.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/yeast.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/yeast.png diff --git a/src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png b/extratrees/src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/misc/yeast_lager.png diff --git a/src/main/resources/assets/extratrees/textures/items/set_square0.png b/extratrees/src/main/resources/assets/extratrees/textures/items/set_square0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/set_square0.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/set_square0.png diff --git a/src/main/resources/assets/extratrees/textures/items/set_square1.png b/extratrees/src/main/resources/assets/extratrees/textures/items/set_square1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/set_square1.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/set_square1.png diff --git a/src/main/resources/assets/extratrees/textures/items/set_square2.png b/extratrees/src/main/resources/assets/extratrees/textures/items/set_square2.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/set_square2.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/set_square2.png diff --git a/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png b/extratrees/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/validator/polish.0.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png diff --git a/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png b/extratrees/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/validator/polish.1.png rename to extratrees/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/Nursery.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/Nursery.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/Nursery.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/Nursery.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/brewery_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/brewery_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/carpenter_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/distillery_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/distillery_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/incubator_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/incubator_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/infuser_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/infuser_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/nursery_occupied.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/paneler_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/paneler_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/press_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/press_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/press_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_high.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_high.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_high.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_high.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_low.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_low.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_low.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_low.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_maximum.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_maximum.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_maximum.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_maximum.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_medium.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_medium.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_medium.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/sawmill_tank_resource_medium.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_base.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_base.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_base.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_base.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_product_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_product_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_product_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_product_empty.png diff --git a/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_resource_empty.png b/extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_resource_empty.png similarity index 100% rename from src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_resource_empty.png rename to extratrees/src/main/resources/assets/forestry/textures/tile/extratrees/tileworker_tank_resource_empty.png diff --git a/genetics/build.gradle b/genetics/build.gradle new file mode 100644 index 00000000..93a5b66f --- /dev/null +++ b/genetics/build.gradle @@ -0,0 +1,10 @@ +archivesBaseName = 'genetics-' + mcversion + +dependencies { + compile project(":api") + compile project(":core") + + // TODO: remove these + compile project(":botany") + compile project(":extratrees") +} diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java similarity index 100% rename from src/main/java/binnie/genetics/CreativeTabGenetics.java rename to genetics/src/main/java/binnie/genetics/CreativeTabGenetics.java diff --git a/src/main/java/binnie/genetics/Genetics.java b/genetics/src/main/java/binnie/genetics/Genetics.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/binnie/genetics/Genetics.java rename to genetics/src/main/java/binnie/genetics/Genetics.java index dc5de781..4bcdec24 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/genetics/src/main/java/binnie/genetics/Genetics.java @@ -19,8 +19,8 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Binnie; +import binnie.core.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; diff --git a/src/main/java/binnie/genetics/config/ConfigurationMain.java b/genetics/src/main/java/binnie/genetics/config/ConfigurationMain.java similarity index 75% rename from src/main/java/binnie/genetics/config/ConfigurationMain.java rename to genetics/src/main/java/binnie/genetics/config/ConfigurationMain.java index 3a03a762..0886b73d 100644 --- a/src/main/java/binnie/genetics/config/ConfigurationMain.java +++ b/genetics/src/main/java/binnie/genetics/config/ConfigurationMain.java @@ -1,6 +1,6 @@ package binnie.genetics.config; -import binnie.core.mod.config.ConfigFile; +import binnie.core.config.ConfigFile; @ConfigFile(filename = "/config/forestry/genetics/main.conf") public class ConfigurationMain { diff --git a/src/main/java/binnie/genetics/config/package-info.java b/genetics/src/main/java/binnie/genetics/config/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/config/package-info.java rename to genetics/src/main/java/binnie/genetics/config/package-info.java diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/genetics/src/main/java/binnie/genetics/core/GeneticsGUI.java similarity index 100% rename from src/main/java/binnie/genetics/core/GeneticsGUI.java rename to genetics/src/main/java/binnie/genetics/core/GeneticsGUI.java diff --git a/src/main/java/binnie/genetics/core/GeneticsPacket.java b/genetics/src/main/java/binnie/genetics/core/GeneticsPacket.java similarity index 100% rename from src/main/java/binnie/genetics/core/GeneticsPacket.java rename to genetics/src/main/java/binnie/genetics/core/GeneticsPacket.java diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/genetics/src/main/java/binnie/genetics/core/GeneticsTexture.java similarity index 97% rename from src/main/java/binnie/genetics/core/GeneticsTexture.java rename to genetics/src/main/java/binnie/genetics/core/GeneticsTexture.java index aaf988ce..4a69e5da 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/genetics/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.BinnieSprite; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/genetics/core/package-info.java b/genetics/src/main/java/binnie/genetics/core/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/core/package-info.java rename to genetics/src/main/java/binnie/genetics/core/package-info.java diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/genetics/src/main/java/binnie/genetics/genetics/Engineering.java similarity index 100% rename from src/main/java/binnie/genetics/genetics/Engineering.java rename to genetics/src/main/java/binnie/genetics/genetics/Engineering.java diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java similarity index 91% rename from src/main/java/binnie/genetics/genetics/GeneArrayItem.java rename to genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 7c012ace..44b3b12e 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/genetics/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -4,6 +4,8 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.api.IGene; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -17,11 +19,9 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; import binnie.core.util.I18N; -import binnie.genetics.api.IGene; public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { private static final String GENES_NBT = "genes"; @@ -45,7 +45,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @Override public int getColor(int renderPass) { if (renderPass == 2) { - BreedingSystem breedingSystem = getBreedingSystem(); + IBreedingSystem breedingSystem = getBreedingSystem(); if (breedingSystem != null) { return breedingSystem.getColour(); } @@ -57,7 +57,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { @SideOnly(Side.CLIENT) public void getInfo(List list) { List totalList = new ArrayList<>(); - BreedingSystem breedingSystem = getBreedingSystem(); + IBreedingSystem breedingSystem = getBreedingSystem(); if (breedingSystem != null) { for (IGene gene : genes) { String chromosomeName = breedingSystem.getChromosomeName(gene.getChromosome()); @@ -75,11 +75,11 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } @Nullable - public BreedingSystem getBreedingSystem() { + public IBreedingSystem getBreedingSystem() { if (genes.size() == 0) { return null; } - BreedingSystem system = Binnie.GENETICS.getSystem(genes.get(0).getSpeciesRoot().getUID()); + IBreedingSystem system = Binnie.GENETICS.getSystem(genes.get(0).getSpeciesRoot().getUID()); return (system == null) ? Binnie.GENETICS.getActiveSystems().iterator().next() : system; } diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/genetics/src/main/java/binnie/genetics/genetics/GeneItem.java similarity index 94% rename from src/main/java/binnie/genetics/genetics/GeneItem.java rename to genetics/src/main/java/binnie/genetics/genetics/GeneItem.java index 899c7520..45554e27 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/genetics/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -3,6 +3,8 @@ package binnie.genetics.genetics; import javax.annotation.Nullable; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.api.IGene; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; @@ -15,10 +17,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.INbtWritable; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; -import binnie.genetics.api.IGene; + public class GeneItem implements INbtWritable, IGeneItem { private IGene gene; @@ -63,7 +64,7 @@ public class GeneItem implements INbtWritable, IGeneItem { list.add(TextFormatting.GOLD + chromosomeName + TextFormatting.GRAY + ": " + gene.getName()); } - public BreedingSystem getBreedingSystem() { + public IBreedingSystem getBreedingSystem() { return Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); } diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java similarity index 100% rename from src/main/java/binnie/genetics/genetics/GeneTracker.java rename to genetics/src/main/java/binnie/genetics/genetics/GeneTracker.java diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/genetics/src/main/java/binnie/genetics/genetics/IGeneItem.java similarity index 100% rename from src/main/java/binnie/genetics/genetics/IGeneItem.java rename to genetics/src/main/java/binnie/genetics/genetics/IGeneItem.java diff --git a/src/main/java/binnie/genetics/genetics/SequencerItem.java b/genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java similarity index 100% rename from src/main/java/binnie/genetics/genetics/SequencerItem.java rename to genetics/src/main/java/binnie/genetics/genetics/SequencerItem.java diff --git a/src/main/java/binnie/genetics/genetics/package-info.java b/genetics/src/main/java/binnie/genetics/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/genetics/package-info.java rename to genetics/src/main/java/binnie/genetics/genetics/package-info.java diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java similarity index 94% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java index 8653c751..24cd7e79 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.extratrees.ExtraTrees; import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.TextFormatting; @@ -14,7 +15,6 @@ import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; -import binnie.Binnie; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; @@ -69,7 +69,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { if (ind instanceof IButterfly) { IButterfly bee2 = (IButterfly) ind; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".metabolism", Binnie.GENETICS.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM)))) + new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".metabolism", ExtraTrees.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM)))) .setColor(getColor()); y += 20; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java similarity index 98% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java index d4195a56..15711196 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -2,6 +2,7 @@ package binnie.genetics.gui.analyst; import java.text.DecimalFormat; +import binnie.extratrees.ExtraTrees; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -14,7 +15,6 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; -import binnie.Binnie; import binnie.botany.api.genetics.IFlower; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; @@ -241,7 +241,7 @@ public class AnalystPageBiology extends ControlAnalystPage { } private void addTreePages(ITree tree, int y){ - String alleleName = Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); + String alleleName = ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName)) .setColor(getColor()); y += 20; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java similarity index 95% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index a0d5e6f6..60f4c714 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Objects; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -13,7 +14,6 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; @@ -36,7 +36,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { private final ControlScrollableContent scroll; boolean isMaster; - public AnalystPageDatabase(IWidget parent, Area area, BreedingSystem system, boolean isMaster) { + public AnalystPageDatabase(IWidget parent, Area area, IBreedingSystem system, boolean isMaster) { super(parent, area); this.isMaster = isMaster; setColor(getColor(system)); @@ -121,7 +121,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { }; } - private static int getColor(BreedingSystem system){ + private static int getColor(IBreedingSystem system){ int cOfSystem = system.getColour(); int cr = (0xFF0000 & cOfSystem) >> 16; int cg = (0xFF00 & cOfSystem) >> 8; @@ -134,7 +134,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { return (int) (cr * brightness) * 65536 + (int) (cg * brightness) * 256 + (int) (cb * brightness); } - private IWidget getItemScrollList(BreedingSystem system, Collection options) { + private IWidget getItemScrollList(IBreedingSystem system, Collection options) { return new Control(scroll, 0, 0, scroll.getWidth(), scroll.getHeight()) { @Override public void initialise() { @@ -185,7 +185,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { return I18N.localise("genetics.gui.analyst.registry.title"); } - private Collection getSpecies(BreedingSystem system) { + private Collection getSpecies(IBreedingSystem system) { Collection species = new ArrayList<>(); species.addAll(isMaster ? system.getAllSpecies() : system.getDiscoveredSpecies(getWindow().getWorld(), getWindow().getPlayer().getGameProfile())); return species; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java similarity index 95% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java index 479e38e6..9a564869 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; @@ -12,8 +13,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.CraftGUI; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; @@ -38,7 +38,7 @@ public class AnalystPageGenome extends ControlAnalystPage { new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 16; ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); - BreedingSystem system = Binnie.GENETICS.getSystem(root); + IBreedingSystem system = Binnie.GENETICS.getSystem(root); Control scaled = new Control(this, 0, y, 0, 0) { @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java similarity index 92% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java index 8c1d4f3e..7c3e1008 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.util.text.TextFormatting; import forestry.api.genetics.AlleleManager; @@ -7,8 +8,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -23,7 +23,7 @@ public class AnalystPageKaryogram extends ControlAnalystPage { y += 16; y += 8; ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); - BreedingSystem system = Binnie.GENETICS.getSystem(root); + IBreedingSystem system = Binnie.GENETICS.getSystem(root); int maxBiomePerLine = (int) ((getWidth() + 4.0f - 16.0f) / 22.0f); int karygramX = (getWidth() - (Math.min(maxBiomePerLine, system.getActiveKaryotype().size()) * 18 - 4)) / 2; int dx = 0; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java similarity index 96% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java index 95de32b2..7b38a956 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.analyst; import java.util.Collection; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -16,9 +17,8 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.Mods; -import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.gui.Attribute; import binnie.core.gui.IWidget; @@ -41,7 +41,7 @@ public class AnalystPageMutations extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 18; - BreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); + IBreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); IAlleleSpecies speciesCurrent = ind.getGenome().getPrimary(); Collection resultant = system.getResultantMutations(speciesCurrent); @@ -125,11 +125,11 @@ public class AnalystPageMutations extends ControlAnalystPage { setSize(new Point(getWidth(), y)); } - private boolean isKnown(BreedingSystem system, IMutation mutation) { + private boolean isKnown(IBreedingSystem system, IMutation mutation) { return system.getDiscoveredMutations(getWindow().getWorld(), getWindow().getPlayer().getGameProfile()).contains(mutation); } - private float getSpecificChance(IIndividual ind, IMutation mutation, BreedingSystem system) { + private float getSpecificChance(IIndividual ind, IMutation mutation, IBreedingSystem system) { return system.getChance(mutation, getWindow().getPlayer(), mutation.getAllele0(), mutation.getAllele1()); } diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java similarity index 93% rename from src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index 176c0031..ca7aed21 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -8,8 +9,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; @@ -53,7 +53,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { - BreedingSystem system = Binnie.GENETICS.getSystem(root); + IBreedingSystem system = Binnie.GENETICS.getSystem(root); tooltip.add(system.getChromosomeName(chromosomeType)); if (isHomozygous()) { tooltip.add(system.getAlleleName(chromosomeType, allele0)); diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/ControlBiome.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java similarity index 91% rename from src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java index afe6fcf1..a842e207 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; @@ -8,7 +9,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; @@ -18,7 +18,7 @@ import binnie.genetics.item.ModuleItems; public class ControlFurtherMutation extends ControlMutation { private final IAlleleSpecies resolute; - public ControlFurtherMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, BreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies, IAlleleSpecies resolute) { + public ControlFurtherMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, IBreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies, IAlleleSpecies resolute) { super(parent, x, y, mutation, specificChance, system, firstSpecies, secondSpecies); this.resolute = resolute; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java similarity index 87% rename from src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java index 9cbe5c87..5d9cf446 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java @@ -1,13 +1,13 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; @@ -20,7 +20,7 @@ public class ControlIndividualDisplay extends ControlItemDisplay implements IToo public ControlIndividualDisplay(IWidget parent, int x, int y, int size, IIndividual ind) { super(parent, x, y, size); - BreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); + IBreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); setTooltip(); } diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java similarity index 87% rename from src/main/java/binnie/genetics/gui/analyst/ControlMutation.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java index bb819c98..2b76ccf0 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java @@ -1,12 +1,12 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; @@ -17,11 +17,11 @@ import binnie.core.resource.BinnieSprite; public abstract class ControlMutation extends Control { protected final IMutation mutation; protected final float specificChance; - protected final BreedingSystem system; + protected final IBreedingSystem system; protected final IAlleleSpecies firstSpecies; protected final IAlleleSpecies secondSpecies; - protected ControlMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, BreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies) { + protected ControlMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, IBreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies) { super(parent, x, y, 44, 16); this.mutation = mutation; this.specificChance = specificChance; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java similarity index 92% rename from src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java index 1cceccb7..85ba9b34 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; @@ -8,7 +9,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; @@ -17,7 +17,7 @@ import binnie.genetics.item.ModuleItems; public class ControlResultantMutation extends ControlMutation { - public ControlResultantMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, BreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies) { + public ControlResultantMutation(IWidget parent, int x, int y, IMutation mutation, float specificChance, IBreedingSystem system, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies) { super(parent, x, y, mutation, specificChance, system, firstSpecies, secondSpecies); String comb = firstSpecies.getAlleleName() + " + " + secondSpecies.getAlleleName(); diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java similarity index 93% rename from src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java index f7101049..730b6c1c 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java @@ -1,10 +1,10 @@ package binnie.genetics.gui.analyst; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.Tooltip; @@ -15,10 +15,10 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlSystemButton extends Control { - BreedingSystem system; + IBreedingSystem system; WindowAnalyst window; - public ControlSystemButton(int xPos, int yPos, WindowAnalyst window, BreedingSystem system) { + public ControlSystemButton(int xPos, int yPos, WindowAnalyst window, IBreedingSystem system) { super(window, xPos, yPos, 20, 20); this.system = system; this.window = window; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java diff --git a/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java similarity index 93% rename from src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java index 1e310fa4..d9d0b019 100644 --- a/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java @@ -4,6 +4,9 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.genetics.ManagerGenetics; +import binnie.extrabees.api.ExtraBeesAPI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,10 +22,9 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.IButterfly; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.botany.api.genetics.IFlower; import binnie.core.AbstractMod; -import binnie.core.genetics.BreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.Widget; import binnie.core.gui.controls.ControlTextCentered; @@ -52,7 +54,6 @@ import binnie.genetics.gui.analyst.tree.AnalystPageGrowth; import binnie.genetics.gui.analyst.tree.AnalystPageWood; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; -import binnie.genetics.machine.analyser.Analyser; public class WindowAnalyst extends Window { @Nullable @@ -71,7 +72,7 @@ public class WindowAnalyst extends Window { @Nullable IIndividual current; @Nullable - BreedingSystem currentSystem; + IBreedingSystem currentSystem; private Control analystNone; private ControlSlide slideUpInv; @@ -110,7 +111,7 @@ public class WindowAnalyst extends Window { getWindowInventory().setValidator(0, new SlotValidator.Individual() { @Override public boolean isValid(ItemStack itemStack) { - return Analyser.isAnalysed(itemStack) || (Analyser.isAnalysable(itemStack) && !getWindowInventory().getStackInSlot(1).isEmpty()); + return ManagerGenetics.isAnalysed(itemStack) || (ManagerGenetics.isAnalysable(itemStack) && !getWindowInventory().getStackInSlot(1).isEmpty()); } }); getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.spriteDye)); @@ -119,7 +120,7 @@ public class WindowAnalyst extends Window { @Override public void initialiseServer() { - for (BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { + for (IBreedingSystem system : Binnie.GENETICS.getActiveSystems()) { ISpeciesRoot root = system.getSpeciesRoot(); if (root != null) { IBreedingTracker tracker = root.getBreedingTracker(getWorld(), getUsername()); @@ -143,7 +144,7 @@ public class WindowAnalyst extends Window { int x = 16; int y = 28; if (isDatabase) { - for (BreedingSystem syst : Binnie.GENETICS.getActiveSystems()) { + for (IBreedingSystem syst : Binnie.GENETICS.getActiveSystems()) { new ControlSystemButton(x, y, this, syst); x += 22; } @@ -179,7 +180,7 @@ public class WindowAnalyst extends Window { }; } setIndividual(null); - setSystem(Binnie.GENETICS.beeBreedingSystem); + setSystem(ExtraBeesAPI.beeBreedingSystem); } @SideOnly(Side.CLIENT) @@ -307,8 +308,8 @@ public class WindowAnalyst extends Window { super.onWindowInventoryChanged(); WindowInventory inv = getWindowInventory(); ItemStack stack = inv.getStackInSlot(0); - if (!stack.isEmpty() && !Analyser.isAnalysed(stack)) { - inv.setInventorySlotContents(0, Analyser.analyse(stack, getWorld(), getUsername())); + if (!stack.isEmpty() && !ManagerGenetics.isAnalysed(stack)) { + inv.setInventorySlotContents(0, ManagerGenetics.analyse(stack, getWorld(), getUsername())); inv.decrStackSize(1, 1); } @@ -349,12 +350,12 @@ public class WindowAnalyst extends Window { updatePages(systemChange); } - public BreedingSystem getSystem() { + public IBreedingSystem getSystem() { return currentSystem; } @SideOnly(Side.CLIENT) - public void setSystem(BreedingSystem system) { + public void setSystem(IBreedingSystem system) { if (system == currentSystem) { return; } diff --git a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java b/genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java similarity index 94% rename from src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java index f583629a..fe321a93 100644 --- a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java @@ -6,6 +6,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import binnie.extrabees.api.ExtraBeesAPI; +import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -24,7 +26,6 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.apiculture.PluginApiculture; -import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; @@ -46,13 +47,13 @@ public class AnalystPageProducts extends AnalystPageProduce { setColor(0xcc3300); IBeeGenome genome = ind.getGenome(); float speed = genome.getSpeed(); - float modeSpeed = Binnie.GENETICS.getBeeRoot().getBeekeepingMode(BinnieCore.getBinnieProxy().getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); + float modeSpeed = BeeManager.beeRoot.getBeekeepingMode(BinnieCore.getBinnieProxy().getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.PRODUCTS_KEY + ".rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.PRODUCTS_KEY + ".rate") + ": " + ExtraBeesAPI.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColor(getColor()); y += 20; Collection refinedProducts = new UniqueItemStackSet(); diff --git a/src/main/java/binnie/genetics/gui/analyst/bee/package-info.java b/genetics/src/main/java/binnie/genetics/gui/analyst/bee/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/bee/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/bee/package-info.java diff --git a/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java b/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java diff --git a/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java b/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java b/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java b/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java b/genetics/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/flower/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java diff --git a/src/main/java/binnie/genetics/gui/analyst/package-info.java b/genetics/src/main/java/binnie/genetics/gui/analyst/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/package-info.java diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java similarity index 92% rename from src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java index 6bd24994..a68e2b80 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java @@ -5,6 +5,8 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import binnie.extratrees.ExtraTrees; +import forestry.api.arboriculture.TreeManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -17,7 +19,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -36,7 +38,7 @@ public class AnalystPageFruit extends AnalystPageProduce { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor()); y += 20; Collection products = new UniqueItemStackSet(); Collection specialties = new UniqueItemStackSet(); @@ -92,7 +94,7 @@ public class AnalystPageFruit extends AnalystPageProduce { } new ControlTextCentered(this, y, I18N.localise(AnalystConstants.FRUIT_KEY + ".possible")).setColor(getColor()); y += 12; - Collection fruitAlleles = Binnie.GENETICS.getChromosomeMap(Binnie.GENETICS.getTreeRoot()).get(EnumTreeChromosome.FRUITS); + Collection fruitAlleles = Binnie.GENETICS.getChromosomeMap(TreeManager.treeRoot).get(EnumTreeChromosome.FRUITS); for (IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { Collection stacks = new UniqueItemStackSet(); for (IAllele a : fruitAlleles) { diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java similarity index 76% rename from src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java index c4196fc6..656ae09a 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst.tree; +import binnie.extratrees.ExtraTrees; import net.minecraft.util.text.TextFormatting; import forestry.api.arboriculture.EnumTreeChromosome; @@ -7,7 +8,6 @@ import forestry.api.arboriculture.ITree; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import binnie.Binnie; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -30,9 +30,9 @@ public class AnalystPageGrowth extends ControlAnalystPage { y += 12; new ControlTextCentered(this, y, TextFormatting.BOLD + getTimeString(Math.round(1373.3999f * mat))).setColor(getColor()); y += 22; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor()); } } diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/package-info.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/analyst/tree/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/analyst/tree/package-info.java diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java similarity index 90% rename from src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index ea57d515..614fc69f 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; +import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.world.biome.Biome; @@ -13,7 +14,6 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; -import binnie.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; @@ -68,7 +68,7 @@ public class ControlBiomes extends Control implements ITooltip { public void setSpecies(IAlleleBeeSpecies species) { tolerated.clear(); - IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species)); - IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); + IBeeGenome genome = BeeManager.beeRoot.templateAsGenome(BeeManager.beeRoot.getTemplate(species)); + IBee bee = BeeManager.beeRoot.getBee(genome); } } diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java similarity index 95% rename from src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index c382fbcb..9346def5 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; +import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -14,7 +15,6 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; -import binnie.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; @@ -99,8 +99,8 @@ public class ControlClimateBar extends Control implements ITooltip { tolerated.clear(); int main; EnumTolerance tolerance; - IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species); - IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template); + IAllele[] template = BeeManager.beeRoot.getTemplate(species); + IBeeGenome genome = BeeManager.beeRoot.templateAsGenome(template); if (!isHumidity) { main = species.getTemperature().ordinal() - 1; diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java similarity index 83% rename from src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java index 882c8302..dfb99d2c 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import forestry.api.apiculture.BeeManager; import net.minecraft.item.ItemStack; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; -import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; @@ -36,14 +36,14 @@ public class ControlProductsBox extends ControlListBox strings = new ArrayList<>(); if (type == Type.PRODUCTS) { diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java similarity index 100% rename from src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java similarity index 100% rename from src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java similarity index 96% rename from src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java index aa38d64e..5f36883e 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.database.bee; +import forestry.api.apiculture.BeeManager; import net.minecraft.util.math.Vec3i; import forestry.api.apiculture.IBee; @@ -9,7 +10,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.core.genetics.alleles.EnumAllele; -import binnie.Binnie; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; @@ -19,7 +19,7 @@ import binnie.core.gui.database.PageSpecies; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; -import binnie.genetics.genetics.AlleleHelper; +import binnie.core.genetics.AlleleHelper; public class PageSpeciesGenome extends PageSpecies { ControlText title; @@ -144,13 +144,13 @@ public class PageSpeciesGenome extends PageSpecies { @Override public void onValueChanged(IAlleleSpecies species) { - IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()); + IAllele[] template = BeeManager.beeRoot.getTemplate(species.getUID()); if (template == null) { return; } - IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template); - IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); + IBeeGenome genome = BeeManager.beeRoot.templateAsGenome(template); + IBee bee = BeeManager.beeRoot.getBee(genome); speedText.setValue(rateSpeed(genome.getSpeed())); lifespanText.setValue(rateLifespan(genome.getLifespan())); fertilityText.setValue(I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".children", genome.getFertility())); diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java similarity index 100% rename from src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java diff --git a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java similarity index 96% rename from src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java index 6eb86e0c..21f1e334 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java @@ -1,11 +1,11 @@ package binnie.genetics.gui.database.bee; +import binnie.extrabees.api.ExtraBeesAPI; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageBranchOverview; @@ -21,7 +21,7 @@ import binnie.genetics.Genetics; public class WindowApiaristDatabase extends WindowAbstractDatabase { public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) { - super(player, side, nei, Binnie.GENETICS.beeBreedingSystem, 110); + super(player, side, nei, ExtraBeesAPI.beeBreedingSystem, 110); } public static Window create(EntityPlayer player, Side side, boolean nei) { diff --git a/src/main/java/binnie/genetics/gui/database/bee/package-info.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/database/bee/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/database/bee/package-info.java diff --git a/src/main/java/binnie/genetics/gui/package-info.java b/genetics/src/main/java/binnie/genetics/gui/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/gui/package-info.java rename to genetics/src/main/java/binnie/genetics/gui/package-info.java diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java similarity index 87% rename from src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java rename to genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index cc5e7bd6..b06d0a18 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.punnett; +import binnie.core.gui.resource.GeneticsGUITexture; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -37,9 +38,9 @@ public class ControlChromosome extends Control implements IControlValue subtypes = GeneticsJeiPlugin.jeiHelpers.getStackHelper().getSubtypes(inputStack); for (ItemStack larvae : subtypes) { IncubatorRecipe recipe = new IncubatorRecipe(larvae, recipeLarvae.getInput(), recipeLarvae.getOutput(), recipeLarvae.getLossChance(), recipeLarvae.getChance()); - final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); + final IBee bee = BeeManager.beeRoot.getMember(larvae); if (bee != null) { - ItemStack drone = Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + ItemStack drone = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.DRONE); recipe.setOutputStack(drone); recipes.add(new LarvaeIncubatorRecipeWrapper(recipe)); } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java similarity index 78% rename from src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java index f525a9d0..1a1c4c30 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java +++ b/genetics/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java @@ -1,6 +1,6 @@ package binnie.genetics.integration.jei.incubator; -import binnie.genetics.api.IIncubatorRecipe; +import binnie.genetics.machine.incubator.IIncubatorRecipe; public class LarvaeIncubatorRecipeWrapper extends IncubatorRecipeWrapper { public LarvaeIncubatorRecipeWrapper(IIncubatorRecipe recipe) { diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/incubator/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java similarity index 93% rename from src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java index 44a35948..09c452de 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java +++ b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java @@ -3,6 +3,7 @@ package binnie.genetics.integration.jei.inoculator; import java.util.ArrayList; import java.util.List; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -13,8 +14,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; import binnie.genetics.genetics.Engineering; import binnie.genetics.item.ItemSerum; @@ -24,7 +24,7 @@ public class InoculatorRecipeMaker { public static List create() { List recipes = new ArrayList<>(); - for (BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { + for (IBreedingSystem system : Binnie.GENETICS.getActiveSystems()) { ISpeciesRoot root = system.getSpeciesRoot(); IChromosomeType speciesChromosomeType = root.getSpeciesChromosomeType(); IAllele[] defaultTemplate = root.getDefaultTemplate(); diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeCategory.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeCategory.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeCategory.java diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/SplicerRecipeWrapper.java diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java rename to genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java b/genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java rename to genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/isolator/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java diff --git a/src/main/java/binnie/genetics/integration/jei/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/package-info.java diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java rename to genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java b/genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java rename to genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java rename to genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java b/genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java rename to genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java b/genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java rename to genetics/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java b/genetics/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java rename to genetics/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java similarity index 98% rename from src/main/java/binnie/genetics/item/GeneticLiquid.java rename to genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java index 4479513a..9837070f 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/genetics/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -4,7 +4,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/genetics/src/main/java/binnie/genetics/item/GeneticsItems.java similarity index 100% rename from src/main/java/binnie/genetics/item/GeneticsItems.java rename to genetics/src/main/java/binnie/genetics/item/GeneticsItems.java diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemAnalyst.java rename to genetics/src/main/java/binnie/genetics/item/ItemAnalyst.java diff --git a/src/main/java/binnie/genetics/item/ItemBeeDictionary.java b/genetics/src/main/java/binnie/genetics/item/ItemBeeDictionary.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemBeeDictionary.java rename to genetics/src/main/java/binnie/genetics/item/ItemBeeDictionary.java diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/genetics/src/main/java/binnie/genetics/item/ItemDatabase.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemDatabase.java rename to genetics/src/main/java/binnie/genetics/item/ItemDatabase.java diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/genetics/src/main/java/binnie/genetics/item/ItemGene.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemGene.java rename to genetics/src/main/java/binnie/genetics/item/ItemGene.java diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java similarity index 97% rename from src/main/java/binnie/genetics/item/ItemMasterRegistry.java rename to genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 89e6745a..b670071e 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -6,7 +6,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/item/ItemPunnettSquare.java b/genetics/src/main/java/binnie/genetics/item/ItemPunnettSquare.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemPunnettSquare.java rename to genetics/src/main/java/binnie/genetics/item/ItemPunnettSquare.java diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/genetics/src/main/java/binnie/genetics/item/ItemRegistry.java similarity index 100% rename from src/main/java/binnie/genetics/item/ItemRegistry.java rename to genetics/src/main/java/binnie/genetics/item/ItemRegistry.java diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/genetics/src/main/java/binnie/genetics/item/ItemSequence.java similarity index 98% rename from src/main/java/binnie/genetics/item/ItemSequence.java rename to genetics/src/main/java/binnie/genetics/item/ItemSequence.java index d290008a..6eba8f7b 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemSequence.java @@ -6,6 +6,7 @@ import com.google.common.base.Preconditions; import java.util.List; +import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -20,7 +21,6 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; import binnie.core.genetics.Gene; import binnie.core.item.ItemCore; import binnie.core.util.I18N; @@ -89,7 +89,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar if (this.isInCreativeTab(tab)) { final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); Preconditions.checkNotNull(species); - items.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); + items.add(create(new Gene(species, EnumBeeChromosome.SPECIES, BeeManager.beeRoot), false)); } } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/genetics/src/main/java/binnie/genetics/item/ItemSerum.java similarity index 95% rename from src/main/java/binnie/genetics/item/ItemSerum.java rename to genetics/src/main/java/binnie/genetics/item/ItemSerum.java index ce9e6f07..457230fe 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.api.IGene; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -15,12 +17,10 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; import binnie.core.util.I18N; import binnie.genetics.Genetics; -import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.IGeneItem; @@ -101,7 +101,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { public String getItemStackDisplayName(ItemStack itemstack) { GeneItem gene = this.getGeneItem(itemstack); if (gene != null && gene.getSpeciesRoot() != null) { - BreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); + IBreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot()); return system.getDescriptor() + " " + I18N.localise("genetics.item.gene.serum"); } else { return I18N.localise("genetics.item.gene.corrupted.serum"); diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/genetics/src/main/java/binnie/genetics/item/ItemSerumArray.java similarity index 96% rename from src/main/java/binnie/genetics/item/ItemSerumArray.java rename to genetics/src/main/java/binnie/genetics/item/ItemSerumArray.java index fd8ce714..53e12185 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/genetics/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.api.genetics.IBreedingSystem; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -15,8 +16,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; import binnie.core.util.I18N; import binnie.genetics.Genetics; @@ -114,7 +114,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { if (geneItem != null) { ISpeciesRoot speciesRoot = geneItem.getSpeciesRoot(); if (speciesRoot != null) { - BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); + IBreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot); return system.getDescriptor() + " " + I18N.localise("genetics.item.gene.serum.array"); } } diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java similarity index 98% rename from src/main/java/binnie/genetics/item/ModuleItems.java rename to genetics/src/main/java/binnie/genetics/item/ModuleItems.java index 26d38ef7..684c10b2 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java @@ -13,9 +13,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; -import binnie.Binnie; -import binnie.Constants; -import binnie.botany.modules.BotanyModuleUIDs; +import binnie.core.Binnie; +import binnie.core.Constants; +import binnie.core.modules.BotanyModuleUIDs; import binnie.botany.modules.ModuleDatabase; import binnie.core.BinnieCore; import binnie.core.IInitializable; @@ -31,7 +31,7 @@ import binnie.extratrees.modules.ModuleMothDatabase; import binnie.extratrees.modules.ModuleTreeDatabase; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; public class ModuleItems implements IInitializable { public static BinnieSprite iconNight; diff --git a/src/main/java/binnie/genetics/item/package-info.java b/genetics/src/main/java/binnie/genetics/item/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/item/package-info.java rename to genetics/src/main/java/binnie/genetics/item/package-info.java diff --git a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java similarity index 70% rename from src/main/java/binnie/genetics/machine/AdvGeneticMachine.java rename to genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index 09fc36ff..0a9eec99 100644 --- a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -1,5 +1,7 @@ package binnie.genetics.machine; +import java.util.function.Supplier; + import net.minecraft.item.ItemStack; import binnie.core.machines.IMachineType; @@ -8,22 +10,17 @@ import binnie.genetics.Genetics; import binnie.genetics.machine.splicer.PackageSplicer; public enum AdvGeneticMachine implements IMachineType { - Splicer(PackageSplicer.class); + Splicer(PackageSplicer::new); - Class clss; + private final Supplier supplier; - AdvGeneticMachine(final Class clss) { - this.clss = clss; + AdvGeneticMachine(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - return true; + public Supplier getSupplier() { + return supplier; } public ItemStack get(final int i) { diff --git a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java b/genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java similarity index 100% rename from src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java rename to genetics/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java similarity index 73% rename from src/main/java/binnie/genetics/machine/GeneticMachine.java rename to genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java index 7b9f740b..db0e06bd 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -1,5 +1,7 @@ package binnie.genetics.machine; +import java.util.function.Supplier; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -13,25 +15,20 @@ import binnie.genetics.machine.polymeriser.PackagePolymeriser; import binnie.genetics.machine.sequencer.PackageSequencer; public enum GeneticMachine implements IMachineType { - Isolator(PackageIsolator.class), - Sequencer(PackageSequencer.class), - Polymeriser(PackagePolymeriser.class), - Inoculator(PackageInoculator.class); + Isolator(PackageIsolator::new), + Sequencer(PackageSequencer::new), + Polymeriser(PackagePolymeriser::new), + Inoculator(PackageInoculator::new); - Class clss; + private final Supplier supplier; - GeneticMachine(final Class clss) { - this.clss = clss; + GeneticMachine(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - return true; + public Supplier getSupplier() { + return supplier; } public ItemStack get(final int i) { diff --git a/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java b/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java similarity index 99% rename from src/main/java/binnie/genetics/machine/GeneticsErrorCode.java rename to genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java index 8897e812..75c7a760 100644 --- a/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java +++ b/genetics/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java @@ -2,7 +2,7 @@ package binnie.genetics.machine; import javax.annotation.Nullable; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.machines.errors.CoreErrorCode; import binnie.core.machines.errors.EnumErrorType; import binnie.core.machines.errors.ErrorStateRegistry; diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java similarity index 92% rename from src/main/java/binnie/genetics/machine/LaboratoryMachine.java rename to genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 550bc520..a48108b6 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -2,6 +2,8 @@ package binnie.genetics.machine; import javax.annotation.Nonnull; +import java.util.function.Supplier; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,26 +25,21 @@ import binnie.genetics.machine.genepool.PackageGenepool; import binnie.genetics.machine.incubator.PackageIncubator; public enum LaboratoryMachine implements IMachineType { - LabMachine(PackageLabMachine.class), - Analyser(PackageAnalyser.class), - Incubator(PackageIncubator.class), - Genepool(PackageGenepool.class), - Acclimatiser(PackageAcclimatiser.class); + LabMachine(PackageLabMachine::new), + Analyser(PackageAnalyser::new), + Incubator(PackageIncubator::new), + Genepool(PackageGenepool::new), + Acclimatiser(PackageAcclimatiser::new); - Class clss; + private final Supplier supplier; - LaboratoryMachine(final Class clss) { - this.clss = clss; + LaboratoryMachine(final Supplier supplier) { + this.supplier = supplier; } @Override - public Class getPackageClass() { - return this.clss; - } - - @Override - public boolean isActive() { - return true; + public Supplier getSupplier() { + return supplier; } public ItemStack get(final int amount) { diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java similarity index 99% rename from src/main/java/binnie/genetics/machine/ModuleMachine.java rename to genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java index 9e92524f..a1cbb0d4 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/genetics/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,6 +1,6 @@ package binnie.genetics.machine; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java similarity index 84% rename from src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 150f164b..364f2112 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -7,6 +7,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import binnie.botany.api.BotanyAPI; +import forestry.api.apiculture.BeeManager; +import forestry.api.lepidopterology.ButterflyManager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,14 +23,13 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; -import binnie.Binnie; -import binnie.Constants; +import binnie.core.Constants; import binnie.botany.api.genetics.EnumFlowerChromosome; -import binnie.botany.modules.BotanyModuleUIDs; +import binnie.core.modules.BotanyModuleUIDs; import binnie.core.BinnieCore; import binnie.core.genetics.Tolerance; import binnie.core.liquid.FluidContainerType; -import binnie.modules.ModuleManager; +import binnie.core.modules.ModuleManager; public class Acclimatiser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3}; @@ -89,17 +91,17 @@ public class Acclimatiser { public static void setupRecipes() { if (BinnieCore.isApicultureActive()) { - addTolerance(Binnie.GENETICS.getBeeRoot().getUID(), EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.GENETICS.getBeeRoot().getUID(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(BeeManager.beeRoot.getUID(), EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(BeeManager.beeRoot.getUID(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } if (BinnieCore.isLepidopteryActive()) { - addTolerance(Binnie.GENETICS.getButterflyRoot().getUID(), EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.GENETICS.getButterflyRoot().getUID(), EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(ButterflyManager.butterflyRoot.getUID(), EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(ButterflyManager.butterflyRoot.getUID(), EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } if (ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.FLOWERS)) { - addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); - addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); + addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); } addTemperatureItem(new ItemStack(Items.BLAZE_POWDER), 0.5f); addTemperatureItem(new ItemStack(Items.BLAZE_ROD), 0.75f); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java similarity index 97% rename from src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 73b1c27d..e1702e4b 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -19,7 +19,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowAcclimatiser extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUI_PROCESS_3); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/acclimatiser/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java diff --git a/genetics/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/Analyser.java new file mode 100644 index 00000000..ca78b8b7 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -0,0 +1,9 @@ +package binnie.genetics.machine.analyser; + +public class Analyser { + public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3, 4, 5}; + public static final int SLOT_TARGET = 6; + public static final int[] SLOT_FINISHED = new int[]{7, 8, 9, 10, 11, 12}; + public static final int SLOT_DYE = 13; + +} diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/genetics/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java b/genetics/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java similarity index 86% rename from src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java index 71ac72d1..4c2c1fb0 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.analyser; +import binnie.core.genetics.ManagerGenetics; import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; @@ -20,7 +21,7 @@ public class AnalyserLogic extends ComponentProcessSetCost implements IProcess { if (this.getUtil().isSlotEmpty(Analyser.SLOT_TARGET)) { return new ErrorState(GeneticsErrorCode.ANALYSER_NO_ITEM, Analyser.SLOT_TARGET); } - final boolean analysed = Analyser.isAnalysed(this.getUtil().getStack(Analyser.SLOT_TARGET)); + final boolean analysed = ManagerGenetics.isAnalysed(this.getUtil().getStack(Analyser.SLOT_TARGET)); if (analysed) { return new ErrorState(GeneticsErrorCode.ANALYSER_ALREADY_ANALYSED, Analyser.SLOT_TARGET); } @@ -42,7 +43,7 @@ public class AnalyserLogic extends ComponentProcessSetCost implements IProcess { protected void onFinishTask() { super.onFinishTask(); ItemStack itemStack = this.getUtil().getStack(Analyser.SLOT_TARGET); - itemStack = Analyser.analyse(itemStack, getMachine().getWorld(), getMachine().getOwner()); + itemStack = ManagerGenetics.analyse(itemStack, getMachine().getWorld(), getMachine().getOwner()); this.getInventory().setInventorySlotContents(Analyser.SLOT_TARGET, itemStack); } diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java similarity index 96% rename from src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 634eb698..257dfa93 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.analyser; +import binnie.core.genetics.ManagerGenetics; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -56,7 +57,7 @@ public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implement transfer.addStorage(6, Analyser.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { @Override public boolean fulfilled(final ItemStack stack) { - return Analyser.isAnalysed(stack); + return ManagerGenetics.isAnalysed(stack); } }); new ComponentChargedSlots(machine).addCharge(13); diff --git a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java b/genetics/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java similarity index 78% rename from src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java index 2d3644b5..cfbcc281 100644 --- a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.analyser; +import binnie.core.genetics.ManagerGenetics; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -12,7 +13,7 @@ public class SlotValidatorUnanalysed extends SlotValidator { @Override public boolean isValid(final ItemStack itemStack) { - return Analyser.isAnalysable(itemStack) && !Analyser.isAnalysed(itemStack); + return ManagerGenetics.isAnalysable(itemStack) && !ManagerGenetics.isAnalysed(itemStack); } @Override diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java similarity index 98% rename from src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index be88bfa4..cad2a08f 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -24,7 +24,7 @@ import binnie.core.gui.window.Panel; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowAnalyser extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUI_PROCESS_3); diff --git a/src/main/java/binnie/genetics/machine/analyser/package-info.java b/genetics/src/main/java/binnie/genetics/machine/analyser/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/analyser/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/analyser/package-info.java diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java similarity index 95% rename from src/main/java/binnie/genetics/machine/craftgui/ControlGene.java rename to genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 0fffb26e..659e12fb 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.craftgui; +import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -7,8 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; @@ -43,7 +43,7 @@ public class ControlGene extends Control implements IControlValue, IToolt @Override public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { - BreedingSystem system = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()); + IBreedingSystem system = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()); final String cName = system.getChromosomeName(this.gene.getChromosome()); tooltip.add(cName + ": " + this.gene.getName()); if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java similarity index 89% rename from src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java rename to genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 3a9b7e24..29d122a3 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -5,11 +5,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import binnie.core.api.genetics.IBreedingSystem; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; -import binnie.Binnie; -import binnie.core.genetics.BreedingSystem; +import binnie.core.Binnie; import binnie.core.genetics.Gene; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; @@ -19,10 +19,10 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; import binnie.genetics.genetics.GeneTracker; -public class ControlGeneScroll extends Control implements IControlValue { +public class ControlGeneScroll extends Control implements IControlValue { private String filter; @Nullable - private BreedingSystem system; + private IBreedingSystem system; protected ControlGeneScroll(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); @@ -35,7 +35,7 @@ public class ControlGeneScroll extends Control implements IControlValue { if (event.getValue() instanceof BreedingSystem) { - WindowGeneBank.this.genes.setValue((BreedingSystem) event.getValue()); + WindowGeneBank.this.genes.setValue((IBreedingSystem) event.getValue()); } }); int boxX = 100; @@ -108,11 +111,11 @@ public class WindowGeneBank extends WindowMachine { }); this.genes = new ControlGeneScroll(scroll, 1, 1, geneBoxWidth, 116); scroll.setScrollableContent(this.genes); - this.genes.setGenes(Binnie.GENETICS.beeBreedingSystem); - final ControlTabBar tabBar = new ControlTabBar(this, boxX, 32, 24, 120, Position.LEFT, Binnie.GENETICS.getActiveSystems()) { + this.genes.setGenes(ExtraBeesAPI.beeBreedingSystem); + final ControlTabBar tabBar = new ControlTabBar(this, boxX, 32, 24, 120, Position.LEFT, Binnie.GENETICS.getActiveSystems()) { @Override - public ControlTab createTab(final int x, final int y, final int w, final int h, final BreedingSystem value) { - return new ControlTabIcon(this, x, y, w, h, value) { + public ControlTab createTab(final int x, final int y, final int w, final int h, final IBreedingSystem value) { + return new ControlTabIcon(this, x, y, w, h, value) { @Override public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(this.getValue().toString()); @@ -134,13 +137,13 @@ public class WindowGeneBank extends WindowMachine { }; } }; - tabBar.setValue(Binnie.GENETICS.beeBreedingSystem); + tabBar.setValue(ExtraBeesAPI.beeBreedingSystem); boxX -= 8; final ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160, 16, 50, Position.LEFT, Arrays.asList("Info", "Stats", "Ranking")); final Panel panelProject = new Panel(this, boxX + 24, 160, geneBoxWidth + 20, 50, MinecraftGUI.PanelType.BLACK); int totalGenes = 0; int seqGenes = 0; - for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { + for (final IBreedingSystem system : Binnie.GENETICS.getActiveSystems()) { final GeneTracker tracker = GeneTracker.getTracker(this.getWorld(), this.getUsername()); final Map> genes = Binnie.GENETICS.getChromosomeMap(system.getSpeciesRoot()); for (final Map.Entry> entry : genes.entrySet()) { @@ -174,9 +177,9 @@ public class WindowGeneBank extends WindowMachine { public static class ChromosomeType { IChromosomeType chromosome; - BreedingSystem system; + IBreedingSystem system; - public ChromosomeType(final IChromosomeType chromosome, final BreedingSystem system) { + public ChromosomeType(final IChromosomeType chromosome, final IBreedingSystem system) { this.chromosome = chromosome; this.system = system; } diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java similarity index 100% rename from src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java rename to genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java diff --git a/src/main/java/binnie/genetics/machine/craftgui/package-info.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/craftgui/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/craftgui/package-info.java diff --git a/src/main/java/binnie/genetics/machine/genepool/Genepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/Genepool.java similarity index 100% rename from src/main/java/binnie/genetics/machine/genepool/Genepool.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/Genepool.java diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java similarity index 94% rename from src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index 5275bdd3..b0cb2be5 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -1,11 +1,11 @@ package binnie.genetics.machine.genepool; +import forestry.api.apiculture.BeeManager; import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; import binnie.core.machines.errors.CoreErrorCode; @@ -28,11 +28,11 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { public static int getDNAAmount(final ItemStack stack) { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root == Binnie.GENETICS.getBeeRoot()) { - if (Binnie.GENETICS.getBeeRoot().isDrone(stack)) { + if (root == BeeManager.beeRoot) { + if (BeeManager.beeRoot.isDrone(stack)) { return 10; } - if (Binnie.GENETICS.getBeeRoot().isMated(stack)) { + if (BeeManager.beeRoot.isMated(stack)) { return 50; } return 30; diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java similarity index 100% rename from src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java similarity index 97% rename from src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index cec3d5b7..cf2a2d4d 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -23,7 +23,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowGenepool extends WindowMachine { static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, GeneticsTexture.GUI_PROCESS_3); diff --git a/src/main/java/binnie/genetics/machine/genepool/package-info.java b/genetics/src/main/java/binnie/genetics/machine/genepool/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/genepool/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/genepool/package-info.java diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/genetics/src/main/java/binnie/genetics/machine/incubator/IIncubatorRecipe.java similarity index 92% rename from src/main/java/binnie/genetics/api/IIncubatorRecipe.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/IIncubatorRecipe.java index 39f88596..55144004 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/IIncubatorRecipe.java @@ -1,4 +1,4 @@ -package binnie.genetics.api; +package binnie.genetics.machine.incubator; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java similarity index 93% rename from src/main/java/binnie/genetics/machine/incubator/Incubator.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 081bc161..a37514e3 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import forestry.api.apiculture.BeeManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -15,11 +16,9 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; -import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.machines.MachineUtil; -import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.item.GeneticLiquid; import binnie.genetics.item.GeneticsItems; @@ -49,11 +48,11 @@ public class Incubator { @Override public ItemStack getOutputStack(final MachineUtil machine) { final ItemStack larvae = machine.getStack(3); - final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); + final IBee bee = BeeManager.beeRoot.getMember(larvae); if (bee == null) { return ItemStack.EMPTY; } - return Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + return BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.DRONE); } @Override diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java similarity index 98% rename from src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index 6e31e269..cf2fd378 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -14,7 +14,6 @@ import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; -import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.machine.GeneticsErrorCode; public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java similarity index 98% rename from src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index ee8f0678..45eba786 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.MachineUtil; import binnie.core.machines.transfer.TransferRequest; -import binnie.genetics.api.IIncubatorRecipe; public class IncubatorRecipe implements IIncubatorRecipe { private final FluidStack input; diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java b/genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java similarity index 100% rename from src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java diff --git a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java similarity index 100% rename from src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java similarity index 98% rename from src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index 2884e08d..d4e94136 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -22,7 +22,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowIncubator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUI_PROCESS); diff --git a/src/main/java/binnie/genetics/machine/incubator/package-info.java b/genetics/src/main/java/binnie/genetics/machine/incubator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/incubator/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/incubator/package-info.java diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java similarity index 96% rename from src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java rename to genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java index e4a86709..dbfd7abb 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java +++ b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java @@ -5,13 +5,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import forestry.api.apiculture.BeeManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; -import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.inventory.SetList; @@ -49,9 +49,9 @@ public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory } for (final SpeciesList sortableList : speciesList.values()) { for (final ItemStack beeStack : sortableList.bees) { - if (Binnie.GENETICS.getBeeRoot().isDrone(beeStack)) { + if (BeeManager.beeRoot.isDrone(beeStack)) { sortableList.drones.add(this.indexerInventory.indexOf(beeStack)); - } else if (Binnie.GENETICS.getBeeRoot().isMated(beeStack)) { + } else if (BeeManager.beeRoot.isMated(beeStack)) { sortableList.queens.add(this.indexerInventory.indexOf(beeStack)); } else { sortableList.princesses.add(this.indexerInventory.indexOf(beeStack)); diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java similarity index 100% rename from src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java rename to genetics/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java diff --git a/src/main/java/binnie/genetics/machine/indexer/package-info.java b/genetics/src/main/java/binnie/genetics/machine/indexer/package-info.java similarity index 80% rename from src/main/java/binnie/genetics/machine/indexer/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/indexer/package-info.java index c89292af..b197afb3 100644 --- a/src/main/java/binnie/genetics/machine/indexer/package-info.java +++ b/genetics/src/main/java/binnie/genetics/machine/indexer/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.indexer; -import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java similarity index 100% rename from src/main/java/binnie/genetics/machine/inoculator/Inoculator.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java similarity index 100% rename from src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java diff --git a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java similarity index 96% rename from src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java index affeeacb..a266d9ce 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.machines.inventory.SlotValidator; public class ValidatorIndividualInoculate extends SlotValidator { diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java similarity index 98% rename from src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 61a99f30..af68c273 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -24,7 +24,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowInoculator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUI_PROCESS_2); diff --git a/src/main/java/binnie/genetics/machine/inoculator/package-info.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/inoculator/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/inoculator/package-info.java diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java diff --git a/src/main/java/binnie/genetics/machine/isolator/Isolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/Isolator.java similarity index 100% rename from src/main/java/binnie/genetics/machine/isolator/Isolator.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/Isolator.java diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/genetics/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java similarity index 100% rename from src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java similarity index 98% rename from src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index b6412d07..dc777b80 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -23,7 +23,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowIsolator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUI_PROCESS_3); diff --git a/src/main/java/binnie/genetics/machine/isolator/package-info.java b/genetics/src/main/java/binnie/genetics/machine/isolator/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/isolator/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/isolator/package-info.java diff --git a/src/main/java/binnie/genetics/machine/package-info.java b/genetics/src/main/java/binnie/genetics/machine/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/package-info.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java similarity index 98% rename from src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index 7384f119..b894de07 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -23,7 +23,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowPolymeriser extends WindowMachine { static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUI_PROCESS); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/package-info.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/polymeriser/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/polymeriser/package-info.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java similarity index 97% rename from src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index 845e6a9c..9a2b8ba7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.sequencer; import net.minecraft.tileentity.TileEntity; -import binnie.Binnie; import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,7 +11,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; diff --git a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/Sequencer.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java similarity index 98% rename from src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index b248a073..12d09d26 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -27,7 +27,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; public class WindowSequencer extends WindowMachine { static Texture ProgressBase = new StandardTexture(64, 114, 98, 9, GeneticsTexture.GUI_PROCESS_3); diff --git a/src/main/java/binnie/genetics/machine/sequencer/package-info.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/sequencer/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/sequencer/package-info.java diff --git a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java diff --git a/src/main/java/binnie/genetics/machine/splicer/Splicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/Splicer.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/Splicer.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/Splicer.java diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/SplicerFX.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java diff --git a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java b/genetics/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java similarity index 96% rename from src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java index 85fa6923..2fee53cb 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import binnie.Binnie; +import binnie.core.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java similarity index 98% rename from src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index c0428a59..fa5d5024 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -22,7 +22,7 @@ import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.craftgui.WindowMachine; +import binnie.core.gui.window.WindowMachine; import binnie.genetics.machine.inoculator.Inoculator; public class WindowSplicer extends WindowMachine { diff --git a/src/main/java/binnie/genetics/machine/splicer/package-info.java b/genetics/src/main/java/binnie/genetics/machine/splicer/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/machine/splicer/package-info.java rename to genetics/src/main/java/binnie/genetics/machine/splicer/package-info.java diff --git a/src/main/java/binnie/genetics/package-info.java b/genetics/src/main/java/binnie/genetics/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/package-info.java rename to genetics/src/main/java/binnie/genetics/package-info.java diff --git a/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java b/genetics/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java similarity index 100% rename from src/main/java/binnie/genetics/proxy/IGeneticsProxy.java rename to genetics/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java diff --git a/src/main/java/binnie/genetics/proxy/Proxy.java b/genetics/src/main/java/binnie/genetics/proxy/Proxy.java similarity index 100% rename from src/main/java/binnie/genetics/proxy/Proxy.java rename to genetics/src/main/java/binnie/genetics/proxy/Proxy.java diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java similarity index 96% rename from src/main/java/binnie/genetics/proxy/ProxyClient.java rename to genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java index a18f138c..3e328299 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/genetics/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.Constants; +import binnie.core.Constants; import binnie.core.models.ModelManager; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/proxy/ProxyServer.java b/genetics/src/main/java/binnie/genetics/proxy/ProxyServer.java similarity index 100% rename from src/main/java/binnie/genetics/proxy/ProxyServer.java rename to genetics/src/main/java/binnie/genetics/proxy/ProxyServer.java diff --git a/src/main/java/binnie/genetics/proxy/package-info.java b/genetics/src/main/java/binnie/genetics/proxy/package-info.java similarity index 100% rename from src/main/java/binnie/genetics/proxy/package-info.java rename to genetics/src/main/java/binnie/genetics/proxy/package-info.java diff --git a/src/main/resources/assets/genetics/blockstates/adv_machine.json b/genetics/src/main/resources/assets/genetics/blockstates/adv_machine.json similarity index 100% rename from src/main/resources/assets/genetics/blockstates/adv_machine.json rename to genetics/src/main/resources/assets/genetics/blockstates/adv_machine.json diff --git a/src/main/resources/assets/genetics/blockstates/lab_machine.json b/genetics/src/main/resources/assets/genetics/blockstates/lab_machine.json similarity index 100% rename from src/main/resources/assets/genetics/blockstates/lab_machine.json rename to genetics/src/main/resources/assets/genetics/blockstates/lab_machine.json diff --git a/src/main/resources/assets/genetics/blockstates/machine.json b/genetics/src/main/resources/assets/genetics/blockstates/machine.json similarity index 100% rename from src/main/resources/assets/genetics/blockstates/machine.json rename to genetics/src/main/resources/assets/genetics/blockstates/machine.json diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/genetics/src/main/resources/assets/genetics/lang/en_GB.lang similarity index 100% rename from src/main/resources/assets/genetics/lang/en_GB.lang rename to genetics/src/main/resources/assets/genetics/lang/en_GB.lang diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/genetics/src/main/resources/assets/genetics/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/genetics/lang/en_US.lang rename to genetics/src/main/resources/assets/genetics/lang/en_US.lang diff --git a/src/main/resources/assets/genetics/models/block/machine.json b/genetics/src/main/resources/assets/genetics/models/block/machine.json similarity index 100% rename from src/main/resources/assets/genetics/models/block/machine.json rename to genetics/src/main/resources/assets/genetics/models/block/machine.json diff --git a/src/main/resources/assets/genetics/models/item/analyst.json b/genetics/src/main/resources/assets/genetics/models/item/analyst.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/analyst.json rename to genetics/src/main/resources/assets/genetics/models/item/analyst.json diff --git a/src/main/resources/assets/genetics/models/item/dictionary.json b/genetics/src/main/resources/assets/genetics/models/item/dictionary.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/dictionary.json rename to genetics/src/main/resources/assets/genetics/models/item/dictionary.json diff --git a/src/main/resources/assets/genetics/models/item/dictionary_master.json b/genetics/src/main/resources/assets/genetics/models/item/dictionary_master.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/dictionary_master.json rename to genetics/src/main/resources/assets/genetics/models/item/dictionary_master.json diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase.json b/genetics/src/main/resources/assets/genetics/models/item/geneticdatabase.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/geneticdatabase.json rename to genetics/src/main/resources/assets/genetics/models/item/geneticdatabase.json diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json b/genetics/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/geneticdatabase_master.json rename to genetics/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json diff --git a/src/main/resources/assets/genetics/models/item/master_registry.json b/genetics/src/main/resources/assets/genetics/models/item/master_registry.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/master_registry.json rename to genetics/src/main/resources/assets/genetics/models/item/master_registry.json diff --git a/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json b/genetics/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/casing_circuit.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/casing_circuit.json diff --git a/src/main/resources/assets/genetics/models/item/misc/casing_iron.json b/genetics/src/main/resources/assets/genetics/models/item/misc/casing_iron.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/casing_iron.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/casing_iron.json diff --git a/src/main/resources/assets/genetics/models/item/misc/dna_dye.json b/genetics/src/main/resources/assets/genetics/models/item/misc/dna_dye.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/dna_dye.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/dna_dye.json diff --git a/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json b/genetics/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/dye_fluor.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/dye_fluor.json diff --git a/src/main/resources/assets/genetics/models/item/misc/enzyme.json b/genetics/src/main/resources/assets/genetics/models/item/misc/enzyme.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/enzyme.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/enzyme.json diff --git a/src/main/resources/assets/genetics/models/item/misc/genome_empty.json b/genetics/src/main/resources/assets/genetics/models/item/misc/genome_empty.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/genome_empty.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/genome_empty.json diff --git a/src/main/resources/assets/genetics/models/item/misc/growth_medium.json b/genetics/src/main/resources/assets/genetics/models/item/misc/growth_medium.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/growth_medium.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/growth_medium.json diff --git a/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json b/genetics/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/integrated_circuit.json diff --git a/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json b/genetics/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/integrated_cpu.json diff --git a/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json b/genetics/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/sequencer_empty.json diff --git a/src/main/resources/assets/genetics/models/item/misc/serum_empty.json b/genetics/src/main/resources/assets/genetics/models/item/misc/serum_empty.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/misc/serum_empty.json rename to genetics/src/main/resources/assets/genetics/models/item/misc/serum_empty.json diff --git a/src/main/resources/assets/genetics/models/item/registry.json b/genetics/src/main/resources/assets/genetics/models/item/registry.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/registry.json rename to genetics/src/main/resources/assets/genetics/models/item/registry.json diff --git a/src/main/resources/assets/genetics/models/item/sequence.json b/genetics/src/main/resources/assets/genetics/models/item/sequence.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/sequence.json rename to genetics/src/main/resources/assets/genetics/models/item/sequence.json diff --git a/src/main/resources/assets/genetics/models/item/serum.json b/genetics/src/main/resources/assets/genetics/models/item/serum.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/serum.json rename to genetics/src/main/resources/assets/genetics/models/item/serum.json diff --git a/src/main/resources/assets/genetics/models/item/serum_array.json b/genetics/src/main/resources/assets/genetics/models/item/serum_array.json similarity index 100% rename from src/main/resources/assets/genetics/models/item/serum_array.json rename to genetics/src/main/resources/assets/genetics/models/item/serum_array.json diff --git a/src/main/resources/assets/genetics/textures/blocks/alveary.png b/genetics/src/main/resources/assets/genetics/textures/blocks/alveary.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/alveary.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/alveary.png diff --git a/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.a.png b/genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.a.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/fx/sequencer.a.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.a.png diff --git a/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.c.png b/genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.c.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/fx/sequencer.c.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.c.png diff --git a/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.g.png b/genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.g.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/fx/sequencer.g.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.g.png diff --git a/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.t.png b/genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.t.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/fx/sequencer.t.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/fx/sequencer.t.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.pdn b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.pdn similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.pdn rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.pdn diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_poly.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/bacteria_vector.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna.txt diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_impure.txt diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_pure.txt diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_raw.txt diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/dna_refined.txt diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/gm.bee.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/gm.bee.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/gm.bee.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/gm.bee.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/growth_medium.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/molten.png rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/molten.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/blocks/liquids/molten.txt b/genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/blocks/liquids/molten.txt rename to genetics/src/main/resources/assets/genetics/textures/blocks/liquids/molten.txt diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Acclimatiser.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Acclimatiser.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Acclimatiser.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Acclimatiser.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Database2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Genepool.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Genepool.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Genepool.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Genepool.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Indexer2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Inoculator2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Isolator2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Purifier.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Purifier.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Purifier.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Purifier.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Replicator2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Sequencer.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Sequencer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Sequencer.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Sequencer.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Splicer2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Synthesizer.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Synthesizer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/Synthesizer.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/Synthesizer.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_frame.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_frame.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_frame.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_frame.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_mutator.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_mutator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_mutator.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_mutator.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_stimulator.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_stimulator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_stimulator.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/alveary_stimulator.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/processes2.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/processes2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/processes2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/processes2.png diff --git a/src/main/resources/assets/genetics/textures/gui/fromExtraBees/punnett.png b/genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/punnett.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/fromExtraBees/punnett.png rename to genetics/src/main/resources/assets/genetics/textures/gui/fromExtraBees/punnett.png diff --git a/src/main/resources/assets/genetics/textures/gui/process.png b/genetics/src/main/resources/assets/genetics/textures/gui/process.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/process.png rename to genetics/src/main/resources/assets/genetics/textures/gui/process.png diff --git a/src/main/resources/assets/genetics/textures/gui/process2.png b/genetics/src/main/resources/assets/genetics/textures/gui/process2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/process2.png rename to genetics/src/main/resources/assets/genetics/textures/gui/process2.png diff --git a/src/main/resources/assets/genetics/textures/gui/process3.png b/genetics/src/main/resources/assets/genetics/textures/gui/process3.png similarity index 100% rename from src/main/resources/assets/genetics/textures/gui/process3.png rename to genetics/src/main/resources/assets/genetics/textures/gui/process3.png diff --git a/src/main/resources/assets/genetics/textures/items/actions/cancel_task.png b/genetics/src/main/resources/assets/genetics/textures/items/actions/cancel_task.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/actions/cancel_task.png rename to genetics/src/main/resources/assets/genetics/textures/items/actions/cancel_task.png diff --git a/src/main/resources/assets/genetics/textures/items/actions/pause_process.png b/genetics/src/main/resources/assets/genetics/textures/items/actions/pause_process.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/actions/pause_process.png rename to genetics/src/main/resources/assets/genetics/textures/items/actions/pause_process.png diff --git a/src/main/resources/assets/genetics/textures/items/analyst.png b/genetics/src/main/resources/assets/genetics/textures/items/analyst.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/analyst.png rename to genetics/src/main/resources/assets/genetics/textures/items/analyst.png diff --git a/src/main/resources/assets/genetics/textures/items/apiarist_database.png b/genetics/src/main/resources/assets/genetics/textures/items/apiarist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/apiarist_database.png rename to genetics/src/main/resources/assets/genetics/textures/items/apiarist_database.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_bee.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_bee.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_bee.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_bee.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_bee.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_butterfly.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_dna.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_dna.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_dna.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_dna.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_dna.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_enzyme.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_fermenter.txt diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_tree.png b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_tree.png rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.png diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bacteria_tree.txt b/genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bacteria_tree.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bacteria_tree.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/body1.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/body1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/body1.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/body1.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.body2.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/drone.outline.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.body2.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/larvae.outline.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.body2.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/princess.outline.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.body2.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.txt b/genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.txt rename to genetics/src/main/resources/assets/genetics/textures/items/bees/jaded/queen.outline.txt diff --git a/src/main/resources/assets/genetics/textures/items/bees/pahi/princess.png b/genetics/src/main/resources/assets/genetics/textures/items/bees/pahi/princess.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/bees/pahi/princess.png rename to genetics/src/main/resources/assets/genetics/textures/items/bees/pahi/princess.png diff --git a/src/main/resources/assets/genetics/textures/items/casing_circuit.png b/genetics/src/main/resources/assets/genetics/textures/items/casing_circuit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casing_circuit.png rename to genetics/src/main/resources/assets/genetics/textures/items/casing_circuit.png diff --git a/src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/casing_circuit.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/casing_etched.png b/genetics/src/main/resources/assets/genetics/textures/items/casing_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casing_etched.png rename to genetics/src/main/resources/assets/genetics/textures/items/casing_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/casing_iron.png b/genetics/src/main/resources/assets/genetics/textures/items/casing_iron.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/casing_iron.png rename to genetics/src/main/resources/assets/genetics/textures/items/casing_iron.png diff --git a/src/main/resources/assets/genetics/textures/items/cast.png b/genetics/src/main/resources/assets/genetics/textures/items/cast.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/axe.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/axe.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/axe.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/axe.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/block.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/block.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/block.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/block.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/boots.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/boots.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/boots.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/boots.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/chestplate.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/chestplate.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/chestplate.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/chestplate.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/gear.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/gear.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/gear.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/gear.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/helmet.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/helmet.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/helmet.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/helmet.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/hoe.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/hoe.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/hoe.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/hoe.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/legging.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/legging.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/legging.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/legging.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/pickaxe.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/pickaxe.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/pickaxe.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/pickaxe.png diff --git a/src/main/resources/assets/genetics/textures/items/cast/shovel.png b/genetics/src/main/resources/assets/genetics/textures/items/cast/shovel.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cast/shovel.png rename to genetics/src/main/resources/assets/genetics/textures/items/cast/shovel.png diff --git a/src/main/resources/assets/genetics/textures/items/cylinder_empty.png b/genetics/src/main/resources/assets/genetics/textures/items/cylinder_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/cylinder_empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/cylinder_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/dish.png b/genetics/src/main/resources/assets/genetics/textures/items/dish.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dish.png rename to genetics/src/main/resources/assets/genetics/textures/items/dish.png diff --git a/src/main/resources/assets/genetics/textures/items/dna.0.png b/genetics/src/main/resources/assets/genetics/textures/items/dna.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dna.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/dna.0.png diff --git a/src/main/resources/assets/genetics/textures/items/dna.1.png b/genetics/src/main/resources/assets/genetics/textures/items/dna.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dna.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/dna.1.png diff --git a/src/main/resources/assets/genetics/textures/items/dna.png b/genetics/src/main/resources/assets/genetics/textures/items/dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dna.png rename to genetics/src/main/resources/assets/genetics/textures/items/dna.png diff --git a/src/main/resources/assets/genetics/textures/items/dna_dye.png b/genetics/src/main/resources/assets/genetics/textures/items/dna_dye.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dna_dye.png rename to genetics/src/main/resources/assets/genetics/textures/items/dna_dye.png diff --git a/src/main/resources/assets/genetics/textures/items/dye_fluor.png b/genetics/src/main/resources/assets/genetics/textures/items/dye_fluor.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dye_fluor.png rename to genetics/src/main/resources/assets/genetics/textures/items/dye_fluor.png diff --git a/src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/dye_fluor.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/enzyme.png b/genetics/src/main/resources/assets/genetics/textures/items/enzyme.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/enzyme.png rename to genetics/src/main/resources/assets/genetics/textures/items/enzyme.png diff --git a/src/main/resources/assets/genetics/textures/items/field_glass.png b/genetics/src/main/resources/assets/genetics/textures/items/field_glass.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/field_glass.png rename to genetics/src/main/resources/assets/genetics/textures/items/field_glass.png diff --git a/src/main/resources/assets/genetics/textures/items/field_kit.png b/genetics/src/main/resources/assets/genetics/textures/items/field_kit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/field_kit.png rename to genetics/src/main/resources/assets/genetics/textures/items/field_kit.png diff --git a/src/main/resources/assets/genetics/textures/items/gear_gold_etched.png b/genetics/src/main/resources/assets/genetics/textures/items/gear_gold_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/gear_gold_etched.png rename to genetics/src/main/resources/assets/genetics/textures/items/gear_gold_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/gear_iron_etched.png b/genetics/src/main/resources/assets/genetics/textures/items/gear_iron_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/gear_iron_etched.png rename to genetics/src/main/resources/assets/genetics/textures/items/gear_iron_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/gene_database.png b/genetics/src/main/resources/assets/genetics/textures/items/gene_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/gene_database.png rename to genetics/src/main/resources/assets/genetics/textures/items/gene_database.png diff --git a/src/main/resources/assets/genetics/textures/items/genome_empty.png b/genetics/src/main/resources/assets/genetics/textures/items/genome_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/genome_empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/genome_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/growth_medium.png b/genetics/src/main/resources/assets/genetics/textures/items/growth_medium.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/growth_medium.png rename to genetics/src/main/resources/assets/genetics/textures/items/growth_medium.png diff --git a/src/main/resources/assets/genetics/textures/items/helix.png b/genetics/src/main/resources/assets/genetics/textures/items/helix.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/helix.png rename to genetics/src/main/resources/assets/genetics/textures/items/helix.png diff --git a/src/main/resources/assets/genetics/textures/items/integrated_circuit.png b/genetics/src/main/resources/assets/genetics/textures/items/integrated_circuit.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integrated_circuit.png rename to genetics/src/main/resources/assets/genetics/textures/items/integrated_circuit.png diff --git a/src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/integrated_circuit.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/integrated_cpu.png b/genetics/src/main/resources/assets/genetics/textures/items/integrated_cpu.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integrated_cpu.png rename to genetics/src/main/resources/assets/genetics/textures/items/integrated_cpu.png diff --git a/src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/integrated_cpu.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.cap.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.cap.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.cap.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.cap.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.dna.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.dna.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.edges.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.edges.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.edges.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.edges.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.empty.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.empty.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/genome.glass.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/genome.glass.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/genome.glass.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/genome.glass.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.cap.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.cap.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.cap.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.cap.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.dna.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.dna.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.dna.txt b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.dna.txt rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.dna.txt diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.edges.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.edges.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.edges.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.edges.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.empty.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.empty.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum.glass.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum.glass.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum.glass.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum.glass.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_caps.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_caps.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_caps.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_caps.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_edges.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_edges.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_edges.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_edges.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_filling.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_filling.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_filling.txt b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.txt similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_filling.txt rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_filling.txt diff --git a/src/main/resources/assets/genetics/textures/items/machines/serum_outline.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/serum_outline.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/serum_outline.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/serum_outline.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/template.blank.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/template.blank.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/template.blank.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/template.blank.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/template.edge.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/template.edge.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/template.edge.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/template.edge.png diff --git a/src/main/resources/assets/genetics/textures/items/machines/template.filling.png b/genetics/src/main/resources/assets/genetics/textures/items/machines/template.filling.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/machines/template.filling.png rename to genetics/src/main/resources/assets/genetics/textures/items/machines/template.filling.png diff --git a/src/main/resources/assets/genetics/textures/items/master_apiarist_database.png b/genetics/src/main/resources/assets/genetics/textures/items/master_apiarist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/master_apiarist_database.png rename to genetics/src/main/resources/assets/genetics/textures/items/master_apiarist_database.png diff --git a/src/main/resources/assets/genetics/textures/items/master_gene_database.png b/genetics/src/main/resources/assets/genetics/textures/items/master_gene_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/master_gene_database.png rename to genetics/src/main/resources/assets/genetics/textures/items/master_gene_database.png diff --git a/src/main/resources/assets/genetics/textures/items/master_registry.png b/genetics/src/main/resources/assets/genetics/textures/items/master_registry.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/master_registry.png rename to genetics/src/main/resources/assets/genetics/textures/items/master_registry.png diff --git a/src/main/resources/assets/genetics/textures/items/misc/diamond_cracked.png b/genetics/src/main/resources/assets/genetics/textures/items/misc/diamond_cracked.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/misc/diamond_cracked.png rename to genetics/src/main/resources/assets/genetics/textures/items/misc/diamond_cracked.png diff --git a/src/main/resources/assets/genetics/textures/items/misc/tin_beeswax.png b/genetics/src/main/resources/assets/genetics/textures/items/misc/tin_beeswax.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/misc/tin_beeswax.png rename to genetics/src/main/resources/assets/genetics/textures/items/misc/tin_beeswax.png diff --git a/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png b/genetics/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/misc/vial_dna.png rename to genetics/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png diff --git a/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/misc/vial_dna.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/misc/vial_dna.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/misc/vial_sterilised.png b/genetics/src/main/resources/assets/genetics/textures/items/misc/vial_sterilised.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/misc/vial_sterilised.png rename to genetics/src/main/resources/assets/genetics/textures/items/misc/vial_sterilised.png diff --git a/src/main/resources/assets/genetics/textures/items/panel_etched.png b/genetics/src/main/resources/assets/genetics/textures/items/panel_etched.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/panel_etched.png rename to genetics/src/main/resources/assets/genetics/textures/items/panel_etched.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/blindness.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/blindness.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/blindness.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/blindness.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/bonemeal.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/bonemeal.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/bonemeal.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/bonemeal.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/food.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/food.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/food.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/food.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/gravity.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/gravity.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/gravity.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/gravity.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/lightning.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/lightning.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/lightning.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/lightning.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/meteor.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/meteor.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/meteor.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/meteor.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/radioactive.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/radioactive.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/radioactive.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/radioactive.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/water.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/water.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/water.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/water.png diff --git a/src/main/resources/assets/genetics/textures/items/particles/wither.png b/genetics/src/main/resources/assets/genetics/textures/items/particles/wither.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/particles/wither.png rename to genetics/src/main/resources/assets/genetics/textures/items/particles/wither.png diff --git a/src/main/resources/assets/genetics/textures/items/punnett_square.png b/genetics/src/main/resources/assets/genetics/textures/items/punnett_square.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/punnett_square.png rename to genetics/src/main/resources/assets/genetics/textures/items/punnett_square.png diff --git a/src/main/resources/assets/genetics/textures/items/registry.png b/genetics/src/main/resources/assets/genetics/textures/items/registry.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/registry.png rename to genetics/src/main/resources/assets/genetics/textures/items/registry.png diff --git a/src/main/resources/assets/genetics/textures/items/sequencer.png b/genetics/src/main/resources/assets/genetics/textures/items/sequencer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sequencer.png rename to genetics/src/main/resources/assets/genetics/textures/items/sequencer.png diff --git a/src/main/resources/assets/genetics/textures/items/sequencer.png.mcmeta b/genetics/src/main/resources/assets/genetics/textures/items/sequencer.png.mcmeta similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sequencer.png.mcmeta rename to genetics/src/main/resources/assets/genetics/textures/items/sequencer.png.mcmeta diff --git a/src/main/resources/assets/genetics/textures/items/sequencer_empty.png b/genetics/src/main/resources/assets/genetics/textures/items/sequencer_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sequencer_empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/sequencer_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/serum_empty.png b/genetics/src/main/resources/assets/genetics/textures/items/serum_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/serum_empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/serum_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/serum_spray.png b/genetics/src/main/resources/assets/genetics/textures/items/serum_spray.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/serum_spray.png rename to genetics/src/main/resources/assets/genetics/textures/items/serum_spray.png diff --git a/src/main/resources/assets/genetics/textures/items/sterilised_dish.png b/genetics/src/main/resources/assets/genetics/textures/items/sterilised_dish.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/sterilised_dish.png rename to genetics/src/main/resources/assets/genetics/textures/items/sterilised_dish.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/can_work.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/can_work.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/can_work.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/can_work.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/cannot_work.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/cannot_work.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/cannot_work.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/cannot_work.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/is_not_working.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/is_not_working.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/is_not_working.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/is_not_working.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/is_working.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/is_working.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/is_working.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/is_working.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/no_blank_template.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/no_blank_template.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/no_blank_template.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/no_blank_template.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/no_template.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/no_template.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/no_template.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/no_template.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/power_full.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/power_full.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/power_full.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/power_full.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/power_high.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/power_high.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/power_high.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/power_high.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/power_low.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/power_low.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/power_low.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/power_low.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/power_medium.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/power_medium.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/power_medium.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/power_medium.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/power_none.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/power_none.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/power_none.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/power_none.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/serum_empty.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_empty.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/serum_empty.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_empty.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/serum_full.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_full.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/serum_full.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_full.png diff --git a/src/main/resources/assets/genetics/textures/items/triggers/serum_pure.png b/genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_pure.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/triggers/serum_pure.png rename to genetics/src/main/resources/assets/genetics/textures/items/triggers/serum_pure.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/bacteria.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/bacteria.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/bacteria.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/bacteria.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/bacteria.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/bacteria.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/bacteria.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/bacteria.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/dye.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/dye.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/dye.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/dye.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/dye.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/dye.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/dye.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/dye.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/enzyme.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/enzyme.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/enzyme.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/enzyme.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/enzyme.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/enzyme.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/enzyme.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/enzyme.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/individual.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/individual.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/individual.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/individual.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/individual.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/individual.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/individual.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/individual.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/mutator.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/mutator.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/mutator.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/mutator.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/mutator.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/mutator.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/mutator.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/mutator.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/nugget.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/nugget.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/nugget.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/nugget.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/nugget.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/nugget.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/nugget.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/nugget.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/sequencer.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/sequencer.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/sequencer.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/sequencer.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/sequencer.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/sequencer.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/sequencer.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/sequencer.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/serum.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/serum.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/serum.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/serum.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/serum.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/serum.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/serum.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/serum.1.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/template.0.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/template.0.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/template.0.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/template.0.png diff --git a/src/main/resources/assets/genetics/textures/items/validator/template.1.png b/genetics/src/main/resources/assets/genetics/textures/items/validator/template.1.png similarity index 100% rename from src/main/resources/assets/genetics/textures/items/validator/template.1.png rename to genetics/src/main/resources/assets/genetics/textures/items/validator/template.1.png diff --git a/src/main/resources/assets/genetics/textures/tile/acclimatiser.png b/genetics/src/main/resources/assets/genetics/textures/tile/acclimatiser.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/acclimatiser.png rename to genetics/src/main/resources/assets/genetics/textures/tile/acclimatiser.png diff --git a/src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/adv_genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/advanced_genetic_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/advanced_genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/advanced_genetic_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/advanced_genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/advanced_indexer.png b/genetics/src/main/resources/assets/genetics/textures/tile/advanced_indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/advanced_indexer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/advanced_indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/analyser.png b/genetics/src/main/resources/assets/genetics/textures/tile/analyser.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/analyser.png rename to genetics/src/main/resources/assets/genetics/textures/tile/analyser.png diff --git a/src/main/resources/assets/genetics/textures/tile/apiarist_databank.png b/genetics/src/main/resources/assets/genetics/textures/tile/apiarist_databank.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/apiarist_databank.png rename to genetics/src/main/resources/assets/genetics/textures/tile/apiarist_databank.png diff --git a/src/main/resources/assets/genetics/textures/tile/apiarist_database.png b/genetics/src/main/resources/assets/genetics/textures/tile/apiarist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/apiarist_database.png rename to genetics/src/main/resources/assets/genetics/textures/tile/apiarist_database.png diff --git a/src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png b/genetics/src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/apiarist_indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/apiarist_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/apiarist_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/apiarist_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/apiarist_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/arborist_database.png b/genetics/src/main/resources/assets/genetics/textures/tile/arborist_database.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/arborist_database.png rename to genetics/src/main/resources/assets/genetics/textures/tile/arborist_database.png diff --git a/src/main/resources/assets/genetics/textures/tile/arborist_indexer.png b/genetics/src/main/resources/assets/genetics/textures/tile/arborist_indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/arborist_indexer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/arborist_indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/assembler.png b/genetics/src/main/resources/assets/genetics/textures/tile/assembler.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/assembler.png rename to genetics/src/main/resources/assets/genetics/textures/tile/assembler.png diff --git a/src/main/resources/assets/genetics/textures/tile/genepool.png b/genetics/src/main/resources/assets/genetics/textures/tile/genepool.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/genepool.png rename to genetics/src/main/resources/assets/genetics/textures/tile/genepool.png diff --git a/src/main/resources/assets/genetics/textures/tile/genetic_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/genetic_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/incubator.png b/genetics/src/main/resources/assets/genetics/textures/tile/incubator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/incubator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/incubator.png diff --git a/src/main/resources/assets/genetics/textures/tile/indexer.png b/genetics/src/main/resources/assets/genetics/textures/tile/indexer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/indexer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/indexer.png diff --git a/src/main/resources/assets/genetics/textures/tile/industrial_alveary.png b/genetics/src/main/resources/assets/genetics/textures/tile/industrial_alveary.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/industrial_alveary.png rename to genetics/src/main/resources/assets/genetics/textures/tile/industrial_alveary.png diff --git a/src/main/resources/assets/genetics/textures/tile/inoculator.png b/genetics/src/main/resources/assets/genetics/textures/tile/inoculator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/inoculator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/inoculator.png diff --git a/src/main/resources/assets/genetics/textures/tile/isolator.png b/genetics/src/main/resources/assets/genetics/textures/tile/isolator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/isolator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/isolator.png diff --git a/src/main/resources/assets/genetics/textures/tile/isolator_progress.png b/genetics/src/main/resources/assets/genetics/textures/tile/isolator_progress.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/isolator_progress.png rename to genetics/src/main/resources/assets/genetics/textures/tile/isolator_progress.png diff --git a/src/main/resources/assets/genetics/textures/tile/items.png b/genetics/src/main/resources/assets/genetics/textures/tile/items.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/items.png rename to genetics/src/main/resources/assets/genetics/textures/tile/items.png diff --git a/src/main/resources/assets/genetics/textures/tile/lab_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/lab_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/lab_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/lab_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/lab_machine_base.png b/genetics/src/main/resources/assets/genetics/textures/tile/lab_machine_base.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/lab_machine_base.png rename to genetics/src/main/resources/assets/genetics/textures/tile/lab_machine_base.png diff --git a/src/main/resources/assets/genetics/textures/tile/machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/machine_glow.png b/genetics/src/main/resources/assets/genetics/textures/tile/machine_glow.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/machine_glow.png rename to genetics/src/main/resources/assets/genetics/textures/tile/machine_glow.png diff --git a/src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/master_genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Acclimatiser.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Acclimatiser.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Acclimatiser.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Acclimatiser.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Genepool.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Genepool.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Genepool.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Genepool.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Inoculator.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Inoculator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Inoculator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Inoculator.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Isolator.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Isolator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Isolator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Isolator.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Purifier.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Purifier.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Purifier.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Purifier.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Sequencer.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Sequencer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Sequencer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Sequencer.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Splicer.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Splicer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Splicer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Splicer.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/Synthesizer.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/Synthesizer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/Synthesizer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/Synthesizer.png diff --git a/src/main/resources/assets/genetics/textures/tile/old/genetic_machine.png b/genetics/src/main/resources/assets/genetics/textures/tile/old/genetic_machine.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/old/genetic_machine.png rename to genetics/src/main/resources/assets/genetics/textures/tile/old/genetic_machine.png diff --git a/src/main/resources/assets/genetics/textures/tile/polymeriser.png b/genetics/src/main/resources/assets/genetics/textures/tile/polymeriser.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/polymeriser.png rename to genetics/src/main/resources/assets/genetics/textures/tile/polymeriser.png diff --git a/src/main/resources/assets/genetics/textures/tile/purifier.png b/genetics/src/main/resources/assets/genetics/textures/tile/purifier.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/purifier.png rename to genetics/src/main/resources/assets/genetics/textures/tile/purifier.png diff --git a/src/main/resources/assets/genetics/textures/tile/replicator.png b/genetics/src/main/resources/assets/genetics/textures/tile/replicator.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/replicator.png rename to genetics/src/main/resources/assets/genetics/textures/tile/replicator.png diff --git a/src/main/resources/assets/genetics/textures/tile/sequencer.png b/genetics/src/main/resources/assets/genetics/textures/tile/sequencer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/sequencer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/sequencer.png diff --git a/src/main/resources/assets/genetics/textures/tile/splicer.png b/genetics/src/main/resources/assets/genetics/textures/tile/splicer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/splicer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/splicer.png diff --git a/src/main/resources/assets/genetics/textures/tile/synthesizer.png b/genetics/src/main/resources/assets/genetics/textures/tile/synthesizer.png similarity index 100% rename from src/main/resources/assets/genetics/textures/tile/synthesizer.png rename to genetics/src/main/resources/assets/genetics/textures/tile/synthesizer.png diff --git a/gradle.properties b/gradle.properties index 4afa0784..00ac5b5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ forestry_version=5.5.0.154 ic2_version=2.8.14-ex112 version_major=2 -version_minor=2 +version_minor=3 version_patch=0 jei_version=4.7.5.84 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..41fa5815 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'binnie-mods-' + mcversion + +include ':all', ':api', ':core', ':botany', ':extrabees', ':extratrees', ':genetics' \ No newline at end of file diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java deleted file mode 100644 index bd5f795f..00000000 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ /dev/null @@ -1,2960 +0,0 @@ -package binnie.botany.genetics; - -import net.minecraft.util.IStringSerializable; - -import forestry.api.genetics.AlleleManager; - -import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.allele.AlleleFlowerColor; -import binnie.core.util.I18N; - -//TODO: Clean Up -public enum EnumFlowerColor implements IStringSerializable { - Aquamarine("aquamarine", 8388564), - Black("black", 2631720), - Blue("blue", 255), - Brown("brown", 10824234), - CadetBlue("cadetBlue", 6266528), - Chocolate("chocolate", 13789470), - Coral("coral", 16744272), - Crimson("crimson", 14423100), - Cyan("cyan", 65535), - DarkGoldenrod("darkGoldenrod", 12092939), - DarkGray("darkGray", 11119017), - DarkGreen("darkGreen", 25600), - DarkKhaki("darkKhaki", 12433259), - DarkOliveGreen("darkOliveGreen", 5597999), - DarkOrange("darkOrange", 16747520), - DarkSalmon("darkSalmon", 15308410), - DarkSeaGreen("darkSeaGreen", 9419915), - DarkSlateBlue("darkSlateBlue", 4734347), - DarkSlateGray("darkSlateGray", 3100495), - DarkTurquoise("darkTurquoise", 52945), - DarkViolet("darkViolet", 9699539), - DeepPink("deepPink", 16716947), - DeepSkyBlue("deepSkyBlue", 49151), - DimGray("dimGray", 6908265), - DodgerBlue("dodgerBlue", 2003199), - Gold("gold", 16766720), - Goldenrod("goldenrod", 14329120), - Gray("gray", 8421504), - Green("green", 32768), - HotPink("hotPink", 16738740), - IndianRed("indianRed", 13458524), - Indigo("indigo", 4915330), - Khaki("khaki", 15787660), - Lavender("lavender", 15132410), - LemonChiffon("lemonChiffon", 16775885), - LightGray("lightGray", 13882323), - LightSeaGreen("lightSeaGreen", 2142890), - LightSteelBlue("lightSteelBlue", 11584734), - Lime("lime", 65280), - LimeGreen("limeGreen", 3329330), - Magenta("magenta", 16711935), - Maroon("maroon", 8388608), - MediumAquamarine("mediumAquamarine", 6737322), - MediumOrchid("mediumOrchid", 12211667), - MediumPurple("mediumPurple", 9662683), - MediumSeaGreen("mediumSeaGreen", 3978097), - MediumVioletRed("mediumVioletRed", 13047173), - MistyRose("mistyRose", 16770273), - Navy("navy", 128), - Olive("olive", 8421376), - OliveDrab("oliveDrab", 7048739), - Orange("orange", 16753920), - PaleGreen("paleGreen", 10025880), - PaleTurquoise("paleTurquoise", 11529966), - PaleVioletRed("paleVioletRed", 14381203), - Peru("peru", 13468991), - Pink("pink", 16761035), - Plum("plum", 14524637), - Purple("purple", 8388736), - Red("red", 16711680), - RosyBrown("rosyBrown", 12357519), - RoyalBlue("royalBlue", 4286945), - Salmon("salmon", 16416882), - SandyBrown("sandyBrown", 16032864), - SeaGreen("seaGreen", 3050327), - Sienna("sienna", 10506797), - SkyBlue("skyBlue", 8900331), - SlateBlue("slateBlue", 6970061), - SlateGray("slateGray", 7372944), - SpringGreen("springGreen", 65407), - SteelBlue("steelBlue", 4620980), - Tan("tan", 13808780), - Teal("teal", 32896), - Thistle("thistle", 14204888), - Turquoise("turquoise", 4251856), - Violet("violet", 15631086), - Wheat("wheat", 16113331), - White("white", 16777215), - Yellow("yellow", 16776960), - YellowGreen("yellowGreen", 10145074); - - public static final EnumFlowerColor[] VALUES = values(); - - private final String ident; - private AlleleFlowerColor allele; - - EnumFlowerColor(String ident, int color) { - this.ident = ident; - int r = color >> 16 & 0xFF; - int g = color >> 8 & 0xFF; - int b = color & 0xFF; - r = (int) (0.45 * (r + 214)); - g = (int) (0.45 * (g + 174)); - b = (int) (0.45 * (b + 131)); - int colorDis = (r << 16) + (g << 8) + b; - String uid = "botany.color" + name(); - allele = new AlleleFlowerColor(uid, ordinal(), color, colorDis, name().toLowerCase(), uid, true); - } - - public String getIdent() { - return ident; - } - - public static void addMix(EnumFlowerColor start1, EnumFlowerColor start2, EnumFlowerColor result, int chance) { - BotanyCore.getFlowerRoot().registerColourMix(new ColorMix(start1.allele, start2.allele, result.allele, chance)); - } - - public static void setupMutations() { - addMix(EnumFlowerColor.Blue, EnumFlowerColor.Aquamarine, EnumFlowerColor.SteelBlue, 55); - addMix(EnumFlowerColor.Blue, EnumFlowerColor.Black, EnumFlowerColor.Navy, 85); - addMix(EnumFlowerColor.Brown, EnumFlowerColor.Aquamarine, EnumFlowerColor.Gray, 50); - addMix(EnumFlowerColor.Brown, EnumFlowerColor.Black, EnumFlowerColor.Maroon, 90); - addMix(EnumFlowerColor.Brown, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 85); - addMix(EnumFlowerColor.CadetBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 100); - addMix(EnumFlowerColor.CadetBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 75); - addMix(EnumFlowerColor.CadetBlue, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 85); - addMix(EnumFlowerColor.Chocolate, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.Chocolate, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 65); - addMix(EnumFlowerColor.Chocolate, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 100); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.Black, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 65); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.CadetBlue, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.Coral, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 115); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Aquamarine, EnumFlowerColor.RosyBrown, 45); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Black, EnumFlowerColor.Maroon, 80); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 85); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 115); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Chocolate, EnumFlowerColor.Red, 100); - addMix(EnumFlowerColor.Crimson, EnumFlowerColor.Coral, EnumFlowerColor.IndianRed, 105); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Blue, EnumFlowerColor.DodgerBlue, 60); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Brown, EnumFlowerColor.CadetBlue, 50); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Chocolate, EnumFlowerColor.MediumAquamarine, 65); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Coral, EnumFlowerColor.MediumAquamarine, 65); - addMix(EnumFlowerColor.Cyan, EnumFlowerColor.Crimson, EnumFlowerColor.SlateGray, 50); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 55); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 85); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.CadetBlue, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 110); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Coral, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Crimson, EnumFlowerColor.Sienna, 85); - addMix(EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Cyan, EnumFlowerColor.MediumSeaGreen, 75); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Black, EnumFlowerColor.DimGray, 70); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 75); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 95); - addMix(EnumFlowerColor.DarkGray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumSeaGreen, 75); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 65); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkOliveGreen, 70); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Coral, EnumFlowerColor.Olive, 60); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Crimson, EnumFlowerColor.Sienna, 55); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.Cyan, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkOliveGreen, 85); - addMix(EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Black, EnumFlowerColor.DarkOliveGreen, 60); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Brown, EnumFlowerColor.Chocolate, 75); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Coral, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 75); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 110); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkGray, EnumFlowerColor.Tan, 105); - addMix(EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 50); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Coral, EnumFlowerColor.Peru, 75); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 70); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Cyan, EnumFlowerColor.LightSeaGreen, 75); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Olive, 100); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.Green, 115); - addMix(EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkKhaki, 70); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Black, EnumFlowerColor.Sienna, 60); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Blue, EnumFlowerColor.Violet, 55); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Brown, EnumFlowerColor.Chocolate, 85); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkGoldenrod, 80); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 115); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Coral, EnumFlowerColor.SandyBrown, 115); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Crimson, EnumFlowerColor.Red, 90); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.Cyan, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 110); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGray, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGreen, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Goldenrod, 100); - addMix(EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGoldenrod, 80); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Black, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 70); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Chocolate, EnumFlowerColor.Coral, 110); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Coral, EnumFlowerColor.Salmon, 120); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 75); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGray, EnumFlowerColor.RosyBrown, 105); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGreen, EnumFlowerColor.Olive, 65); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Peru, 80); - addMix(EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 110); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Black, EnumFlowerColor.DarkOliveGreen, 60); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumAquamarine, 105); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkGoldenrod, 80); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Coral, EnumFlowerColor.Tan, 80); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 100); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.YellowGreen, 110); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.Goldenrod, 85); - addMix(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Brown, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.RoyalBlue, 85); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.Brown, 75); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Coral, EnumFlowerColor.IndianRed, 70); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 60); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSlateGray, 75); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Gray, 55); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DimGray, 70); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.Sienna, 60); - addMix(EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.SlateGray, 65); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Aquamarine, EnumFlowerColor.LightSeaGreen, 70); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Blue, EnumFlowerColor.Navy, 95); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.CadetBlue, EnumFlowerColor.Teal, 95); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Chocolate, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Coral, EnumFlowerColor.Sienna, 75); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 80); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Cyan, EnumFlowerColor.LightSeaGreen, 70); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkOliveGreen, 85); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGray, EnumFlowerColor.Gray, 85); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 100); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkOliveGreen, 75); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGoldenrod, 70); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Gray, 75); - addMix(EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.SeaGreen, 80); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 110); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Black, EnumFlowerColor.Teal, 55); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Brown, EnumFlowerColor.Teal, 60); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 115); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Chocolate, EnumFlowerColor.SeaGreen, 70); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Coral, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Crimson, EnumFlowerColor.SlateGray, 55); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkGray, EnumFlowerColor.LightSeaGreen, 100); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 80); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkKhaki, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSalmon, EnumFlowerColor.LightSeaGreen, 80); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 105); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 70); - addMix(EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Teal, 80); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumPurple, 60); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Black, EnumFlowerColor.Indigo, 85); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Brown, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.CadetBlue, EnumFlowerColor.SlateBlue, 90); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Chocolate, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Coral, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.Cyan, EnumFlowerColor.SteelBlue, 60); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.MediumVioletRed, 55); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkKhaki, EnumFlowerColor.MediumOrchid, 50); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Purple, 55); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkOrange, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSalmon, EnumFlowerColor.MediumOrchid, 75); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Indigo, 100); - addMix(EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.RoyalBlue, 70); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 90); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Brown, EnumFlowerColor.Crimson, 100); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Chocolate, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Coral, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 105); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.Cyan, EnumFlowerColor.MediumPurple, 45); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.IndianRed, 70); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkGray, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkKhaki, EnumFlowerColor.PaleVioletRed, 65); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.MediumVioletRed, 60); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkOrange, EnumFlowerColor.Salmon, 80); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.PaleVioletRed, 55); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.DeepPink, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 100); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkTurquoise, 90); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 75); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Brown, EnumFlowerColor.SteelBlue, 60); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Coral, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Crimson, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Cyan, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.Teal, 65); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.LightSeaGreen, 75); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkTurquoise, 85); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SkyBlue, 110); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.RoyalBlue, 70); - addMix(EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 80); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.CadetBlue, EnumFlowerColor.SlateGray, 100); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Chocolate, EnumFlowerColor.Sienna, 95); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Coral, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 100); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.Cyan, EnumFlowerColor.LightSeaGreen, 80); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Olive, 95); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, EnumFlowerColor.Gray, 105); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 100); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkOrange, EnumFlowerColor.Peru, 90); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkSalmon, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 95); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.DimGray, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SteelBlue, 90); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 90); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Brown, EnumFlowerColor.SlateBlue, 75); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SteelBlue, 100); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Crimson, EnumFlowerColor.SlateBlue, 75); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 85); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.SteelBlue, 100); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.Teal, 65); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SteelBlue, 70); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.Gray, 70); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.SlateGray, 80); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DeepSkyBlue, 80); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.RoyalBlue, 90); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SteelBlue, 90); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DeepSkyBlue, 95); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 90); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.DodgerBlue, EnumFlowerColor.DimGray, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Aquamarine, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Brown, EnumFlowerColor.Peru, 65); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Chocolate, EnumFlowerColor.Orange, 90); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Coral, EnumFlowerColor.Orange, 90); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Crimson, EnumFlowerColor.Chocolate, 65); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.Cyan, EnumFlowerColor.PaleGreen, 80); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Khaki, 110); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkOrange, EnumFlowerColor.Orange, 100); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Goldenrod, 90); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Olive, 65); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DeepPink, EnumFlowerColor.Coral, 55); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DimGray, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Gold, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSeaGreen, 60); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Aquamarine, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 45); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Brown, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 105); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Coral, EnumFlowerColor.DarkOrange, 100); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Crimson, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 80); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Orange, 115); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkGoldenrod, 110); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Olive, 90); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkOrange, EnumFlowerColor.Orange, 110); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSalmon, EnumFlowerColor.SandyBrown, 100); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Olive, 75); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 50); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DeepPink, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGoldenrod, 90); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.DodgerBlue, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.Goldenrod, EnumFlowerColor.Gold, EnumFlowerColor.Orange, 115); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, EnumFlowerColor.SlateGray, 105); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 90); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Olive, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, EnumFlowerColor.SlateGray, 115); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkOrange, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkSalmon, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DimGray, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DimGray, EnumFlowerColor.SlateGray, 120); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 100); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Gray, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Black, EnumFlowerColor.DarkGreen, 85); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 60); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Brown, EnumFlowerColor.DarkOliveGreen, 60); - addMix(EnumFlowerColor.Green, EnumFlowerColor.CadetBlue, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Chocolate, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Coral, EnumFlowerColor.Olive, 65); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Cyan, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkGray, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 120); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkKhaki, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGreen, 115); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkOrange, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkSalmon, EnumFlowerColor.OliveDrab, 70); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumSeaGreen, 100); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkSlateGray, 70); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGreen, 95); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SeaGreen, 70); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGreen, 100); - addMix(EnumFlowerColor.Green, EnumFlowerColor.DodgerBlue, EnumFlowerColor.Teal, 65); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Goldenrod, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.Green, EnumFlowerColor.Gray, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Aquamarine, EnumFlowerColor.Thistle, 50); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 80); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.CadetBlue, EnumFlowerColor.Plum, 85); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Chocolate, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Coral, EnumFlowerColor.Salmon, 95); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Crimson, EnumFlowerColor.DeepPink, 100); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Cyan, EnumFlowerColor.SkyBlue, 55); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Salmon, 70); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkGray, EnumFlowerColor.PaleVioletRed, 100); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkKhaki, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkOrange, EnumFlowerColor.Coral, 80); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 100); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 60); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 115); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 65); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DimGray, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Gold, EnumFlowerColor.SandyBrown, 60); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSalmon, 70); - addMix(EnumFlowerColor.HotPink, EnumFlowerColor.Gray, EnumFlowerColor.PaleVioletRed, 100); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkGray, 55); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Black, EnumFlowerColor.Maroon, 80); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 80); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Brown, EnumFlowerColor.Crimson, 110); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.CadetBlue, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Chocolate, EnumFlowerColor.Red, 105); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Coral, EnumFlowerColor.Salmon, 110); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 115); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Cyan, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Chocolate, 90); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 60); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Peru, 85); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkOrange, EnumFlowerColor.Chocolate, 95); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Salmon, 110); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Peru, 75); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 110); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SteelBlue, 70); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Gold, EnumFlowerColor.Orange, 75); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Goldenrod, EnumFlowerColor.Peru, 85); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Gray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.Green, EnumFlowerColor.DarkOliveGreen, 60); - addMix(EnumFlowerColor.IndianRed, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Black, EnumFlowerColor.Navy, 95); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Blue, EnumFlowerColor.Navy, 110); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Brown, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Coral, EnumFlowerColor.MediumVioletRed, 65); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Crimson, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Brown, 55); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkGray, EnumFlowerColor.SlateBlue, 70); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkOrange, EnumFlowerColor.Brown, 55); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkSalmon, EnumFlowerColor.MediumVioletRed, 65); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Navy, 115); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.RoyalBlue, 55); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 110); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DeepPink, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DimGray, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Goldenrod, EnumFlowerColor.Brown, 45); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Gray, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.Green, EnumFlowerColor.DarkSlateGray, 65); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.HotPink, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Indigo, EnumFlowerColor.IndianRed, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Brown, EnumFlowerColor.Peru, 65); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Chocolate, EnumFlowerColor.Goldenrod, 85); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Coral, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Crimson, EnumFlowerColor.Salmon, 65); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Cyan, EnumFlowerColor.Aquamarine, 90); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 100); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Wheat, 115); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkOrange, EnumFlowerColor.Goldenrod, 95); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 105); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Gray, 50); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Turquoise, 75); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DimGray, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SkyBlue, 60); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Gold, EnumFlowerColor.Yellow, 115); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Goldenrod, EnumFlowerColor.Gold, 110); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Gray, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.Green, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.HotPink, EnumFlowerColor.DarkSalmon, 65); - addMix(EnumFlowerColor.Khaki, EnumFlowerColor.IndianRed, EnumFlowerColor.SandyBrown, 75); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Blue, EnumFlowerColor.MediumPurple, 65); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.CadetBlue, EnumFlowerColor.SkyBlue, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Cyan, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 110); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Wheat, 90); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGray, 75); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumPurple, 70); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 75); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSteelBlue, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Goldenrod, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 85); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Indigo, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.Lavender, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 90); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 105); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Blue, EnumFlowerColor.MediumPurple, 45); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Brown, EnumFlowerColor.DarkSalmon, 65); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Chocolate, EnumFlowerColor.SandyBrown, 85); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Coral, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Crimson, EnumFlowerColor.Salmon, 70); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Cyan, EnumFlowerColor.Aquamarine, 95); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 100); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Khaki, 110); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkOrange, EnumFlowerColor.Orange, 95); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkGray, 55); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 95); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkViolet, EnumFlowerColor.Violet, 50); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 65); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.PaleTurquoise, 80); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 80); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SkyBlue, 70); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Goldenrod, EnumFlowerColor.Khaki, 100); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 90); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.HotPink, EnumFlowerColor.Pink, 75); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSalmon, 80); - addMix(EnumFlowerColor.LemonChiffon, EnumFlowerColor.Khaki, EnumFlowerColor.Wheat, 115); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Black, EnumFlowerColor.DimGray, 45); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.CadetBlue, EnumFlowerColor.SkyBlue, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Chocolate, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkGray, EnumFlowerColor.LightSteelBlue, 115); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Wheat, 105); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkSalmon, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Gray, 75); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 75); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Indigo, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 105); - addMix(EnumFlowerColor.LightGray, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 105); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 65); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 70); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Brown, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkTurquoise, 120); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.CadetBlue, 105); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Teal, 90); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 120); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 75); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid, 65); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DimGray, EnumFlowerColor.Teal, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.Gray, 70); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Indigo, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Lavender, EnumFlowerColor.DarkTurquoise, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.LightSeaGreen, EnumFlowerColor.LightGray, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Black, EnumFlowerColor.DimGray, 55); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Coral, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 115); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 70); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SlateGray, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 110); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DimGray, EnumFlowerColor.SlateGray, 95); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 105); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 80); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 105); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 75); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Indigo, EnumFlowerColor.SlateBlue, 65); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 85); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Lavender, EnumFlowerColor.LightGray, 115); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.LemonChiffon, EnumFlowerColor.LightGray, 95); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.LightGray, EnumFlowerColor.Lavender, 115); - addMix(EnumFlowerColor.LightSteelBlue, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Aquamarine, EnumFlowerColor.SpringGreen, 105); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.CadetBlue, EnumFlowerColor.LimeGreen, 85); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Chocolate, EnumFlowerColor.YellowGreen, 60); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Coral, EnumFlowerColor.YellowGreen, 55); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Cyan, EnumFlowerColor.SpringGreen, 90); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkGray, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkGreen, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkKhaki, EnumFlowerColor.LimeGreen, 100); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.LimeGreen, 85); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkOrange, EnumFlowerColor.YellowGreen, 65); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkSalmon, EnumFlowerColor.LimeGreen, 65); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.LimeGreen, 105); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumSeaGreen, 50); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.MediumSeaGreen, 65); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SpringGreen, 90); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SpringGreen, 65); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DimGray, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumSeaGreen, 55); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Goldenrod, EnumFlowerColor.LimeGreen, 85); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Gray, EnumFlowerColor.LimeGreen, 85); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Green, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.IndianRed, EnumFlowerColor.LimeGreen, 45); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Khaki, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.Lavender, EnumFlowerColor.PaleGreen, 85); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.LightGray, EnumFlowerColor.SpringGreen, 95); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.Lime, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.SpringGreen, 80); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.SpringGreen, 105); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Black, EnumFlowerColor.DarkGreen, 55); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Blue, EnumFlowerColor.SteelBlue, 50); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Brown, EnumFlowerColor.DarkOliveGreen, 45); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.OliveDrab, 65); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Coral, EnumFlowerColor.DarkKhaki, 60); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Cyan, EnumFlowerColor.SpringGreen, 90); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.Green, 90); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.YellowGreen, 105); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.YellowGreen, 70); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.YellowGreen, 70); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumSeaGreen, 110); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SeaGreen, 55); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.DimGray, 55); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.MediumAquamarine, 70); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DimGray, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSeaGreen, 65); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Gray, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 105); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.OliveDrab, 55); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateGray, 50); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Khaki, EnumFlowerColor.YellowGreen, 100); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Lavender, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.LightGray, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumSeaGreen, 100); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.LimeGreen, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 115); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Aquamarine, EnumFlowerColor.Violet, 70); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Black, EnumFlowerColor.Purple, 70); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Brown, EnumFlowerColor.MediumVioletRed, 85); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Chocolate, EnumFlowerColor.DeepPink, 75); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Coral, EnumFlowerColor.DeepPink, 80); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Crimson, EnumFlowerColor.DeepPink, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Cyan, EnumFlowerColor.MediumPurple, 65); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DeepPink, 60); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkKhaki, EnumFlowerColor.HotPink, 55); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.MediumVioletRed, 50); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkOrange, EnumFlowerColor.DeepPink, 65); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkSalmon, EnumFlowerColor.HotPink, 85); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumOrchid, 50); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkViolet, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkViolet, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumPurple, 75); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 105); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 110); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.MediumPurple, 70); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DimGray, EnumFlowerColor.MediumOrchid, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateBlue, 85); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Goldenrod, EnumFlowerColor.DeepPink, 55); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Gray, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.HotPink, EnumFlowerColor.Violet, 110); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.IndianRed, EnumFlowerColor.DeepPink, 95); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Indigo, EnumFlowerColor.DarkViolet, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Khaki, EnumFlowerColor.HotPink, 50); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.Lavender, EnumFlowerColor.Violet, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Violet, 60); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.LightGray, EnumFlowerColor.Violet, 90); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.Magenta, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 80); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Chocolate, EnumFlowerColor.Sienna, 95); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Coral, EnumFlowerColor.Sienna, 85); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 105); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Sienna, 85); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkGray, EnumFlowerColor.Brown, 75); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkOrange, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Brown, 80); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Sienna, 55); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSlateGray, 50); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DeepPink, EnumFlowerColor.Crimson, 90); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.RoyalBlue, 50); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DimGray, EnumFlowerColor.Brown, 95); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSlateBlue, 70); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Gold, EnumFlowerColor.Chocolate, 55); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Goldenrod, EnumFlowerColor.Sienna, 70); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Gray, EnumFlowerColor.Brown, 90); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Green, EnumFlowerColor.Olive, 60); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.HotPink, EnumFlowerColor.Crimson, 80); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.IndianRed, EnumFlowerColor.Brown, 100); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Indigo, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Khaki, EnumFlowerColor.Chocolate, 55); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Lavender, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSalmon, 55); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.LightGray, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.Maroon, EnumFlowerColor.Magenta, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 55); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Brown, EnumFlowerColor.Gray, 55); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 110); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Coral, EnumFlowerColor.Tan, 70); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Crimson, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 110); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 105); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumSeaGreen, 115); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SlateGray, 65); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Teal, 80); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 70); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 45); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkTurquoise, 95); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DimGray, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 85); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.HotPink, EnumFlowerColor.Thistle, 55); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGray, 65); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Indigo, EnumFlowerColor.SlateBlue, 55); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Lavender, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightGray, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 100); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 110); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 75); - addMix(EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Maroon, EnumFlowerColor.DimGray, 50); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Aquamarine, EnumFlowerColor.LightSteelBlue, 70); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Black, EnumFlowerColor.Purple, 75); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 100); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Brown, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Chocolate, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Coral, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Cyan, EnumFlowerColor.DodgerBlue, 70); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkGray, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkKhaki, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkOrange, EnumFlowerColor.IndianRed, 70); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Plum, 55); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SlateBlue, 100); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 110); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DimGray, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.DodgerBlue, EnumFlowerColor.RoyalBlue, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Gold, EnumFlowerColor.SandyBrown, 50); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Goldenrod, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Gray, EnumFlowerColor.MediumPurple, 100); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.HotPink, EnumFlowerColor.Violet, 110); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.IndianRed, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Indigo, EnumFlowerColor.DarkViolet, 100); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Khaki, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Lavender, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Plum, 65); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.LightGray, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.MediumOrchid, EnumFlowerColor.Maroon, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Aquamarine, EnumFlowerColor.SkyBlue, 75); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 100); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Brown, EnumFlowerColor.MediumVioletRed, 85); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.CadetBlue, EnumFlowerColor.SlateGray, 95); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Chocolate, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Coral, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 75); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSlateGray, 70); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkKhaki, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DimGray, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkSalmon, 70); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.SlateGray, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SlateBlue, 105); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SlateBlue, 95); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 85); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 110); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 90); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DimGray, EnumFlowerColor.SlateBlue, 100); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.DodgerBlue, EnumFlowerColor.RoyalBlue, 105); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Gold, EnumFlowerColor.Tan, 55); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Goldenrod, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Green, EnumFlowerColor.Teal, 70); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.HotPink, EnumFlowerColor.MediumOrchid, 105); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.IndianRed, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Indigo, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Khaki, EnumFlowerColor.Thistle, 60); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Lavender, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Thistle, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.LightGray, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SteelBlue, 85); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Lime, EnumFlowerColor.MediumSeaGreen, 60); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.LimeGreen, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 110); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.Maroon, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DodgerBlue, 80); - addMix(EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumOrchid, EnumFlowerColor.SlateBlue, 115); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Black, EnumFlowerColor.DarkGreen, 65); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Brown, EnumFlowerColor.DarkOliveGreen, 55); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.OliveDrab, 70); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Coral, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Crimson, EnumFlowerColor.Sienna, 50); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 100); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 115); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Teal, 70); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 65); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.LightSeaGreen, 85); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DimGray, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Gray, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.HotPink, EnumFlowerColor.Gray, 45); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 60); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Lavender, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LightGray, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 105); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Maroon, EnumFlowerColor.DarkOliveGreen, 50); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, 115); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumOrchid, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Black, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Chocolate, EnumFlowerColor.Crimson, 85); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Coral, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Crimson, EnumFlowerColor.DeepPink, 105); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Cyan, EnumFlowerColor.SteelBlue, 45); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.IndianRed, 70); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkGray, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkKhaki, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkOrange, EnumFlowerColor.IndianRed, 70); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.PaleVioletRed, 55); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Purple, 100); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Purple, 100); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.RoyalBlue, 55); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 110); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DimGray, EnumFlowerColor.Purple, 100); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Gold, EnumFlowerColor.Coral, 50); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Goldenrod, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink, 105); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.IndianRed, EnumFlowerColor.DeepPink, 105); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Indigo, EnumFlowerColor.Purple, 100); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Khaki, EnumFlowerColor.PaleVioletRed, 55); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Lavender, EnumFlowerColor.Violet, 80); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.LightGray, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SlateBlue, 65); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumOrchid, 80); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 105); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Maroon, EnumFlowerColor.Brown, 95); - addMix(EnumFlowerColor.MediumVioletRed, EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumOrchid, 105); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Blue, EnumFlowerColor.MediumPurple, 65); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightGray, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Cyan, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 105); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Wheat, 100); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Pink, 105); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.LemonChiffon, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Plum, 65); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGray, 65); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DarkViolet, EnumFlowerColor.Violet, 70); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Goldenrod, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 95); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.HotPink, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Indigo, EnumFlowerColor.MediumOrchid, 50); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Khaki, EnumFlowerColor.Wheat, 100); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Wheat, 105); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.PaleTurquoise, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Lavender, 105); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Lime, EnumFlowerColor.PaleGreen, 80); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.LimeGreen, EnumFlowerColor.PaleGreen, 80); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.Maroon, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.MediumPurple, EnumFlowerColor.Plum, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.MistyRose, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.HotPink, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Brown, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Coral, EnumFlowerColor.Purple, 60); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Crimson, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkSlateBlue, 65); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSlateGray, 65); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkSlateBlue, 55); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkOrange, EnumFlowerColor.Brown, 50); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.RoyalBlue, 55); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SteelBlue, 55); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DarkViolet, EnumFlowerColor.Indigo, 105); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DeepPink, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DimGray, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Gray, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Green, EnumFlowerColor.Teal, 60); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.HotPink, EnumFlowerColor.Purple, 75); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.IndianRed, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.LightGray, EnumFlowerColor.SlateBlue, 50); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, 85); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.Maroon, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.RoyalBlue, 50); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.Navy, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Indigo, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 45); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.CadetBlue, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Coral, EnumFlowerColor.Peru, 85); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Crimson, EnumFlowerColor.Sienna, 75); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Cyan, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkGray, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkGreen, EnumFlowerColor.Green, 105); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, EnumFlowerColor.OliveDrab, 110); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.OliveDrab, 110); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGoldenrod, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkOliveGreen, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 50); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DeepPink, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DimGray, EnumFlowerColor.DarkOliveGreen, 100); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.DodgerBlue, EnumFlowerColor.Teal, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, 105); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Gray, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 110); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.HotPink, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.IndianRed, EnumFlowerColor.Peru, 80); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Khaki, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Lavender, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.LightGray, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.LimeGreen, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Magenta, EnumFlowerColor.MediumVioletRed, 45); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Maroon, EnumFlowerColor.Sienna, 80); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MediumOrchid, EnumFlowerColor.IndianRed, 55); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MediumPurple, EnumFlowerColor.Gray, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Brown, 60); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.MistyRose, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Olive, EnumFlowerColor.Navy, EnumFlowerColor.Gray, 50); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Black, EnumFlowerColor.DarkOliveGreen, 75); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 70); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.CadetBlue, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Coral, EnumFlowerColor.DarkGoldenrod, 75); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Crimson, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Olive, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkGreen, EnumFlowerColor.Green, 105); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Olive, 110); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Olive, 115); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumSeaGreen, 110); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DimGray, 55); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkOliveGreen, 90); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DeepPink, EnumFlowerColor.IndianRed, 50); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.LightSeaGreen, 70); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DimGray, EnumFlowerColor.DarkOliveGreen, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.DodgerBlue, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Goldenrod, EnumFlowerColor.Olive, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Gray, EnumFlowerColor.DarkOliveGreen, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 115); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.HotPink, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGoldenrod, 70); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Khaki, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Lavender, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.LightGray, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 95); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 105); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.Maroon, EnumFlowerColor.Sienna, 70); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.MediumSeaGreen, 100); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumOrchid, EnumFlowerColor.RosyBrown, 50); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumPurple, EnumFlowerColor.Gray, 55); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.SeaGreen, 110); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Brown, 50); - addMix(EnumFlowerColor.OliveDrab, EnumFlowerColor.MistyRose, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Aquamarine, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Blue, EnumFlowerColor.Plum, 45); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Brown, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkOrange, 105); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Coral, EnumFlowerColor.DarkOrange, 105); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Crimson, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Cyan, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 110); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkGray, EnumFlowerColor.Goldenrod, 95); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkGreen, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 120); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkSalmon, EnumFlowerColor.SandyBrown, 105); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Peru, 55); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGoldenrod, 70); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DarkViolet, EnumFlowerColor.IndianRed, 55); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DeepPink, EnumFlowerColor.Salmon, 70); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 110); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, 120); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Gray, EnumFlowerColor.DarkGoldenrod, 90); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.HotPink, EnumFlowerColor.Coral, 75); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.IndianRed, EnumFlowerColor.Peru, 90); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Khaki, EnumFlowerColor.Gold, 105); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Lavender, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Gold, 100); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.LightGray, EnumFlowerColor.Goldenrod, 95); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Lime, EnumFlowerColor.YellowGreen, 75); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.LimeGreen, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Magenta, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Maroon, EnumFlowerColor.Chocolate, 70); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Salmon, 65); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkSalmon, 65); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Red, 65); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.MistyRose, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.Olive, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.Orange, EnumFlowerColor.OliveDrab, EnumFlowerColor.Goldenrod, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.SpringGreen, 115); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Blue, EnumFlowerColor.SteelBlue, 50); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Brown, EnumFlowerColor.DarkKhaki, 45); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Coral, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Cyan, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.YellowGreen, 105); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.CadetBlue, 55); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Turquoise, 75); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DimGray, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkTurquoise, 65); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Gray, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Green, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkKhaki, 55); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Khaki, EnumFlowerColor.YellowGreen, 105); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Lavender, EnumFlowerColor.Aquamarine, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.LightGray, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumAquamarine, 100); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 115); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.LimeGreen, EnumFlowerColor.SpringGreen, 115); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Aquamarine, 110); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkGray, 65); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumPurple, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.MistyRose, EnumFlowerColor.LemonChiffon, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Olive, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.OliveDrab, EnumFlowerColor.LimeGreen, 95); - addMix(EnumFlowerColor.PaleGreen, EnumFlowerColor.Orange, EnumFlowerColor.Khaki, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 110); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkTurquoise, 105); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Chocolate, EnumFlowerColor.Tan, 75); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Coral, EnumFlowerColor.Tan, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 65); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkGray, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkGreen, EnumFlowerColor.MediumSeaGreen, 75); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkSalmon, EnumFlowerColor.LightGray, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 105); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 65); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumPurple, 75); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DeepPink, EnumFlowerColor.Plum, 75); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DimGray, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 90); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 90); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 80); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Indigo, EnumFlowerColor.MediumPurple, 50); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Lavender, EnumFlowerColor.SkyBlue, 105); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightGray, EnumFlowerColor.SkyBlue, 110); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.SkyBlue, 110); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LimeGreen, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Maroon, EnumFlowerColor.RosyBrown, 50); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Turquoise, 110); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumPurple, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumAquamarine, 100); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Plum, 70); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MistyRose, EnumFlowerColor.LightGray, 95); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Olive, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Orange, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.PaleTurquoise, EnumFlowerColor.PaleGreen, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkGray, 55); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 85); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.CadetBlue, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Chocolate, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Coral, EnumFlowerColor.Salmon, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 105); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Cyan, EnumFlowerColor.SkyBlue, 50); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkGray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 55); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSalmon, 75); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Sienna, 70); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkOrange, EnumFlowerColor.Coral, 85); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Salmon, 105); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 115); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 70); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Gold, EnumFlowerColor.SandyBrown, 65); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Goldenrod, EnumFlowerColor.Peru, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Gray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Green, EnumFlowerColor.DarkOliveGreen, 55); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink, 120); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Indigo, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSalmon, 70); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Lavender, EnumFlowerColor.Thistle, 95); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Pink, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.LightGray, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SlateGray, 65); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, 50); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 105); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Maroon, EnumFlowerColor.Brown, 90); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkGray, 60); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumOrchid, EnumFlowerColor.HotPink, 105); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Gray, 55); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DeepPink, 110); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MistyRose, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Navy, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Olive, EnumFlowerColor.Peru, 70); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.OliveDrab, EnumFlowerColor.Peru, 65); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Orange, EnumFlowerColor.SandyBrown, 80); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, 55); - addMix(EnumFlowerColor.PaleVioletRed, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Thistle, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 60); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Brown, EnumFlowerColor.Sienna, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkOrange, 120); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Coral, EnumFlowerColor.Chocolate, 115); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 115); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkGray, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Olive, 90); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 115); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkSalmon, EnumFlowerColor.SandyBrown, 115); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 65); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DeepPink, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 100); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, 110); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.HotPink, EnumFlowerColor.Salmon, 85); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.IndianRed, EnumFlowerColor.Chocolate, 100); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Indigo, EnumFlowerColor.MediumVioletRed, 65); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Khaki, EnumFlowerColor.Goldenrod, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Lavender, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.LightGray, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.LimeGreen, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Magenta, EnumFlowerColor.DeepPink, 70); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Maroon, EnumFlowerColor.Sienna, 90); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MediumOrchid, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MediumPurple, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.IndianRed, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.MistyRose, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Olive, EnumFlowerColor.DarkGoldenrod, 100); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.OliveDrab, EnumFlowerColor.Olive, 95); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.Orange, EnumFlowerColor.DarkOrange, 115); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Peru, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Salmon, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 75); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 70); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkGray, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Cyan, EnumFlowerColor.PaleTurquoise, 60); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.SandyBrown, 85); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkGray, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 60); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Tan, 70); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Salmon, 110); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Tan, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Gray, 65); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SkyBlue, 65); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 100); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DimGray, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Goldenrod, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Gray, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 60); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.IndianRed, EnumFlowerColor.Salmon, 100); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Indigo, EnumFlowerColor.MediumOrchid, 60); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Khaki, EnumFlowerColor.Wheat, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Lavender, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.LemonChiffon, EnumFlowerColor.MistyRose, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.LightGray, EnumFlowerColor.MistyRose, 105); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Thistle, 100); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 60); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Maroon, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightGray, 75); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MediumPurple, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.MistyRose, EnumFlowerColor.Thistle, 115); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Navy, EnumFlowerColor.SlateBlue, 50); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Olive, EnumFlowerColor.Tan, 75); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Orange, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.PaleGreen, EnumFlowerColor.LemonChiffon, 70); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightGray, 80); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.HotPink, 105); - addMix(EnumFlowerColor.Pink, EnumFlowerColor.Peru, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Aquamarine, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Brown, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Chocolate, EnumFlowerColor.Salmon, 85); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Coral, EnumFlowerColor.Salmon, 90); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Cyan, EnumFlowerColor.SkyBlue, 75); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkSalmon, 75); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkGray, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkKhaki, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkSalmon, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 90); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Gold, EnumFlowerColor.Tan, 65); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSalmon, 75); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Gray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 50); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.HotPink, EnumFlowerColor.Violet, 115); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.IndianRed, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Indigo, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Khaki, EnumFlowerColor.MistyRose, 70); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Lavender, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.LemonChiffon, EnumFlowerColor.MistyRose, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.LightGray, EnumFlowerColor.Thistle, 100); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 45); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, 50); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Maroon, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Violet, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MediumPurple, EnumFlowerColor.Violet, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.MistyRose, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Navy, EnumFlowerColor.SlateBlue, 65); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Olive, EnumFlowerColor.Tan, 65); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.OliveDrab, EnumFlowerColor.Tan, 60); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Orange, EnumFlowerColor.SandyBrown, 75); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, 55); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Lavender, 90); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.HotPink, 110); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Peru, EnumFlowerColor.RosyBrown, 85); - addMix(EnumFlowerColor.Plum, EnumFlowerColor.Pink, EnumFlowerColor.Thistle, 110); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumPurple, 50); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Black, EnumFlowerColor.Indigo, 95); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Blue, EnumFlowerColor.Indigo, 105); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Brown, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Chocolate, EnumFlowerColor.Brown, 75); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Coral, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Cyan, EnumFlowerColor.SteelBlue, 50); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Brown, 60); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkOrange, EnumFlowerColor.Crimson, 60); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkSalmon, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Indigo, 105); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DarkViolet, EnumFlowerColor.Indigo, 115); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 100); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Goldenrod, EnumFlowerColor.IndianRed, 50); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.HotPink, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.IndianRed, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Lavender, EnumFlowerColor.MediumOrchid, 65); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleVioletRed, 50); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.LightGray, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSlateBlue, 65); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.MediumOrchid, EnumFlowerColor.DarkViolet, 105); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkViolet, 100); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.MistyRose, EnumFlowerColor.PaleVioletRed, 65); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Navy, EnumFlowerColor.Indigo, 110); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Olive, EnumFlowerColor.Brown, 55); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Orange, EnumFlowerColor.IndianRed, 50); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumPurple, 65); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumVioletRed, 95); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Peru, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Pink, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.Purple, EnumFlowerColor.Plum, EnumFlowerColor.MediumOrchid, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSalmon, 50); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Black, EnumFlowerColor.Maroon, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Blue, EnumFlowerColor.Magenta, 70); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Brown, EnumFlowerColor.Crimson, 110); - addMix(EnumFlowerColor.Red, EnumFlowerColor.CadetBlue, EnumFlowerColor.IndianRed, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 115); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Chocolate, 90); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkGray, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkGreen, EnumFlowerColor.Maroon, 55); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Chocolate, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Brown, 70); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkOrange, EnumFlowerColor.Coral, 100); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkSalmon, EnumFlowerColor.IndianRed, 105); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.Brown, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Brown, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DeepPink, EnumFlowerColor.Crimson, 95); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Plum, 60); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DimGray, EnumFlowerColor.Brown, 95); - addMix(EnumFlowerColor.Red, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Gold, EnumFlowerColor.Chocolate, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Goldenrod, EnumFlowerColor.Chocolate, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Gray, EnumFlowerColor.Crimson, 95); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Green, EnumFlowerColor.Sienna, 50); - addMix(EnumFlowerColor.Red, EnumFlowerColor.HotPink, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Red, EnumFlowerColor.IndianRed, EnumFlowerColor.Crimson, 110); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Indigo, EnumFlowerColor.Brown, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Khaki, EnumFlowerColor.Coral, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Lavender, EnumFlowerColor.Salmon, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Salmon, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.LightGray, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.Sienna, 60); - addMix(EnumFlowerColor.Red, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.IndianRed, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Magenta, EnumFlowerColor.DeepPink, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Maroon, EnumFlowerColor.Brown, 100); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MediumOrchid, EnumFlowerColor.DeepPink, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.Sienna, 55); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Crimson, 95); - addMix(EnumFlowerColor.Red, EnumFlowerColor.MistyRose, EnumFlowerColor.Salmon, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Olive, EnumFlowerColor.Sienna, 75); - addMix(EnumFlowerColor.Red, EnumFlowerColor.OliveDrab, EnumFlowerColor.Sienna, 65); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Orange, EnumFlowerColor.Coral, 90); - addMix(EnumFlowerColor.Red, EnumFlowerColor.PaleGreen, EnumFlowerColor.Peru, 50); - addMix(EnumFlowerColor.Red, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Red, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Crimson, 100); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Peru, EnumFlowerColor.Chocolate, 105); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Pink, EnumFlowerColor.Salmon, 90); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Plum, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Red, EnumFlowerColor.Purple, EnumFlowerColor.Crimson, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkGray, 90); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkOrange, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Salmon, 115); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DimGray, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DimGray, EnumFlowerColor.Gray, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 90); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Goldenrod, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.IndianRed, EnumFlowerColor.PaleVioletRed, 110); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Indigo, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Khaki, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Lavender, EnumFlowerColor.Thistle, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.LightGray, EnumFlowerColor.DarkGray, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Thistle, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 65); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Maroon, EnumFlowerColor.Brown, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumOrchid, EnumFlowerColor.PaleVioletRed, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumPurple, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DeepPink, 100); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.MistyRose, EnumFlowerColor.Pink, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Olive, EnumFlowerColor.DarkGoldenrod, 90); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.OliveDrab, EnumFlowerColor.Olive, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Orange, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.HotPink, 115); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Peru, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Pink, EnumFlowerColor.Thistle, 110); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Plum, EnumFlowerColor.Thistle, 105); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Purple, EnumFlowerColor.MediumVioletRed, 85); - addMix(EnumFlowerColor.RosyBrown, EnumFlowerColor.Red, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.DeepSkyBlue, 70); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 105); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Brown, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Crimson, EnumFlowerColor.Purple, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 75); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Gray, 65); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSlateGray, 70); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.SlateGray, 60); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SteelBlue, 70); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SlateBlue, 110); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SlateBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.Blue, 105); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.DarkViolet, 90); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DimGray, EnumFlowerColor.SlateBlue, 100); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 110); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 50); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Goldenrod, EnumFlowerColor.Gray, 60); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Gray, EnumFlowerColor.SteelBlue, 100); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Green, EnumFlowerColor.Teal, 65); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.HotPink, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.IndianRed, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Khaki, EnumFlowerColor.DarkGray, 55); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Lavender, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.LemonChiffon, EnumFlowerColor.LightSteelBlue, 65); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightGray, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SteelBlue, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DodgerBlue, 100); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Lime, EnumFlowerColor.MediumSeaGreen, 55); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.LimeGreen, EnumFlowerColor.LightSeaGreen, 60); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Maroon, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DodgerBlue, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumOrchid, EnumFlowerColor.SlateBlue, 105); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue, 115); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkViolet, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.MistyRose, EnumFlowerColor.LightSteelBlue, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Olive, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.OliveDrab, EnumFlowerColor.SlateGray, 65); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.PaleGreen, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DodgerBlue, 80); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Pink, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Plum, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.Red, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.RoyalBlue, EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkKhaki, 60); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Black, EnumFlowerColor.Brown, 65); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.CadetBlue, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Chocolate, EnumFlowerColor.Coral, 110); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 120); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 105); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Cyan, EnumFlowerColor.LightSeaGreen, 65); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkGray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkGreen, EnumFlowerColor.Olive, 60); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkKhaki, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Peru, 75); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkOrange, EnumFlowerColor.Coral, 105); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Coral, 120); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Tan, 75); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SlateGray, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DimGray, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Gold, EnumFlowerColor.Orange, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Goldenrod, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Gray, EnumFlowerColor.RosyBrown, 100); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Green, EnumFlowerColor.Olive, 60); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 105); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSalmon, 115); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Indigo, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Khaki, EnumFlowerColor.SandyBrown, 85); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Lavender, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.LightGray, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Lime, EnumFlowerColor.YellowGreen, 50); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkKhaki, 55); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Magenta, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Maroon, EnumFlowerColor.Crimson, 85); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Tan, 70); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MediumOrchid, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MediumPurple, EnumFlowerColor.PaleVioletRed, 90); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DeepPink, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.MistyRose, EnumFlowerColor.Pink, 100); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Navy, EnumFlowerColor.Purple, 65); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Olive, EnumFlowerColor.Peru, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.OliveDrab, EnumFlowerColor.Peru, 75); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Orange, EnumFlowerColor.DarkOrange, 95); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, 60); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MistyRose, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.IndianRed, 110); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Peru, EnumFlowerColor.Coral, 105); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Pink, EnumFlowerColor.DarkSalmon, 110); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Plum, EnumFlowerColor.PaleVioletRed, 100); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Purple, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.Red, EnumFlowerColor.IndianRed, 110); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSalmon, 110); - addMix(EnumFlowerColor.Salmon, EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Black, EnumFlowerColor.Sienna, 60); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 55); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Brown, EnumFlowerColor.Chocolate, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.CadetBlue, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 110); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 115); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 110); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkGray, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkGreen, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Tan, 105); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkOrange, EnumFlowerColor.Orange, 120); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Coral, 115); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumVioletRed, 65); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DimGray, EnumFlowerColor.Peru, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Goldenrod, EnumFlowerColor.Orange, 115); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Gray, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.HotPink, EnumFlowerColor.Salmon, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.IndianRed, EnumFlowerColor.Coral, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Indigo, EnumFlowerColor.MediumVioletRed, 55); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Khaki, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Lavender, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Wheat, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.LightGray, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Lime, EnumFlowerColor.YellowGreen, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.LimeGreen, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Magenta, EnumFlowerColor.HotPink, 70); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Maroon, EnumFlowerColor.Sienna, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MediumOrchid, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MediumPurple, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.IndianRed, 75); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.MistyRose, EnumFlowerColor.Tan, 105); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Olive, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkGoldenrod, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Orange, EnumFlowerColor.DarkOrange, 115); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Wheat, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Salmon, 90); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Peru, EnumFlowerColor.DarkOrange, 115); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Pink, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Plum, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Purple, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Red, EnumFlowerColor.Coral, 100); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.SandyBrown, EnumFlowerColor.Salmon, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 70); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.Olive, 75); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Coral, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 55); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Cyan, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.Green, 110); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Green, 110); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.Olive, 75); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumSeaGreen, 110); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.DarkSlateGray, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.LightSeaGreen, 100); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 45); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DimGray, EnumFlowerColor.Teal, 100); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Green, EnumFlowerColor.DarkGreen, 115); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.HotPink, EnumFlowerColor.RosyBrown, 50); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.DimGray, 65); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 70); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Lavender, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.LightGray, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumSeaGreen, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 95); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, 75); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.MediumSeaGreen, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateGray, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 70); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Olive, EnumFlowerColor.OliveDrab, 105); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.OliveDrab, EnumFlowerColor.Green, 110); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Orange, EnumFlowerColor.Olive, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Gray, 60); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Peru, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Pink, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Plum, EnumFlowerColor.SlateGray, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.Red, EnumFlowerColor.Sienna, 60); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.RoyalBlue, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.SeaGreen, EnumFlowerColor.SandyBrown, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 60); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Brown, EnumFlowerColor.Maroon, 115); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.CadetBlue, EnumFlowerColor.Gray, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Coral, EnumFlowerColor.Chocolate, 105); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Crimson, EnumFlowerColor.Brown, 110); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Cyan, EnumFlowerColor.LightSeaGreen, 60); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkGray, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkOliveGreen, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Peru, 90); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkOrange, EnumFlowerColor.Chocolate, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Chocolate, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DarkViolet, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DeepPink, EnumFlowerColor.Crimson, 90); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 70); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Goldenrod, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Green, EnumFlowerColor.DarkOliveGreen, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.HotPink, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.IndianRed, EnumFlowerColor.Brown, 110); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Indigo, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Khaki, EnumFlowerColor.Tan, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Lavender, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Tan, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.LightGray, EnumFlowerColor.RosyBrown, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Lime, EnumFlowerColor.OliveDrab, 55); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.LimeGreen, EnumFlowerColor.OliveDrab, 65); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Magenta, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Maroon, EnumFlowerColor.Brown, 110); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.MediumOrchid, EnumFlowerColor.MediumVioletRed, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkOliveGreen, 70); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Crimson, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.MistyRose, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Navy, EnumFlowerColor.Purple, 75); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Olive, EnumFlowerColor.DarkGoldenrod, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.OliveDrab, EnumFlowerColor.Olive, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Orange, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkKhaki, 65); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.IndianRed, 95); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Peru, EnumFlowerColor.Chocolate, 105); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Pink, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Plum, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Purple, EnumFlowerColor.MediumVioletRed, 85); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Red, EnumFlowerColor.Crimson, 110); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.RosyBrown, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.Salmon, EnumFlowerColor.IndianRed, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.SandyBrown, EnumFlowerColor.Peru, 100); - addMix(EnumFlowerColor.Sienna, EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkOliveGreen, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.Turquoise, 100); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 55); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.Tan, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Coral, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 60); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.LightSteelBlue, 105); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 70); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.Tan, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkGray, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Turquoise, 115); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid, 65); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DimGray, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 105); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Indigo, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Lavender, EnumFlowerColor.LightSteelBlue, 105); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.LightGray, EnumFlowerColor.LightSteelBlue, 110); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DeepSkyBlue, 115); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumAquamarine, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MediumOrchid, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MediumPurple, EnumFlowerColor.LightSteelBlue, 95); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.MediumOrchid, 70); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.MistyRose, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Navy, EnumFlowerColor.RoyalBlue, 55); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Olive, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Orange, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.DarkTurquoise, 115); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Thistle, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Peru, EnumFlowerColor.DarkGray, 80); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Pink, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Plum, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Purple, EnumFlowerColor.MediumPurple, 65); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Red, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.RosyBrown, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.RoyalBlue, EnumFlowerColor.DodgerBlue, 95); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Salmon, EnumFlowerColor.RosyBrown, 75); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.SeaGreen, EnumFlowerColor.LightSeaGreen, 90); - addMix(EnumFlowerColor.SkyBlue, EnumFlowerColor.Sienna, EnumFlowerColor.Gray, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.DeepSkyBlue, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Blue, EnumFlowerColor.DarkViolet, 110); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Brown, EnumFlowerColor.Purple, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Coral, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSlateGray, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Gray, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.Blue, 115); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DimGray, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.DodgerBlue, EnumFlowerColor.RoyalBlue, 105); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Gold, EnumFlowerColor.Tan, 50); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Goldenrod, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Gray, EnumFlowerColor.MediumPurple, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Green, EnumFlowerColor.Teal, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.HotPink, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.IndianRed, EnumFlowerColor.MediumOrchid, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 105); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Khaki, EnumFlowerColor.DarkGray, 55); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Lavender, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Thistle, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.LightGray, EnumFlowerColor.MediumPurple, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.SteelBlue, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Lime, EnumFlowerColor.MediumSeaGreen, 55); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.LimeGreen, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Maroon, EnumFlowerColor.Purple, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumOrchid, EnumFlowerColor.MediumPurple, 110); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumPurple, EnumFlowerColor.RoyalBlue, 115); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.SteelBlue, 75); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkViolet, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.MistyRose, EnumFlowerColor.Plum, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Olive, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.OliveDrab, EnumFlowerColor.DimGray, 55); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Orange, EnumFlowerColor.DarkSalmon, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.PaleGreen, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightSteelBlue, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Pink, EnumFlowerColor.Plum, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Plum, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Purple, EnumFlowerColor.DarkViolet, 105); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Red, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumPurple, 120); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.Salmon, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.SandyBrown, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.SeaGreen, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.SlateBlue, EnumFlowerColor.SkyBlue, EnumFlowerColor.DodgerBlue, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Chocolate, EnumFlowerColor.Sienna, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Coral, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Olive, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGray, EnumFlowerColor.Gray, 110); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkOrange, EnumFlowerColor.Peru, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkSalmon, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SlateBlue, 105); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DimGray, 105); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 105); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumVioletRed, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SteelBlue, 105); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DimGray, EnumFlowerColor.Gray, 115); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 110); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Gray, EnumFlowerColor.DimGray, 120); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Khaki, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Lavender, EnumFlowerColor.LightSteelBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.LemonChiffon, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.LightGray, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkGray, 105); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 75); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.MediumOrchid, EnumFlowerColor.MediumPurple, 110); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue, 115); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.MistyRose, EnumFlowerColor.DarkGray, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Olive, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.OliveDrab, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Orange, EnumFlowerColor.DarkGoldenrod, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.SkyBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Pink, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, 95); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Red, EnumFlowerColor.Crimson, 85); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.RosyBrown, EnumFlowerColor.Gray, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.RoyalBlue, EnumFlowerColor.SteelBlue, 115); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.Salmon, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.SandyBrown, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.SeaGreen, EnumFlowerColor.Teal, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.SkyBlue, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SlateGray, EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumPurple, 115); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 110); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Blue, EnumFlowerColor.SteelBlue, 45); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.LimeGreen, 60); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Coral, EnumFlowerColor.DarkSeaGreen, 55); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Cyan, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkKhaki, EnumFlowerColor.LimeGreen, 100); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.YellowGreen, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.PaleGreen, 105); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.LightSeaGreen, 50); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.MediumSeaGreen, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DarkViolet, EnumFlowerColor.SteelBlue, 55); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.Turquoise, 75); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DimGray, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkTurquoise, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Gold, EnumFlowerColor.Lime, 90); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.LimeGreen, 85); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Gray, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Green, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.MediumSeaGreen, 45); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Khaki, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Lavender, EnumFlowerColor.Aquamarine, 90); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.LightGray, EnumFlowerColor.Aquamarine, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Lime, EnumFlowerColor.PaleGreen, 120); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.LimeGreen, EnumFlowerColor.Lime, 115); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Magenta, EnumFlowerColor.MediumPurple, 60); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.PaleGreen, 110); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumOrchid, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumPurple, EnumFlowerColor.LightSeaGreen, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.MistyRose, EnumFlowerColor.Aquamarine, 80); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Olive, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.OliveDrab, EnumFlowerColor.LimeGreen, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Orange, EnumFlowerColor.YellowGreen, 75); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.PaleGreen, EnumFlowerColor.Lime, 120); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Peru, EnumFlowerColor.LimeGreen, 75); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Pink, EnumFlowerColor.MediumAquamarine, 65); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Plum, EnumFlowerColor.MediumAquamarine, 75); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Purple, EnumFlowerColor.Teal, 50); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.RosyBrown, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightSeaGreen, 60); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Salmon, EnumFlowerColor.DarkSeaGreen, 50); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.SandyBrown, EnumFlowerColor.LimeGreen, 75); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.SeaGreen, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.Sienna, EnumFlowerColor.MediumSeaGreen, 55); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.SkyBlue, EnumFlowerColor.Aquamarine, 85); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.SlateBlue, EnumFlowerColor.LightSeaGreen, 60); - addMix(EnumFlowerColor.SpringGreen, EnumFlowerColor.SlateGray, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkTurquoise, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 100); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.CadetBlue, EnumFlowerColor.SlateGray, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Chocolate, EnumFlowerColor.Gray, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Coral, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Crimson, EnumFlowerColor.MediumVioletRed, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkGray, EnumFlowerColor.SlateGray, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkKhaki, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Teal, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkGoldenrod, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Gray, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.RoyalBlue, 100); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.RoyalBlue, 100); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkViolet, EnumFlowerColor.SlateBlue, 95); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.DimGray, EnumFlowerColor.SlateGray, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Gold, EnumFlowerColor.DarkKhaki, 60); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Gray, EnumFlowerColor.SlateGray, 110); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.HotPink, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Lavender, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.LemonChiffon, EnumFlowerColor.SkyBlue, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.LightGray, EnumFlowerColor.LightSteelBlue, 95); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DodgerBlue, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Lime, EnumFlowerColor.MediumSeaGreen, 65); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 70); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumOrchid, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumPurple, EnumFlowerColor.RoyalBlue, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkViolet, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.MistyRose, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Olive, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.OliveDrab, EnumFlowerColor.SeaGreen, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Orange, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumAquamarine, 70); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.SkyBlue, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Peru, EnumFlowerColor.Gray, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Pink, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Plum, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Red, EnumFlowerColor.MediumVioletRed, 75); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.RosyBrown, EnumFlowerColor.SlateGray, 95); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.RoyalBlue, EnumFlowerColor.DodgerBlue, 115); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Salmon, EnumFlowerColor.RosyBrown, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkGray, 80); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SeaGreen, EnumFlowerColor.Teal, 90); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.Sienna, EnumFlowerColor.DimGray, 85); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SkyBlue, EnumFlowerColor.DeepSkyBlue, 105); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SlateBlue, EnumFlowerColor.RoyalBlue, 110); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SlateGray, EnumFlowerColor.RoyalBlue, 115); - addMix(EnumFlowerColor.SteelBlue, EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumAquamarine, 70); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Aquamarine, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Black, EnumFlowerColor.DimGray, 60); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 60); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Brown, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Chocolate, EnumFlowerColor.Peru, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Crimson, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Wheat, 115); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.Olive, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkSalmon, EnumFlowerColor.SandyBrown, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.Gray, 75); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 65); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DimGray, EnumFlowerColor.Gray, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Gold, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.HotPink, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Khaki, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Lavender, EnumFlowerColor.LightGray, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.LightGray, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.LimeGreen, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Magenta, EnumFlowerColor.HotPink, 75); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Maroon, EnumFlowerColor.Sienna, 70); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MediumOrchid, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MediumPurple, EnumFlowerColor.Plum, 80); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.MistyRose, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 50); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Orange, EnumFlowerColor.Goldenrod, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightGray, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.RosyBrown, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Peru, EnumFlowerColor.SandyBrown, 110); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Pink, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Plum, EnumFlowerColor.Pink, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Purple, EnumFlowerColor.MediumVioletRed, 60); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Red, EnumFlowerColor.IndianRed, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkSalmon, 105); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.RoyalBlue, EnumFlowerColor.SlateGray, 75); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Salmon, EnumFlowerColor.DarkSalmon, 100); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SandyBrown, EnumFlowerColor.Peru, 115); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.Sienna, EnumFlowerColor.Peru, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkGray, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGray, 95); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SpringGreen, EnumFlowerColor.PaleGreen, 90); - addMix(EnumFlowerColor.Tan, EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Aquamarine, EnumFlowerColor.LightSeaGreen, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Black, EnumFlowerColor.DarkSlateGray, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Blue, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Brown, EnumFlowerColor.DimGray, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 115); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkOliveGreen, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Coral, EnumFlowerColor.Gray, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkGray, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkKhaki, EnumFlowerColor.SeaGreen, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkOrange, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkSalmon, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.LightSeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.LightSeaGreen, 105); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DarkViolet, EnumFlowerColor.DarkSlateBlue, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DeepPink, EnumFlowerColor.Purple, 70); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Gold, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Goldenrod, EnumFlowerColor.OliveDrab, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Gray, EnumFlowerColor.CadetBlue, 105); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Green, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.IndianRed, EnumFlowerColor.DimGray, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Indigo, EnumFlowerColor.DarkSlateBlue, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Khaki, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Lavender, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.LemonChiffon, EnumFlowerColor.MediumAquamarine, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.LightGray, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 110); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.CadetBlue, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Magenta, EnumFlowerColor.DarkViolet, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Maroon, EnumFlowerColor.Gray, 70); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LightSeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MediumOrchid, EnumFlowerColor.RoyalBlue, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MediumPurple, EnumFlowerColor.SteelBlue, 90); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.SeaGreen, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.DarkSlateBlue, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.MistyRose, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Navy, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Olive, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.OliveDrab, EnumFlowerColor.SeaGreen, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Orange, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.PaleGreen, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightSeaGreen, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.SlateGray, 70); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Peru, EnumFlowerColor.SeaGreen, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Pink, EnumFlowerColor.CadetBlue, 65); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Plum, EnumFlowerColor.SteelBlue, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Purple, EnumFlowerColor.DarkSlateBlue, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Red, EnumFlowerColor.Brown, 70); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.RosyBrown, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.RoyalBlue, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Salmon, EnumFlowerColor.Gray, 70); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.SandyBrown, EnumFlowerColor.SeaGreen, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Sienna, EnumFlowerColor.DarkOliveGreen, 80); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.SkyBlue, EnumFlowerColor.CadetBlue, 100); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.SlateBlue, EnumFlowerColor.SteelBlue, 95); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.SlateGray, EnumFlowerColor.CadetBlue, 105); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Teal, EnumFlowerColor.Tan, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Black, EnumFlowerColor.DimGray, 55); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Brown, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 80); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 110); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkGreen, EnumFlowerColor.SeaGreen, 60); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkGray, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Pink, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumPurple, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.SlateGray, 70); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.SkyBlue, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 80); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Goldenrod, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Gray, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 65); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 105); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.IndianRed, EnumFlowerColor.RosyBrown, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Indigo, EnumFlowerColor.MediumOrchid, 60); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Khaki, EnumFlowerColor.Wheat, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Lavender, EnumFlowerColor.MistyRose, 115); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.LemonChiffon, EnumFlowerColor.MistyRose, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.LightGray, EnumFlowerColor.Lavender, 110); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Lavender, 110); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 65); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.LimeGreen, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Maroon, EnumFlowerColor.IndianRed, 65); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MediumPurple, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.MistyRose, EnumFlowerColor.Pink, 115); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Navy, EnumFlowerColor.SlateBlue, 55); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Orange, EnumFlowerColor.SandyBrown, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.PaleGreen, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Plum, 105); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Peru, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Pink, EnumFlowerColor.MistyRose, 115); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Plum, EnumFlowerColor.Pink, 115); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Purple, EnumFlowerColor.MediumOrchid, 75); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Red, EnumFlowerColor.IndianRed, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.RosyBrown, EnumFlowerColor.Pink, 110); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Salmon, EnumFlowerColor.Pink, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SeaGreen, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Sienna, EnumFlowerColor.RosyBrown, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SkyBlue, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGray, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SpringGreen, EnumFlowerColor.MediumAquamarine, 85); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.SteelBlue, EnumFlowerColor.LightSteelBlue, 90); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Tan, EnumFlowerColor.MistyRose, 100); - addMix(EnumFlowerColor.Thistle, EnumFlowerColor.Teal, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Aquamarine, EnumFlowerColor.MediumAquamarine, 115); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Black, EnumFlowerColor.Teal, 50); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Blue, EnumFlowerColor.RoyalBlue, 60); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Brown, EnumFlowerColor.Gray, 55); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.CadetBlue, EnumFlowerColor.LightSeaGreen, 110); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Chocolate, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Coral, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Crimson, EnumFlowerColor.Gray, 50); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Cyan, EnumFlowerColor.DarkTurquoise, 120); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkGreen, EnumFlowerColor.MediumSeaGreen, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkKhaki, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkOrange, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.SteelBlue, 65); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.CadetBlue, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.Cyan, 120); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DarkViolet, EnumFlowerColor.RoyalBlue, 65); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumPurple, 55); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DimGray, EnumFlowerColor.CadetBlue, 85); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DeepSkyBlue, 90); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Gold, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Gray, EnumFlowerColor.LightSeaGreen, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Green, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.HotPink, EnumFlowerColor.LightSteelBlue, 65); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.IndianRed, EnumFlowerColor.CadetBlue, 60); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Indigo, EnumFlowerColor.RoyalBlue, 50); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Khaki, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Lavender, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.LightGray, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.DarkTurquoise, 115); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkTurquoise, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.LimeGreen, EnumFlowerColor.MediumSeaGreen, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Magenta, EnumFlowerColor.MediumPurple, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Maroon, EnumFlowerColor.DimGray, 45); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkTurquoise, 120); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MediumOrchid, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MediumPurple, EnumFlowerColor.DeepSkyBlue, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumAquamarine, 110); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.MediumPurple, 60); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.MistyRose, EnumFlowerColor.PaleTurquoise, 90); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Navy, EnumFlowerColor.SteelBlue, 45); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Olive, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.OliveDrab, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Orange, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.PaleGreen, EnumFlowerColor.Aquamarine, 105); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Cyan, 115); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.DarkGray, 60); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Peru, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Pink, EnumFlowerColor.PaleTurquoise, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Plum, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Purple, EnumFlowerColor.RoyalBlue, 55); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Red, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.RosyBrown, EnumFlowerColor.CadetBlue, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.RoyalBlue, EnumFlowerColor.DeepSkyBlue, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Salmon, EnumFlowerColor.DarkGray, 65); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SeaGreen, EnumFlowerColor.MediumAquamarine, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Sienna, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkTurquoise, 110); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SlateBlue, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SlateGray, EnumFlowerColor.LightSeaGreen, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SpringGreen, EnumFlowerColor.Aquamarine, 105); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.SteelBlue, EnumFlowerColor.CadetBlue, 90); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Tan, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Teal, EnumFlowerColor.LightSeaGreen, 100); - addMix(EnumFlowerColor.Turquoise, EnumFlowerColor.Thistle, EnumFlowerColor.PaleTurquoise, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Aquamarine, EnumFlowerColor.LightSteelBlue, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Black, EnumFlowerColor.Purple, 60); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Blue, EnumFlowerColor.SlateBlue, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Brown, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.CadetBlue, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Chocolate, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Coral, EnumFlowerColor.PaleVioletRed, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Crimson, EnumFlowerColor.DeepPink, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Cyan, EnumFlowerColor.DeepSkyBlue, 70); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Salmon, 65); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkGray, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkKhaki, EnumFlowerColor.RosyBrown, 65); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkOrange, EnumFlowerColor.Salmon, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkSalmon, EnumFlowerColor.HotPink, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.Thistle, 60); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 110); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.DodgerBlue, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DimGray, EnumFlowerColor.MediumOrchid, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.DodgerBlue, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Gold, EnumFlowerColor.SandyBrown, 55); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkSalmon, 65); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Gray, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.HotPink, EnumFlowerColor.Plum, 115); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.IndianRed, EnumFlowerColor.PaleVioletRed, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Indigo, EnumFlowerColor.DarkViolet, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Khaki, EnumFlowerColor.Pink, 60); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Lavender, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Pink, 70); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.LightGray, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Magenta, EnumFlowerColor.MediumOrchid, 115); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Maroon, EnumFlowerColor.MediumVioletRed, 70); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.Thistle, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Magenta, 115); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MediumPurple, EnumFlowerColor.MediumOrchid, 110); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkGray, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.MediumOrchid, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.MistyRose, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Navy, EnumFlowerColor.DarkViolet, 75); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Olive, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.OliveDrab, EnumFlowerColor.RosyBrown, 50); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Orange, EnumFlowerColor.DarkSalmon, 65); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Thistle, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.HotPink, 110); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Peru, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Pink, EnumFlowerColor.Plum, 105); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Plum, EnumFlowerColor.HotPink, 120); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Purple, EnumFlowerColor.MediumOrchid, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Red, EnumFlowerColor.DeepPink, 85); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.RosyBrown, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.RoyalBlue, EnumFlowerColor.MediumPurple, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Salmon, EnumFlowerColor.HotPink, 95); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SandyBrown, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Sienna, EnumFlowerColor.PaleVioletRed, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SkyBlue, EnumFlowerColor.Plum, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SlateBlue, EnumFlowerColor.MediumPurple, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SlateGray, EnumFlowerColor.Plum, 100); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SpringGreen, EnumFlowerColor.LightSeaGreen, 70); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.SteelBlue, EnumFlowerColor.MediumPurple, 90); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Tan, EnumFlowerColor.Plum, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Teal, EnumFlowerColor.MediumPurple, 80); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Thistle, EnumFlowerColor.Plum, 105); - addMix(EnumFlowerColor.Violet, EnumFlowerColor.Turquoise, EnumFlowerColor.LightSteelBlue, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Blue, EnumFlowerColor.MediumPurple, 50); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Brown, EnumFlowerColor.DarkSalmon, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Chocolate, EnumFlowerColor.SandyBrown, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Coral, EnumFlowerColor.SandyBrown, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Crimson, EnumFlowerColor.Salmon, 80); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Cyan, EnumFlowerColor.Turquoise, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Goldenrod, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkGray, EnumFlowerColor.Tan, 105); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Khaki, 110); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkOrange, EnumFlowerColor.Orange, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Tan, 105); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkKhaki, 105); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkSlateBlue, EnumFlowerColor.RosyBrown, 60); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DarkViolet, EnumFlowerColor.MediumOrchid, 60); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DeepPink, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 80); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DimGray, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SkyBlue, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 110); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 105); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Gray, EnumFlowerColor.Tan, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.HotPink, EnumFlowerColor.Pink, 80); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkSalmon, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 115); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Lavender, EnumFlowerColor.LightGray, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Khaki, 120); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.LightGray, EnumFlowerColor.LemonChiffon, 110); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.LightGray, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Lime, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.LimeGreen, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 70); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Maroon, EnumFlowerColor.IndianRed, 60); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.DarkSeaGreen, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 70); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MediumPurple, EnumFlowerColor.Thistle, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.DarkSeaGreen, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.PaleVioletRed, 70); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.MistyRose, EnumFlowerColor.Tan, 110); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Orange, EnumFlowerColor.Goldenrod, 105); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.PaleGreen, EnumFlowerColor.LemonChiffon, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.LemonChiffon, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Pink, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Peru, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Pink, EnumFlowerColor.MistyRose, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Plum, EnumFlowerColor.Pink, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Purple, EnumFlowerColor.PaleVioletRed, 55); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Red, EnumFlowerColor.Salmon, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.RosyBrown, EnumFlowerColor.Tan, 100); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightSteelBlue, 70); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Salmon, EnumFlowerColor.DarkSalmon, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SandyBrown, EnumFlowerColor.Tan, 110); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Sienna, EnumFlowerColor.Peru, 85); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SkyBlue, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SlateBlue, EnumFlowerColor.Plum, 65); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SlateGray, EnumFlowerColor.DarkGray, 90); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SpringGreen, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkGray, 75); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Tan, EnumFlowerColor.DarkKhaki, 115); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Teal, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Thistle, EnumFlowerColor.MistyRose, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Turquoise, EnumFlowerColor.MediumAquamarine, 95); - addMix(EnumFlowerColor.Wheat, EnumFlowerColor.Violet, EnumFlowerColor.Pink, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.Blue, EnumFlowerColor.MediumPurple, 60); - addMix(EnumFlowerColor.White, EnumFlowerColor.Brown, EnumFlowerColor.RosyBrown, 70); - addMix(EnumFlowerColor.White, EnumFlowerColor.CadetBlue, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.Chocolate, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Coral, EnumFlowerColor.DarkSalmon, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.Crimson, EnumFlowerColor.PaleVioletRed, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.Cyan, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Tan, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkGray, EnumFlowerColor.LightGray, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkGreen, EnumFlowerColor.DarkSeaGreen, 70); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkKhaki, EnumFlowerColor.LemonChiffon, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkOrange, EnumFlowerColor.SandyBrown, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkSalmon, EnumFlowerColor.MistyRose, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkGray, 70); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.DarkViolet, EnumFlowerColor.Violet, 70); - addMix(EnumFlowerColor.White, EnumFlowerColor.DeepPink, EnumFlowerColor.HotPink, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.SkyBlue, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.DimGray, EnumFlowerColor.DarkGray, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.DodgerBlue, EnumFlowerColor.SkyBlue, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.Goldenrod, EnumFlowerColor.Wheat, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.Gray, EnumFlowerColor.LightGray, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.Green, EnumFlowerColor.DarkSeaGreen, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.HotPink, EnumFlowerColor.Pink, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.IndianRed, EnumFlowerColor.Pink, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Indigo, EnumFlowerColor.MediumPurple, 50); - addMix(EnumFlowerColor.White, EnumFlowerColor.Khaki, EnumFlowerColor.LemonChiffon, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.Lavender, EnumFlowerColor.LightGray, 115); - addMix(EnumFlowerColor.White, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Wheat, 110); - addMix(EnumFlowerColor.White, EnumFlowerColor.LightGray, EnumFlowerColor.Lavender, 120); - addMix(EnumFlowerColor.White, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.PaleTurquoise, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Lavender, 110); - addMix(EnumFlowerColor.White, EnumFlowerColor.Lime, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.LimeGreen, EnumFlowerColor.PaleGreen, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.Magenta, EnumFlowerColor.Violet, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Maroon, EnumFlowerColor.RosyBrown, 55); - addMix(EnumFlowerColor.White, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Plum, 80); - addMix(EnumFlowerColor.White, EnumFlowerColor.MediumPurple, EnumFlowerColor.Thistle, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.MediumAquamarine, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Plum, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.MistyRose, EnumFlowerColor.LightGray, 115); - addMix(EnumFlowerColor.White, EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.OliveDrab, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Orange, EnumFlowerColor.Wheat, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.PaleGreen, EnumFlowerColor.Aquamarine, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Pink, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.Peru, EnumFlowerColor.Tan, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.Pink, EnumFlowerColor.MistyRose, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.Plum, EnumFlowerColor.Thistle, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.Purple, EnumFlowerColor.Plum, 60); - addMix(EnumFlowerColor.White, EnumFlowerColor.Red, EnumFlowerColor.Salmon, 80); - addMix(EnumFlowerColor.White, EnumFlowerColor.RosyBrown, EnumFlowerColor.MistyRose, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.RoyalBlue, EnumFlowerColor.LightSteelBlue, 80); - addMix(EnumFlowerColor.White, EnumFlowerColor.Salmon, EnumFlowerColor.Pink, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.SandyBrown, EnumFlowerColor.Wheat, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.SeaGreen, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Sienna, EnumFlowerColor.DarkSalmon, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.SkyBlue, EnumFlowerColor.PaleTurquoise, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.SlateBlue, EnumFlowerColor.LightSteelBlue, 75); - addMix(EnumFlowerColor.White, EnumFlowerColor.SlateGray, EnumFlowerColor.LightGray, 90); - addMix(EnumFlowerColor.White, EnumFlowerColor.SpringGreen, EnumFlowerColor.Aquamarine, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.SteelBlue, EnumFlowerColor.LightSteelBlue, 85); - addMix(EnumFlowerColor.White, EnumFlowerColor.Tan, EnumFlowerColor.Wheat, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.Teal, EnumFlowerColor.DarkTurquoise, 80); - addMix(EnumFlowerColor.White, EnumFlowerColor.Thistle, EnumFlowerColor.Lavender, 105); - addMix(EnumFlowerColor.White, EnumFlowerColor.Turquoise, EnumFlowerColor.PaleTurquoise, 100); - addMix(EnumFlowerColor.White, EnumFlowerColor.Violet, EnumFlowerColor.Plum, 95); - addMix(EnumFlowerColor.White, EnumFlowerColor.Wheat, EnumFlowerColor.LemonChiffon, 110); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Brown, EnumFlowerColor.Goldenrod, 55); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.CadetBlue, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Chocolate, EnumFlowerColor.Goldenrod, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Coral, EnumFlowerColor.Goldenrod, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Crimson, EnumFlowerColor.DarkOrange, 55); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Cyan, EnumFlowerColor.PaleGreen, 85); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.Gold, 95); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkGray, EnumFlowerColor.Khaki, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkGreen, EnumFlowerColor.YellowGreen, 70); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkKhaki, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkOrange, EnumFlowerColor.Gold, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkSalmon, EnumFlowerColor.Gold, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.YellowGreen, 95); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.DarkKhaki, 60); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.PaleGreen, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.PaleGreen, 60); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DimGray, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.DodgerBlue, EnumFlowerColor.DarkSeaGreen, 45); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Gold, EnumFlowerColor.Khaki, 115); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Goldenrod, EnumFlowerColor.Gold, 100); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Gray, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Green, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.HotPink, EnumFlowerColor.SandyBrown, 50); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.IndianRed, EnumFlowerColor.Goldenrod, 65); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Khaki, EnumFlowerColor.Gold, 115); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Lavender, EnumFlowerColor.Khaki, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.LightGray, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.YellowGreen, 80); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.Khaki, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Lime, EnumFlowerColor.SpringGreen, 105); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.LimeGreen, EnumFlowerColor.YellowGreen, 100); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Maroon, EnumFlowerColor.DarkGoldenrod, 45); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.MistyRose, EnumFlowerColor.Khaki, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Olive, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.OliveDrab, EnumFlowerColor.YellowGreen, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Orange, EnumFlowerColor.Gold, 95); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.PaleGreen, EnumFlowerColor.YellowGreen, 105); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.Khaki, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Goldenrod, 55); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Peru, EnumFlowerColor.Gold, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Pink, EnumFlowerColor.Gold, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Plum, EnumFlowerColor.Khaki, 55); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Red, EnumFlowerColor.DarkOrange, 60); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.RosyBrown, EnumFlowerColor.Gold, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Salmon, EnumFlowerColor.Goldenrod, 70); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SandyBrown, EnumFlowerColor.Gold, 90); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SeaGreen, EnumFlowerColor.YellowGreen, 85); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Sienna, EnumFlowerColor.Goldenrod, 70); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SkyBlue, EnumFlowerColor.YellowGreen, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SlateGray, EnumFlowerColor.DarkKhaki, 70); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SpringGreen, EnumFlowerColor.Lime, 100); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.SteelBlue, EnumFlowerColor.YellowGreen, 55); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Tan, EnumFlowerColor.Gold, 100); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Teal, EnumFlowerColor.YellowGreen, 70); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Thistle, EnumFlowerColor.Khaki, 75); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Turquoise, EnumFlowerColor.PaleGreen, 85); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.Wheat, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.Yellow, EnumFlowerColor.White, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Aquamarine, EnumFlowerColor.PaleGreen, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Black, EnumFlowerColor.DarkOliveGreen, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Brown, EnumFlowerColor.DarkGoldenrod, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.CadetBlue, EnumFlowerColor.DarkSeaGreen, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Chocolate, EnumFlowerColor.Goldenrod, 75); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Coral, EnumFlowerColor.Goldenrod, 75); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Crimson, EnumFlowerColor.Chocolate, 50); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Cyan, EnumFlowerColor.SpringGreen, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkGoldenrod, EnumFlowerColor.DarkKhaki, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkGray, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkGreen, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkOliveGreen, EnumFlowerColor.OliveDrab, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkOrange, EnumFlowerColor.Goldenrod, 85); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkSalmon, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkSlateGray, EnumFlowerColor.OliveDrab, 70); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DarkTurquoise, EnumFlowerColor.MediumSeaGreen, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DeepSkyBlue, EnumFlowerColor.MediumAquamarine, 70); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DimGray, EnumFlowerColor.OliveDrab, 85); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.DodgerBlue, EnumFlowerColor.LightSeaGreen, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Gold, EnumFlowerColor.Yellow, 105); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Goldenrod, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Gray, EnumFlowerColor.OliveDrab, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Green, EnumFlowerColor.OliveDrab, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.HotPink, EnumFlowerColor.Tan, 45); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.IndianRed, EnumFlowerColor.DarkGoldenrod, 65); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Khaki, EnumFlowerColor.DarkKhaki, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Lavender, EnumFlowerColor.DarkSeaGreen, 85); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.LemonChiffon, EnumFlowerColor.Khaki, 105); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.LightGray, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.LightSeaGreen, EnumFlowerColor.MediumSeaGreen, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.LightSteelBlue, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Lime, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.LimeGreen, EnumFlowerColor.Lime, 115); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.MediumAquamarine, EnumFlowerColor.LimeGreen, 105); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.MediumPurple, EnumFlowerColor.DarkGray, 45); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.MediumSeaGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.MistyRose, EnumFlowerColor.Khaki, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Olive, EnumFlowerColor.OliveDrab, 105); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.OliveDrab, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Orange, EnumFlowerColor.Gold, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.PaleGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.PaleTurquoise, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.PaleVioletRed, EnumFlowerColor.Tan, 60); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Peru, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Pink, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Plum, EnumFlowerColor.DarkKhaki, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Red, EnumFlowerColor.Chocolate, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.RosyBrown, EnumFlowerColor.DarkKhaki, 80); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.RoyalBlue, EnumFlowerColor.CadetBlue, 55); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Salmon, EnumFlowerColor.Goldenrod, 70); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SandyBrown, EnumFlowerColor.DarkKhaki, 90); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SeaGreen, EnumFlowerColor.MediumSeaGreen, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Sienna, EnumFlowerColor.Olive, 70); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SkyBlue, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SlateGray, EnumFlowerColor.DarkSeaGreen, 80); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SpringGreen, EnumFlowerColor.LimeGreen, 110); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.SteelBlue, EnumFlowerColor.DarkSeaGreen, 65); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Tan, EnumFlowerColor.DarkKhaki, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Teal, EnumFlowerColor.MediumSeaGreen, 85); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Thistle, EnumFlowerColor.DarkKhaki, 75); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Turquoise, EnumFlowerColor.PaleGreen, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Wheat, EnumFlowerColor.Khaki, 100); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.White, EnumFlowerColor.Khaki, 95); - addMix(EnumFlowerColor.YellowGreen, EnumFlowerColor.Yellow, EnumFlowerColor.Khaki, 110); - } - - public static void initColours() { - for (EnumFlowerColor color : EnumFlowerColor.values()) { - AlleleManager.alleleRegistry.registerAllele(color.allele); - } - } - - public static EnumFlowerColor get(int i) { - return values()[Math.max(0, i) % values().length]; - } - - public String getDisplayName() { - return I18N.localise("botany.color." + getName()); - } - - @Override - public String getName() { - return name().toLowerCase(); - } - - public AlleleFlowerColor getFlowerColorAllele() { - return allele; - } -} diff --git a/src/main/java/binnie/extratrees/machines/designer/Designer.java b/src/main/java/binnie/extratrees/machines/designer/Designer.java deleted file mode 100644 index fe975865..00000000 --- a/src/main/java/binnie/extratrees/machines/designer/Designer.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.extratrees.machines.designer; - -public abstract class Designer { - public static int BEESWAX_SLOT = 0; - public static int DESIGN_SLOT_1 = 1; - public static int DESIGN_SLOT_2 = 2; - - public static class PackageWoodworker extends PackageDesigner { - public PackageWoodworker() { - super(DesignerType.Woodworker); - } - } - - public static class PackagePanelworker extends PackageDesigner { - public PackagePanelworker() { - super(DesignerType.Panelworker); - } - } - - public static class PackageGlassworker extends PackageDesigner { - public PackageGlassworker() { - super(DesignerType.GlassWorker); - } - } - - public static class PackageTileworker extends PackageDesigner { - public PackageTileworker() { - super(DesignerType.Tileworker); - } - } - -} diff --git a/src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java b/src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java deleted file mode 100644 index 21473e79..00000000 --- a/src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java +++ /dev/null @@ -1,6 +0,0 @@ -package binnie.genetics.gui.punnett; - -public enum ExtraBeeGUITexture { - Chromosome, - Chromosome2 -} diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java deleted file mode 100644 index 06d4998d..00000000 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ /dev/null @@ -1,64 +0,0 @@ -package binnie.genetics.machine.analyser; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; - -import binnie.Binnie; -import binnie.genetics.api.IItemAnalysable; - -public class Analyser { - public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3, 4, 5}; - public static final int SLOT_TARGET = 6; - public static final int[] SLOT_FINISHED = new int[]{7, 8, 9, 10, 11, 12}; - public static final int SLOT_DYE = 13; - - public static boolean isAnalysable(final ItemStack stack) { - final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); - return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.GENETICS.getConversion(stack) != null; - } - - public static boolean isAnalysed(final ItemStack stack) { - if (stack.isEmpty()) { - return false; - } - final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); - if (ind != null) { - return ind.isAnalyzed(); - } - return stack.getItem() instanceof IItemAnalysable && ((IItemAnalysable) stack.getItem()).isAnalysed(stack); - } - - public static ItemStack analyse(ItemStack stack, World world, GameProfile username) { - if (!stack.isEmpty()) { - ItemStack conv = Binnie.GENETICS.getConversionStack(stack).copy(); - if (!conv.isEmpty()) { - conv.setCount(stack.getCount()); - stack = conv; - - } - ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root != null) { - final IIndividual ind = root.getMember(stack); - ind.analyze(); - IBreedingTracker breedingTracker = ind.getGenome().getSpeciesRoot().getBreedingTracker(world, username); - breedingTracker.registerBirth(ind); - final NBTTagCompound nbttagcompound = new NBTTagCompound(); - ind.writeToNBT(nbttagcompound); - stack.setTagCompound(nbttagcompound); - return stack; - } - if (stack.getItem() instanceof IItemAnalysable) { - return ((IItemAnalysable) stack.getItem()).analyse(stack); - } - } - return stack; - } -} diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Alder.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Alder.png deleted file mode 100644 index c287ed45..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Alder.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Apple.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Apple.png deleted file mode 100644 index 8d2e07e8..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Apple.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Ash.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Ash.png deleted file mode 100644 index 5a32f9ee..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Ash.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Beech.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Beech.png deleted file mode 100644 index 443f65b3..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Beech.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Box.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Box.png deleted file mode 100644 index a5f324aa..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Box.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Brazilwood.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Brazilwood.png deleted file mode 100644 index 25b180ce..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Brazilwood.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Butternut.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Butternut.png deleted file mode 100644 index d9440948..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Butternut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Cedar.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Cedar.png deleted file mode 100644 index 49cc16de..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Cedar.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Citrus.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Citrus.png deleted file mode 100644 index c18d7cd5..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Citrus.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Cypress.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Cypress.png deleted file mode 100644 index 109aced8..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Cypress.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Elder.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Elder.png deleted file mode 100644 index 7f1cb32e..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Elder.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Elm.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Elm.png deleted file mode 100644 index 0164e9ca..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Elm.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Eucalyptus.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Eucalyptus.png deleted file mode 100644 index c6a3ce1d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Eucalyptus.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Fig.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Fig.png deleted file mode 100644 index 4f7c8816..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Fig.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Fir.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Fir.png deleted file mode 100644 index ef0a3e07..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Fir.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Gingko.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Gingko.png deleted file mode 100644 index e26410d2..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Gingko.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Hawthorn.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Hawthorn.png deleted file mode 100644 index be7c1a54..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Hawthorn.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Hazel.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Hazel.png deleted file mode 100644 index 08a9ed18..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Hazel.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Hemlock.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Hemlock.png deleted file mode 100644 index 4634150b..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Hemlock.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Hickory.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Hickory.png deleted file mode 100644 index 87160984..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Hickory.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Holly.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Holly.png deleted file mode 100644 index 07ec9b0e..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Holly.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Hornbeam.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Hornbeam.png deleted file mode 100644 index 9a0d976f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Hornbeam.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Iroko.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Iroko.png deleted file mode 100644 index d9147364..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Iroko.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Locust.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Locust.png deleted file mode 100644 index 326f044f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Locust.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Logwood.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Logwood.png deleted file mode 100644 index 5fa6db24..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Logwood.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Maclura.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Maclura.png deleted file mode 100644 index 2b8351f6..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Maclura.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Maple.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Maple.png deleted file mode 100644 index 7c689b17..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Maple.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Olive.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Olive.png deleted file mode 100644 index 7dd6a597..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Olive.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Pear.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Pear.png deleted file mode 100644 index 21cdcb99..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Pear.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Pine.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Pine.png deleted file mode 100644 index f565be27..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Pine.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/PinkIvory.png b/src/main/resources/assets/extratrees/textures/blocks/planks/PinkIvory.png deleted file mode 100644 index 550f6d4b..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/PinkIvory.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Plum.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Plum.png deleted file mode 100644 index afaddd4c..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Plum.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Purpleheart.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Purpleheart.png deleted file mode 100644 index 3f7c331e..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Purpleheart.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Rosewood.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Rosewood.png deleted file mode 100644 index d4d4371a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Rosewood.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Rowan.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Rowan.png deleted file mode 100644 index 0265cae1..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Rowan.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Sweetgum.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Sweetgum.png deleted file mode 100644 index ce73f312..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Sweetgum.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Syzgium.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Syzgium.png deleted file mode 100644 index de35b5b4..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Syzgium.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Whitebeam.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Whitebeam.png deleted file mode 100644 index 7b1f8247..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Whitebeam.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/planks/Yew.png b/src/main/resources/assets/extratrees/textures/blocks/planks/Yew.png deleted file mode 100644 index 49eba77d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/blocks/planks/Yew.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Abiu.png b/src/main/resources/assets/extratrees/textures/items/food/Abiu.png deleted file mode 100644 index a6f5ddd1..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Abiu.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Acorn.png b/src/main/resources/assets/extratrees/textures/items/food/Acorn.png deleted file mode 100644 index aae01a31..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Acorn.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Allspice.png b/src/main/resources/assets/extratrees/textures/items/food/Allspice.png deleted file mode 100644 index acbe4b88..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Allspice.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Almond.png b/src/main/resources/assets/extratrees/textures/items/food/Almond.png deleted file mode 100644 index d9cca42d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Almond.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Amla.png b/src/main/resources/assets/extratrees/textures/items/food/Amla.png deleted file mode 100644 index 5e61c6f6..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Amla.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Apricot.png b/src/main/resources/assets/extratrees/textures/items/food/Apricot.png deleted file mode 100644 index afdca253..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Apricot.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Avacado.png b/src/main/resources/assets/extratrees/textures/items/food/Avacado.png deleted file mode 100644 index 382a6375..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Avacado.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Bael.png b/src/main/resources/assets/extratrees/textures/items/food/Bael.png deleted file mode 100644 index d79645bd..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Bael.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Banana.png b/src/main/resources/assets/extratrees/textures/items/food/Banana.png deleted file mode 100644 index bdeebdf3..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Banana.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Beechnut.png b/src/main/resources/assets/extratrees/textures/items/food/Beechnut.png deleted file mode 100644 index 11dfdbf6..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Beechnut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Ber.png b/src/main/resources/assets/extratrees/textures/items/food/Ber.png deleted file mode 100644 index 6f06169a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Ber.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Blackberry.png b/src/main/resources/assets/extratrees/textures/items/food/Blackberry.png deleted file mode 100644 index 5dbe092a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Blackberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Blackcurrant.png b/src/main/resources/assets/extratrees/textures/items/food/Blackcurrant.png deleted file mode 100644 index f95da7e3..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Blackcurrant.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Blackthorn.png b/src/main/resources/assets/extratrees/textures/items/food/Blackthorn.png deleted file mode 100644 index 6e2aab87..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Blackthorn.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Blueberry.png b/src/main/resources/assets/extratrees/textures/items/food/Blueberry.png deleted file mode 100644 index 9cf65f6b..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Blueberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Butternut.png b/src/main/resources/assets/extratrees/textures/items/food/Butternut.png deleted file mode 100644 index 6054488c..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Butternut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Candlenut.png b/src/main/resources/assets/extratrees/textures/items/food/Candlenut.png deleted file mode 100644 index adbc5b0d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Candlenut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Cashew.png b/src/main/resources/assets/extratrees/textures/items/food/Cashew.png deleted file mode 100644 index 044d0e1f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Cashew.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Chilli.png b/src/main/resources/assets/extratrees/textures/items/food/Chilli.png deleted file mode 100644 index 22956704..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Chilli.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Citron.png b/src/main/resources/assets/extratrees/textures/items/food/Citron.png deleted file mode 100644 index b8192691..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Citron.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Clove.png b/src/main/resources/assets/extratrees/textures/items/food/Clove.png deleted file mode 100644 index 1dffe2a6..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Clove.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Coconut.png b/src/main/resources/assets/extratrees/textures/items/food/Coconut.png deleted file mode 100644 index b94e2ac7..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Coconut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Coffee.png b/src/main/resources/assets/extratrees/textures/items/food/Coffee.png deleted file mode 100644 index ab57acb9..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Coffee.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Crabapple.png b/src/main/resources/assets/extratrees/textures/items/food/Crabapple.png deleted file mode 100644 index bcf14424..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Crabapple.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Cranberry.png b/src/main/resources/assets/extratrees/textures/items/food/Cranberry.png deleted file mode 100644 index 4a88c5c2..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Cranberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Elderberry.png b/src/main/resources/assets/extratrees/textures/items/food/Elderberry.png deleted file mode 100644 index c220f5d1..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Elderberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Fig.png b/src/main/resources/assets/extratrees/textures/items/food/Fig.png deleted file mode 100644 index d714624a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Fig.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Gooseberry.png b/src/main/resources/assets/extratrees/textures/items/food/Gooseberry.png deleted file mode 100644 index f3848a1a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Gooseberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Grapefruit.png b/src/main/resources/assets/extratrees/textures/items/food/Grapefruit.png deleted file mode 100644 index e08fc9ae..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Grapefruit.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Hazelnut.png b/src/main/resources/assets/extratrees/textures/items/food/Hazelnut.png deleted file mode 100644 index 3974db81..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Hazelnut.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Heartnut001.png b/src/main/resources/assets/extratrees/textures/items/food/Heartnut001.png deleted file mode 100644 index 9af4f8b8..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Heartnut001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Hickory_Nut_003.png b/src/main/resources/assets/extratrees/textures/items/food/Hickory_Nut_003.png deleted file mode 100644 index 800aa13f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Hickory_Nut_003.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Jackfruit001.png b/src/main/resources/assets/extratrees/textures/items/food/Jackfruit001.png deleted file mode 100644 index 45f7b482..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Jackfruit001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Jujube001.png b/src/main/resources/assets/extratrees/textures/items/food/Jujube001.png deleted file mode 100644 index 1d08c19f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Jujube001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Juniper.png b/src/main/resources/assets/extratrees/textures/items/food/Juniper.png deleted file mode 100644 index e019bc01..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Juniper.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Kaki.png b/src/main/resources/assets/extratrees/textures/items/food/Kaki.png deleted file mode 100644 index c1f3c72d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Kaki.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Kumquat.png b/src/main/resources/assets/extratrees/textures/items/food/Kumquat.png deleted file mode 100644 index 9f76c989..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Kumquat.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Lemon2_006.png b/src/main/resources/assets/extratrees/textures/items/food/Lemon2_006.png deleted file mode 100644 index d05f0594..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Lemon2_006.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Lime.png b/src/main/resources/assets/extratrees/textures/items/food/Lime.png deleted file mode 100644 index d48308a9..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Lime.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Longan001.png b/src/main/resources/assets/extratrees/textures/items/food/Longan001.png deleted file mode 100644 index b054762f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Longan001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Loquat001.png b/src/main/resources/assets/extratrees/textures/items/food/Loquat001.png deleted file mode 100644 index 7af968a5..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Loquat001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Lychee001.png b/src/main/resources/assets/extratrees/textures/items/food/Lychee001.png deleted file mode 100644 index 3fec878d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Lychee001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Macadamia.png b/src/main/resources/assets/extratrees/textures/items/food/Macadamia.png deleted file mode 100644 index 635362b7..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Macadamia.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Manderin.png b/src/main/resources/assets/extratrees/textures/items/food/Manderin.png deleted file mode 100644 index 81dd0223..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Manderin.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Mango.png b/src/main/resources/assets/extratrees/textures/items/food/Mango.png deleted file mode 100644 index dd5fc21f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Mango.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Mongongo001.png b/src/main/resources/assets/extratrees/textures/items/food/Mongongo001.png deleted file mode 100644 index d197c1a1..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Mongongo001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Nectarine.png b/src/main/resources/assets/extratrees/textures/items/food/Nectarine.png deleted file mode 100644 index 0be0901d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Nectarine.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Nutmeg.png b/src/main/resources/assets/extratrees/textures/items/food/Nutmeg.png deleted file mode 100644 index 050b74ee..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Nutmeg.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Olive.png b/src/main/resources/assets/extratrees/textures/items/food/Olive.png deleted file mode 100644 index 9b0e0bb4..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Olive.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Orange.png b/src/main/resources/assets/extratrees/textures/items/food/Orange.png deleted file mode 100644 index 65f2f76b..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Orange.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Papayimar.png b/src/main/resources/assets/extratrees/textures/items/food/Papayimar.png deleted file mode 100644 index 69fd4ecf..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Papayimar.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Peach.png b/src/main/resources/assets/extratrees/textures/items/food/Peach.png deleted file mode 100644 index 325eac5f..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Peach.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Pear.png b/src/main/resources/assets/extratrees/textures/items/food/Pear.png deleted file mode 100644 index 6a15b39a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Pear.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Pecan.png b/src/main/resources/assets/extratrees/textures/items/food/Pecan.png deleted file mode 100644 index 340a84b5..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Pecan.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Pistachio001.png b/src/main/resources/assets/extratrees/textures/items/food/Pistachio001.png deleted file mode 100644 index 0a6adea6..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Pistachio001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Plantain.png b/src/main/resources/assets/extratrees/textures/items/food/Plantain.png deleted file mode 100644 index ca9db7d1..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Plantain.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Pomelo.png b/src/main/resources/assets/extratrees/textures/items/food/Pomelo.png deleted file mode 100644 index c287851d..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Pomelo.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Quince.png b/src/main/resources/assets/extratrees/textures/items/food/Quince.png deleted file mode 100644 index 4ebe426c..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Quince.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Raspberry.png b/src/main/resources/assets/extratrees/textures/items/food/Raspberry.png deleted file mode 100644 index 5e0a6e62..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Raspberry.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Redcurrant.png b/src/main/resources/assets/extratrees/textures/items/food/Redcurrant.png deleted file mode 100644 index e04cbd34..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Redcurrant.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Sapodilla001.png b/src/main/resources/assets/extratrees/textures/items/food/Sapodilla001.png deleted file mode 100644 index 8665bb0b..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Sapodilla001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Satsuma.png b/src/main/resources/assets/extratrees/textures/items/food/Satsuma.png deleted file mode 100644 index f4b8273a..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Satsuma.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Soursop001.png b/src/main/resources/assets/extratrees/textures/items/food/Soursop001.png deleted file mode 100644 index f86bc0ba..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Soursop001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Starfruit.png b/src/main/resources/assets/extratrees/textures/items/food/Starfruit.png deleted file mode 100644 index 84885ad5..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Starfruit.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Tamarillo001.png b/src/main/resources/assets/extratrees/textures/items/food/Tamarillo001.png deleted file mode 100644 index 96eb5c55..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Tamarillo001.png and /dev/null differ diff --git a/src/main/resources/assets/extratrees/textures/items/food/Tangerine.png b/src/main/resources/assets/extratrees/textures/items/food/Tangerine.png deleted file mode 100644 index 1c642dc9..00000000 Binary files a/src/main/resources/assets/extratrees/textures/items/food/Tangerine.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Acclimatiser.png b/src/main/resources/assets/genetics/textures/tile/Acclimatiser.png deleted file mode 100644 index 925ea00c..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Acclimatiser.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Analyser.png b/src/main/resources/assets/genetics/textures/tile/Analyser.png deleted file mode 100644 index f90ae978..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Analyser.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Assembler.png b/src/main/resources/assets/genetics/textures/tile/Assembler.png deleted file mode 100644 index 9d3a4808..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Assembler.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Genepool.png b/src/main/resources/assets/genetics/textures/tile/Genepool.png deleted file mode 100644 index 9e26c50c..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Genepool.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Incubator.png b/src/main/resources/assets/genetics/textures/tile/Incubator.png deleted file mode 100644 index 09441266..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Incubator.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Indexer.png b/src/main/resources/assets/genetics/textures/tile/Indexer.png deleted file mode 100644 index 6f980b36..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Indexer.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Inoculator.png b/src/main/resources/assets/genetics/textures/tile/Inoculator.png deleted file mode 100644 index 6101091f..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Inoculator.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Isolator.png b/src/main/resources/assets/genetics/textures/tile/Isolator.png deleted file mode 100644 index e2e5c4bb..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Isolator.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Items.png b/src/main/resources/assets/genetics/textures/tile/Items.png deleted file mode 100644 index 6792677f..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Items.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Machine.png b/src/main/resources/assets/genetics/textures/tile/Machine.png deleted file mode 100644 index 4ce15dc2..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Machine.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Polymeriser.png b/src/main/resources/assets/genetics/textures/tile/Polymeriser.png deleted file mode 100644 index addf184c..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Polymeriser.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Purifier.png b/src/main/resources/assets/genetics/textures/tile/Purifier.png deleted file mode 100644 index fa015557..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Purifier.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Replicator.png b/src/main/resources/assets/genetics/textures/tile/Replicator.png deleted file mode 100644 index 52bca4d3..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Replicator.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Sequencer.png b/src/main/resources/assets/genetics/textures/tile/Sequencer.png deleted file mode 100644 index 4e4db6ef..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Sequencer.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Splicer.png b/src/main/resources/assets/genetics/textures/tile/Splicer.png deleted file mode 100644 index 86578c2a..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Splicer.png and /dev/null differ diff --git a/src/main/resources/assets/genetics/textures/tile/Synthesizer.png b/src/main/resources/assets/genetics/textures/tile/Synthesizer.png deleted file mode 100644 index d83bf911..00000000 Binary files a/src/main/resources/assets/genetics/textures/tile/Synthesizer.png and /dev/null differ