aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/bartcrops/crops
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bartcrops/crops')
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java61
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java31
2 files changed, 4 insertions, 88 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
deleted file mode 100644
index da29ca7f50..0000000000
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gtPlusPlus.xmod.bartcrops.crops;
-
-import net.minecraft.item.ItemStack;
-
-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;
-
-public class Crop_Force extends BaseAestheticCrop {
-
- @Override
- public int tier() {
- return 4;
- }
-
- @Override
- public String name() {
- return "Force";
- }
-
- @Override
- public String discoveredBy() {
- return "Alkalus";
- }
-
- @Override
- 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;
- }
-
- @Override
- public String[] attributes() {
- return new String[] { "Power", "Soil", "Yellow", "Gold" };
- }
-
- @Override
- 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;
- }
-
- @Override
- public ItemStack getDisplayItem() {
- return STANDALONE.FORCE.getNugget(0);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
index 66f0d19fd2..f5bf252edb 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
@@ -1,11 +1,9 @@
package gtPlusPlus.xmod.bartcrops.crops;
+import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
-import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop;
import ic2.api.crops.ICropTile;
@@ -22,23 +20,8 @@ public class Crop_Hemp extends BaseAestheticCrop {
}
@Override
- public String discoveredBy() {
- return "Alkalus";
- }
-
- @Override
public int growthDuration(ICropTile crop) {
- int ret = 550;
-
- /*
- * if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { ret = 225; }
- */
-
- if (CORE_Preloader.DEBUG_MODE) {
- ret = 1;
- }
-
- return ret;
+ return 550;
}
@Override
@@ -48,17 +31,11 @@ public class Crop_Hemp extends BaseAestheticCrop {
@Override
public ItemStack getGain(ICropTile crop) {
-
- ItemStack ret = this.getDisplayItem();
- if (MathUtils.randInt(0, 10) > 8) {
- ret = ItemUtils.getSimpleStack(ModItems.itemRope, MathUtils.randInt(1, 3));
- }
-
- return ret;
+ return new ItemStack(Items.string, MathUtils.randInt(1, 3), 0);
}
@Override
public ItemStack getDisplayItem() {
- return ItemUtils.getSimpleStack(ModItems.itemRope, 0);
+ return new ItemStack(Items.string, 1, 0);
}
}