Merge pull request #102 from GTNewHorizons/St00f

St00f

3 files changed, 56 insertions, 1 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
index 48813310d2..033aaac663 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.bartcrops.crops.Crop_Force;
 import gtPlusPlus.xmod.bartcrops.crops.Crop_Hemp;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.Crops;
@@ -48,6 +49,7 @@ public class LoaderOfTheCrops {
 		List<LoaderOfTheCrops> p = new ArrayList<LoaderOfTheCrops>();		
 
 		p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3)));
+		p.add(new LoaderOfTheCrops(new Crop_Force(), new ItemStack(Item.getItemById(111), 3)));
 		
 		return p;
 	}
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
index ca2a044564..0f590dcf2b 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
@@ -14,10 +14,10 @@ import net.minecraft.util.IIcon;
 import speiger.src.crops.api.ICropCardInfo;
 
 public abstract class BaseCrop extends CropCard implements ICropCardInfo {
+	
 	@SideOnly(Side.CLIENT)
 	public void registerSprites(IIconRegister iconRegister) {
 		this.textures = new IIcon[this.maxSize()];
-
 		for (int i = 1; i <= this.textures.length; ++i) {
 			this.textures[i - 1] = iconRegister.registerIcon(CORE.MODID+":crop/blockCrop." + this.name() + "." + i);
 		}
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
new file mode 100644
index 0000000000..06238a4589
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
@@ -0,0 +1,53 @@
+package gtPlusPlus.xmod.bartcrops.crops;
+
+import gtPlusPlus.core.material.ELEMENT.STANDALONE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop;
+import ic2.api.crops.ICropTile;
+import net.minecraft.item.ItemStack;
+
+public class Crop_Force extends BaseAestheticCrop {
+	
+	public int tier() {
+		return 4;
+	}
+
+	public String name() {
+		return "Force";
+	}
+
+	public String discoveredBy() {
+		return "Alkalus";
+	}
+
+	public int growthDuration(ICropTile crop) {
+		int ret = 800;
+		
+		/*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) {
+			ret = 225;
+		}*/
+
+		if (CORE_Preloader.DEBUG_MODE) {
+			ret = 1;
+		}
+
+		return ret;
+	}
+
+	public String[] attributes() {
+		return new String[]{"Power", "Soil", "Yellow", "Gold"};
+	}
+
+	public ItemStack getGain(ICropTile crop) {		
+		ItemStack ret = this.getDisplayItem();
+		if (MathUtils.randInt(0, 10) > 8) {
+			ret = STANDALONE.FORCE.getNugget(MathUtils.randInt(4, 8));
+		}
+		return ret;
+	}
+
+	public ItemStack getDisplayItem() {
+		return STANDALONE.FORCE.getNugget(0);
+	}
+}
\ No newline at end of file