Browse Source

Remove IC2Exp as a hard dependency

OvermindDL1 3 years ago
parent
commit
e4d238a5bf
2 changed files with 3 additions and 5 deletions
  1. 1
    2
      build.gradle
  2. 2
    3
      src/main/java/gregapi/compat/industrialcraft/CompatIC2.java

+ 1
- 2
build.gradle View File

@@ -56,7 +56,7 @@ repositories {
56 56
 	//// - RTG
57 57
 	//// - OpenBlocks
58 58
 	//// - IC2Classic
59
-	//// Main storage for industrialcraft-2 and forestry_1.7.10
59
+	//// Main storage for forestry_1.7.10
60 60
 	//maven {
61 61
 	//	name = "ic2"
62 62
 	//	url = "http://maven.ic2.player.to/"
@@ -101,7 +101,6 @@ minecraft {
101 101
 dependencies {
102 102
 	compile fileTree(dir: 'libs', include: '*.jar')
103 103
 	compile "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
104
-	compile "net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev"
105 104
 	compile "com.mod-buildcraft:buildcraft:7.1.23:dev"
106 105
 	compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
107 106
 	compile "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"

+ 2
- 3
src/main/java/gregapi/compat/industrialcraft/CompatIC2.java View File

@@ -27,7 +27,6 @@ import ic2.api.recipe.RecipeInputItemStack;
27 27
 import ic2.api.recipe.RecipeInputOreDict;
28 28
 import ic2.api.recipe.RecipeOutput;
29 29
 import ic2.core.Ic2Items;
30
-import ic2.core.crop.IC2Crops;
31 30
 import net.minecraft.block.Block;
32 31
 import net.minecraft.init.Blocks;
33 32
 import net.minecraft.item.ItemStack;
@@ -58,7 +57,7 @@ public class CompatIC2 extends CompatBase implements ICompatIC2 {
58 57
 			mToBlacklist = null;
59 58
 		}
60 59
 		
61
-		if (MD.AA.mLoaded) Crops.instance.registerBaseSeed(ST.make(MD.AA, "itemCoffeeBeans", 1, W), IC2Crops.cropCoffee, 1, 1, 1, 1);
60
+		if (MD.AA.mLoaded) Crops.instance.registerBaseSeed(ST.make(MD.AA, "itemCoffeeBeans", 1, W), Crops.instance.getCropCard(Ic2Items.coffeeBeans), 1, 1, 1, 1);
62 61
 	}
63 62
 	
64 63
 	@Override
@@ -141,4 +140,4 @@ public class CompatIC2 extends CompatBase implements ICompatIC2 {
141 140
 	@Override public Object makeInput(String aOreDict, long aAmount) {return new RecipeInputOreDict(aOreDict, UT.Code.bindStack(aAmount));}
142 141
 	@Override public Object makeOutput(NBTTagCompound aNBT, ItemStack... aStacks) {return new RecipeOutput(aNBT, aStacks);}
143 142
 	@Override public boolean isReactorItem(ItemStack aStack) {try {return ST.valid(aStack) && aStack.getItem() instanceof ic2.api.reactor.IReactorComponent;} catch (Throwable e) {/*Do nothing*/} return F;}
144
-}
143
+}

Loading…
Cancel
Save