bushes should now generate as cotton instead of string if harvestcraft is installed

Author: GregoriusT

src/main/java/gregapi/data/CS.java

@@ -1580,11 +1580,12 @@ public static class PotionsGT {
 
 	public static class BushesGT {
 		public static final ItemStackMap<ItemStackContainer, int[]> MAP = new ItemStackMap<>();
-		public static int[] get(ItemStack aStack) {return MAP.containsKey(aStack, F) ? MAP.get(aStack) : MAP.get(new ItemStackContainer(aStack, 1, W));}
+		public static int[] get(ItemStack aStack) {return UT.Code.getWithDefault(MAP.containsKey(aStack, F) ? MAP.get(aStack) : MAP.get(new ItemStackContainer(aStack, 1, W)), DEFAULT);}
 		/** Bush Color, Stage 1, Stage 2, Stage 3 */
 		public static void put(ItemStack aStack, int aBush, int aBloom, int aImmature, int aBerry) {if (!MAP.containsKey(aStack, F)) MAP.put(aStack, new int[] {aBush, aBloom, aImmature, aBerry});}
 		public static void override(ItemStack aStack, int... aColors) {MAP.put(aStack, aColors);}
 		// Add Cotton as a Default Bush.
+		public static int[] DEFAULT = new int[] {0x22cc22, 0x33cc33, 0x44cc44, 0xeeeeee};
 		static {put(ST.make(Items.string, 1, 0), 0x22cc22, 0x33cc33, 0x44cc44, 0xeeeeee);}
 	}
 

src/main/java/gregapi/util/UT.java

@@ -1372,6 +1372,10 @@ public static <E> E getFirstNonNull(E... aArray) {
 			return null;
 		}
 
+		public static <E> E getWithDefault(E aObject, E aDefault) {
+			return aObject != null ? aObject : aDefault;
+		}
+		
 		private static final DateFormat sDateFormat = DateFormat.getInstance();
 		public static String dateAndTime() {
 			return sDateFormat.format(new Date());

src/main/java/gregtech/worldgen/WorldgenBushes.java

@@ -21,14 +21,15 @@
 
 import gregapi.block.multitileentity.MultiTileEntityRegistry;
 import gregapi.code.ItemStackContainer;
-import gregapi.data.IL;
+import gregapi.data.MD;
 import gregapi.util.ST;
 import gregapi.util.UT;
 import gregapi.util.WD;
 import gregapi.worldgen.WorldgenObject;
 import gregapi.worldgen.WorldgenOnSurface;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -62,7 +63,10 @@ public boolean tryPlaceStuff(World aWorld, int aX, int aY, int aZ, Random aRando
 		MultiTileEntityRegistry tRegistry = MultiTileEntityRegistry.getRegistry("gt.multitileentity");
 		if (tRegistry == null) return F;
 
-		ItemStack tBerry = UT.Code.select(new NoiseGenerator(aWorld).get(aX/2, 300, aZ/2, BushesGT.MAP.size()), new ItemStackContainer(IL.Food_Candleberry.get(1)), BushesGT.MAP.keySet().toArray(ZL_ISC)).toStack();
+		ItemStack tBerry = UT.Code.select(new NoiseGenerator(aWorld).get(aX/2, 300, aZ/2, BushesGT.MAP.size()), new ItemStackContainer(Items.string, 1, 0), BushesGT.MAP.keySet().toArray(ZL_ISC)).toStack();
+		
+		// Change Minecraft String to Harvestcraft Cotton, because it's in the static initializer as a default.
+		if (MD.HaC.mLoaded && ST.item(tBerry) == Items.string) tBerry = ST.make(MD.HaC, "cottonItem", 1, 0, tBerry);
 
 		if (placeBushCore(aWorld, aX, aY, aZ, tRegistry, tBerry, 3)) {
 			if (aRandom.nextBoolean() && placeBushCore(aWorld, aX-1, aY, aZ  , tRegistry, tBerry, 3)) placeBushSides(aWorld, aX-1, aY, aZ  , tRegistry, tBerry, 3);