Skip to content

Commit

Permalink
Readded HarvestCraft Intergration
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmf444
dmf444 committed Jun 12, 2016
1 parent c78211b commit 0e2cab5
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 109 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ version = "${config.minecraft_version}-${config.mod_version}.${System.getenv("DR

dependencies {

compile files('libs/AgriCraft-1.7.10-1.4.6-hotfix.jar')
compile files('Pam\'s HarvestCraft 1.7.10Lb.jar')
//compile files('libs/AgriCraft-1.7.10-1.4.6-hotfix.jar')
compile files('libs/Pam\'s HarvestCraft 1.9.4a.jar')

// you may put jars on which you depend on in ./libs
// or you may define them like so..
Expand Down
Binary file removed libs/AgriCraft-1.7.10-1.4.6-hotfix.jar
View file
Binary file not shown.
Binary file renamed libs/Pam's HarvestCraft 1.7.10Lb.jar → libs/Pam's HarvestCraft 1.9.4a.jar
View file
Binary file not shown.
217 changes: 113 additions & 104 deletions src/main/java/dmfmm/StarvationAhoy/CropWash/Crossmod/CrossHarvestcraft.java
View file
Original file line number Diff line number Diff line change
@@ -1,104 +1,113 @@
//package dmfmm.StarvationAhoy.CropWash.Crossmod;
//
//import com.pam.harvestcraft.BlockRegistry;
//import com.pam.harvestcraft.ItemRegistry;
//import cpw.mods.fml.common.Loader;
//import dmfmm.StarvationAhoy.CropWash.DirtyBlocks;
//import net.minecraft.block.Block;
//import net.minecraft.item.Item;
//
//
//public class CrossHarvestcraft {
//
//
// public static void load(){
// if (isLoaded()) {
// AddIntergration();//
// }
// }
//
// public static boolean isLoaded(){
// return Loader.isModLoaded("harvestcraft");//
// }
//
//
// private static void AddIntergration(){
// if(!BlockRegistry.enablecropspecialplanting) {
// replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryseedItem);
// replace(BlockRegistry.pamriceCrop, ItemRegistry.riceseedItem);
// replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedseedItem);//
// } else {
// replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryItem);
// replace(BlockRegistry.pamriceCrop, ItemRegistry.riceItem);
// replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedItem);
// replace(BlockRegistry.pamwaterchestnutCrop, ItemRegistry.waterchestnutItem);//
// }
// if(!BlockRegistry.cropsdropSeeds) {
// replace(BlockRegistry.pamblackberryCrop, ItemRegistry.blackberryItem);
// replace(BlockRegistry.pamblueberryCrop, ItemRegistry.blueberryItem);
// replace(BlockRegistry.pamcandleberryCrop, ItemRegistry.candleberryItem);
// replace(BlockRegistry.pamraspberryCrop, ItemRegistry.raspberryItem);
// replace(BlockRegistry.pamstrawberryCrop, ItemRegistry.strawberryItem);
// replace(BlockRegistry.pamgrapeCrop, ItemRegistry.grapeItem);
// replace(BlockRegistry.pamcactusfruitCrop, ItemRegistry.cactusfruitItem);
// replace(BlockRegistry.pamasparagusCrop, ItemRegistry.asparagusItem);
// replace(BlockRegistry.pambarleyCrop, ItemRegistry.barleyItem);
// replace(BlockRegistry.pamoatsCrop, ItemRegistry.oatsItem);
// replace(BlockRegistry.pamryeCrop, ItemRegistry.ryeItem);
// replace(BlockRegistry.pamcornCrop, ItemRegistry.cornItem);
// replace(BlockRegistry.pambambooshootCrop, ItemRegistry.bambooshootItem);
// replace(BlockRegistry.pamcantaloupeCrop, ItemRegistry.cantaloupeItem);
// replace(BlockRegistry.pamcucumberCrop, ItemRegistry.cucumberItem);
// replace(BlockRegistry.pamwintersquashCrop, ItemRegistry.wintersquashItem);
// replace(BlockRegistry.pamzucchiniCrop, ItemRegistry.zucchiniItem);
// replace(BlockRegistry.pambeetCrop, ItemRegistry.beetItem);
// replace(BlockRegistry.pamonionCrop, ItemRegistry.onionItem);
// replace(BlockRegistry.pamparsnipCrop, ItemRegistry.parsnipItem);
// replace(BlockRegistry.pampeanutCrop, ItemRegistry.peanutItem);
// replace(BlockRegistry.pamradishCrop, ItemRegistry.radishItem);
// replace(BlockRegistry.pamrutabagaCrop, ItemRegistry.rutabagaItem);
// replace(BlockRegistry.pamsweetpotatoCrop, ItemRegistry.sweetpotatoItem);
// replace(BlockRegistry.pamturnipCrop, ItemRegistry.turnipItem);
// replace(BlockRegistry.pamrhubarbCrop, ItemRegistry.rhubarbItem);
// replace(BlockRegistry.pamceleryCrop, ItemRegistry.celeryItem);
// replace(BlockRegistry.pamgarlicCrop, ItemRegistry.garlicItem);
// replace(BlockRegistry.pamgingerCrop, ItemRegistry.gingerItem);
// replace(BlockRegistry.pamspiceleafCrop, ItemRegistry.spiceleafItem);
// replace(BlockRegistry.pamtealeafCrop, ItemRegistry.tealeafItem);
// replace(BlockRegistry.pamcoffeebeanCrop, ItemRegistry.coffeebeanItem);
// replace(BlockRegistry.pammustardseedsCrop, ItemRegistry.mustardseedsItem);
// replace(BlockRegistry.pambroccoliCrop, ItemRegistry.broccoliItem);
// replace(BlockRegistry.pamcauliflowerCrop, ItemRegistry.cauliflowerItem);
// replace(BlockRegistry.pamleekCrop, ItemRegistry.leekItem);
// replace(BlockRegistry.pamlettuceCrop, ItemRegistry.lettuceItem);
// replace(BlockRegistry.pamscallionCrop, ItemRegistry.scallionItem);
// replace(BlockRegistry.pamartichokeCrop, ItemRegistry.artichokeItem);
// replace(BlockRegistry.pambrusselsproutCrop, ItemRegistry.brusselsproutItem);
// replace(BlockRegistry.pamcabbageCrop, ItemRegistry.cabbageItem);
// replace(BlockRegistry.pamspinachCrop, ItemRegistry.spinachItem);
// replace(BlockRegistry.pamwhitemushroomCrop, ItemRegistry.whitemushroomItem);
// replace(BlockRegistry.pambeanCrop, ItemRegistry.beanItem);
// replace(BlockRegistry.pamsoybeanCrop, ItemRegistry.soybeanItem);
// replace(BlockRegistry.pambellpepperCrop, ItemRegistry.bellpepperItem);
// replace(BlockRegistry.pamchilipepperCrop, ItemRegistry.chilipepperItem);
// replace(BlockRegistry.pameggplantCrop, ItemRegistry.eggplantItem);
// replace(BlockRegistry.pamokraCrop, ItemRegistry.okraItem);
// replace(BlockRegistry.pampeasCrop, ItemRegistry.peasItem);
// replace(BlockRegistry.pamtomatoCrop, ItemRegistry.tomatoItem);
// replace(BlockRegistry.pamcottonCrop, ItemRegistry.cottonItem);
// replace(BlockRegistry.pampineappleCrop, ItemRegistry.pineappleItem);
// replace(BlockRegistry.pamkiwiCrop, ItemRegistry.kiwiItem);
// replace(BlockRegistry.pamcurryleafCrop, ItemRegistry.curryleafItem);
// replace(BlockRegistry.pamsesameseedsCrop, ItemRegistry.sesameseedsItem);
// replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryItem);
// replace(BlockRegistry.pamriceCrop, ItemRegistry.riceItem);
// replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedItem);
// replace(BlockRegistry.pamwaterchestnutCrop, ItemRegistry.waterchestnutItem);
// }
// }
//
// private static void replace(Block block, Item... items){
// DirtyBlocks.addReplace(block, items);//
// }
//
//}
package dmfmm.StarvationAhoy.CropWash.Crossmod;

import com.pam.harvestcraft.HarvestCraft;
import com.pam.harvestcraft.blocks.BlockRegistry;
import com.pam.harvestcraft.blocks.CropRegistry;
import com.pam.harvestcraft.config.ConfigHandler;
import com.pam.harvestcraft.item.ItemRegistry;
import dmfmm.StarvationAhoy.CropWash.DirtyBlocks;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.fml.common.Loader;


public class CrossHarvestcraft {


public static void load(){
if (isLoaded()) {

AddIntergration();
}
}

public static boolean isLoaded(){
return Loader.isModLoaded("harvestcraft");
}


private static void AddIntergration(){
HarvestCraft.config.enableEasyHarvest = false;
for(int i=0; i< CropRegistry.cropNames.length; i++){
replace(CropRegistry.getCrop(CropRegistry.cropNames[i]), CropRegistry.getFood(CropRegistry.cropNames[i]));
}

/*if(!BlockRegistry.enablecropspecialplanting) {
replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryseedItem);
replace(BlockRegistry.pamriceCrop, ItemRegistry.riceseedItem);
replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedseedItem);
} else {
replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryItem);
replace(BlockRegistry.pamriceCrop, ItemRegistry.riceItem);
replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedItem);
replace(BlockRegistry.pamwaterchestnutCrop, ItemRegistry.waterchestnutItem);
}
if(!BlockRegistry.cropsdropSeeds) {
replace(BlockRegistry.pamblackberryCrop, ItemRegistry.blackberryItem);
replace(BlockRegistry.pamblueberryCrop, ItemRegistry.blueberryItem);
replace(BlockRegistry.pamcandleberryCrop, ItemRegistry.candleberryItem);
replace(BlockRegistry.pamraspberryCrop, ItemRegistry.raspberryItem);
replace(BlockRegistry.pamstrawberryCrop, ItemRegistry.strawberryItem);
replace(BlockRegistry.pamgrapeCrop, ItemRegistry.grapeItem);
replace(BlockRegistry.pamcactusfruitCrop, ItemRegistry.cactusfruitItem);
replace(BlockRegistry.pamasparagusCrop, ItemRegistry.asparagusItem);
replace(BlockRegistry.pambarleyCrop, ItemRegistry.barleyItem);
replace(BlockRegistry.pamoatsCrop, ItemRegistry.oatsItem);
replace(BlockRegistry.pamryeCrop, ItemRegistry.ryeItem);
replace(BlockRegistry.pamcornCrop, ItemRegistry.cornItem);
replace(BlockRegistry.pambambooshootCrop, ItemRegistry.bambooshootItem);
replace(BlockRegistry.pamcantaloupeCrop, ItemRegistry.cantaloupeItem);
replace(BlockRegistry.pamcucumberCrop, ItemRegistry.cucumberItem);
replace(BlockRegistry.pamwintersquashCrop, ItemRegistry.wintersquashItem);
replace(BlockRegistry.pamzucchiniCrop, ItemRegistry.zucchiniItem);
replace(BlockRegistry.pambeetCrop, ItemRegistry.beetItem);
replace(BlockRegistry.pamonionCrop, ItemRegistry.onionItem);
replace(BlockRegistry.pamparsnipCrop, ItemRegistry.parsnipItem);
replace(BlockRegistry.pampeanutCrop, ItemRegistry.peanutItem);
replace(BlockRegistry.pamradishCrop, ItemRegistry.radishItem);
replace(BlockRegistry.pamrutabagaCrop, ItemRegistry.rutabagaItem);
replace(BlockRegistry.pamsweetpotatoCrop, ItemRegistry.sweetpotatoItem);
replace(BlockRegistry.pamturnipCrop, ItemRegistry.turnipItem);
replace(BlockRegistry.pamrhubarbCrop, ItemRegistry.rhubarbItem);
replace(BlockRegistry.pamceleryCrop, ItemRegistry.celeryItem);
replace(BlockRegistry.pamgarlicCrop, ItemRegistry.garlicItem);
replace(BlockRegistry.pamgingerCrop, ItemRegistry.gingerItem);
replace(BlockRegistry.pamspiceleafCrop, ItemRegistry.spiceleafItem);
replace(BlockRegistry.pamtealeafCrop, ItemRegistry.tealeafItem);
replace(BlockRegistry.pamcoffeebeanCrop, ItemRegistry.coffeebeanItem);
replace(BlockRegistry.pammustardseedsCrop, ItemRegistry.mustardseedsItem);
replace(BlockRegistry.pambroccoliCrop, ItemRegistry.broccoliItem);
replace(BlockRegistry.pamcauliflowerCrop, ItemRegistry.cauliflowerItem);
replace(BlockRegistry.pamleekCrop, ItemRegistry.leekItem);
replace(BlockRegistry.pamlettuceCrop, ItemRegistry.lettuceItem);
replace(BlockRegistry.pamscallionCrop, ItemRegistry.scallionItem);
replace(BlockRegistry.pamartichokeCrop, ItemRegistry.artichokeItem);
replace(BlockRegistry.pambrusselsproutCrop, ItemRegistry.brusselsproutItem);
replace(BlockRegistry.pamcabbageCrop, ItemRegistry.cabbageItem);
replace(BlockRegistry.pamspinachCrop, ItemRegistry.spinachItem);
replace(BlockRegistry.pamwhitemushroomCrop, ItemRegistry.whitemushroomItem);
replace(BlockRegistry.pambeanCrop, ItemRegistry.beanItem);
replace(BlockRegistry.pamsoybeanCrop, ItemRegistry.soybeanItem);
replace(BlockRegistry.pambellpepperCrop, ItemRegistry.bellpepperItem);
replace(BlockRegistry.pamchilipepperCrop, ItemRegistry.chilipepperItem);
replace(BlockRegistry.pameggplantCrop, ItemRegistry.eggplantItem);
replace(BlockRegistry.pamokraCrop, ItemRegistry.okraItem);
replace(BlockRegistry.pampeasCrop, ItemRegistry.peasItem);
replace(BlockRegistry.pamtomatoCrop, ItemRegistry.tomatoItem);
replace(BlockRegistry.pamcottonCrop, ItemRegistry.cottonItem);
replace(BlockRegistry.pampineappleCrop, ItemRegistry.pineappleItem);
replace(BlockRegistry.pamkiwiCrop, ItemRegistry.kiwiItem);
replace(BlockRegistry.pamcurryleafCrop, ItemRegistry.curryleafItem);
replace(BlockRegistry.pamsesameseedsCrop, ItemRegistry.sesameseedsItem);
replace(BlockRegistry.pamcranberryCrop, ItemRegistry.cranberryItem);
replace(BlockRegistry.pamriceCrop, ItemRegistry.riceItem);
replace(BlockRegistry.pamseaweedCrop, ItemRegistry.seaweedItem);
replace(BlockRegistry.pamwaterchestnutCrop, ItemRegistry.waterchestnutItem);
}*/
}

private static void replace(Block block, Item... items){
DirtyBlocks.addReplace(block, items);
}

}
4 changes: 2 additions & 2 deletions src/main/java/dmfmm/StarvationAhoy/CropWash/Crossmod/CrossMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ public class CrossMod {

public static void init(){
//TODO: REENABLE THESE CROSSMOD THINGS!
//CrossHarvestcraft.load();

//CrossArgicraft.load();
}

public static void postinit(){

CrossHarvestcraft.load();
}

}
2 changes: 1 addition & 1 deletion src/main/java/dmfmm/StarvationAhoy/CropWash/ModuleCropWash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static void init(Side side) {

}

public static void postnit() {
public static void postInit() {
CrossMod.postinit();
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dmfmm/StarvationAhoy/StarvationAhoy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import dmfmm.StarvationAhoy.FoodEdit.Packet.PacketResponseNewFoods;
import dmfmm.StarvationAhoy.Meat.Block.multiblock.net.PacketMultiBlock;
import dmfmm.StarvationAhoy.Meat.ModuleMeat;
import dmfmm.StarvationAhoy.api.CropWash.CropWash;
import dmfmm.StarvationAhoy.api.FoodEdit.KnownFoods;
import dmfmm.StarvationAhoy.api.StarvationAhoyRegistry;
import dmfmm.StarvationAhoy.proxy.CommonProxy;
Expand Down Expand Up @@ -134,6 +135,7 @@ public void load(FMLInitializationEvent event){

@EventHandler
public void postInit(FMLPostInitializationEvent event){
ModuleCropWash.postInit();
if (event.getSide() == Side.CLIENT) {
KnownFoods.leaveServer();
FurnaceHelper.iterate();
Expand Down

0 comments on commit 0e2cab5

Please sign in to comment.