lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Temporarily removed Pam harvest handlers.

Browse source
This commit is contained in:
WayofTime 2015-07-29 18:17:50 -04:00
parent 94b74fe309
commit b406b581a0
4 changed files with 334 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/alchemicalWizardry/common/guide/RecipeHolder.java
View file

@ -155,7 +155,7 @@ public class RecipeHolder
arcanePlinthRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockPlinth));
arcanePedestalRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockPedestal));
spellTableRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockHomHeart));
spellTableRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockSpellTable));
alchemySetRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockWritingTable));
crucibleRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockCrucible));
@ -168,7 +168,7 @@ public class RecipeHolder
routerRecipe = getRecipeForItemStack(new ItemStack(ModItems.itemAttunedCrystal));
segmenterRecipe = getRecipeForItemStack(new ItemStack(ModItems.itemTankSegmenter));
cleanserRecipe = getRecipeForItemStack(new ItemStack(ModItems.itemDestinationClearer));
calcinatorRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockAlchemicCalcinator));
calcinatorRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockAlchemicalCalcinator));
belljarRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockCrystalBelljar));
relayRecipe = getRecipeForItemStack(new ItemStack(ModBlocks.blockReagentConduit));

138
src/main/java/WayofTime/alchemicalWizardry/common/harvest/GenericPamSeedlessFruitHarvestHandler.java
View file

@ -1,69 +1,69 @@
package WayofTime.alchemicalWizardry.common.harvest;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
import cpw.mods.fml.common.registry.GameRegistry;
public class GenericPamSeedlessFruitHarvestHandler implements IHarvestHandler
{
public Block harvestBlock;
public int harvestMeta;
public int resetMeta;
public GenericPamSeedlessFruitHarvestHandler(String block, int harvestMeta, int resetMeta)
{
this.harvestBlock = getBlockForString(block);
this.harvestMeta = harvestMeta;
this.resetMeta = resetMeta;
}
public boolean isHarvesterValid()
{
return harvestBlock != null;
}
public static Block getBlockForString(String str)
{
String[] parts = str.split(":");
String modId = parts[0];
String name = parts[1];
return GameRegistry.findBlock(modId, name);
}
public static Item getItemForString(String str)
{
String[] parts = str.split(":");
String modId = parts[0];
String name = parts[1];
return GameRegistry.findItem(modId, name);
}
public boolean canHandleBlock(Block block)
{
return block == harvestBlock;
}
public int getHarvestMeta()
{
return harvestMeta;
}
@Override
public boolean harvestAndPlant(World world, BlockPos pos, Block block, IBlockState state)
{
if (!this.canHandleBlock(block) || block.getMetaFromState(state) != this.getHarvestMeta())
{
return false;
}
world.destroyBlock(pos, true);
world.setBlockState(pos, harvestBlock.getStateFromMeta(resetMeta), 3);
return true;
}
}
//package WayofTime.alchemicalWizardry.common.harvest;
//
//import net.minecraft.block.Block;
//import net.minecraft.block.state.IBlockState;
//import net.minecraft.item.Item;
//import net.minecraft.util.BlockPos;
//import net.minecraft.world.World;
//import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
//import cpw.mods.fml.common.registry.GameRegistry;
//
//public class GenericPamSeedlessFruitHarvestHandler implements IHarvestHandler
//{
// public Block harvestBlock;
// public int harvestMeta;
// public int resetMeta;
//
// public GenericPamSeedlessFruitHarvestHandler(String block, int harvestMeta, int resetMeta)
// {
// this.harvestBlock = getBlockForString(block);
// this.harvestMeta = harvestMeta;
// this.resetMeta = resetMeta;
// }
//
// public boolean isHarvesterValid()
// {
// return harvestBlock != null;
// }
//
// public static Block getBlockForString(String str)
// {
// String[] parts = str.split(":");
// String modId = parts[0];
// String name = parts[1];
// return GameRegistry.findBlock(modId, name);
// }
//
// public static Item getItemForString(String str)
// {
// String[] parts = str.split(":");
// String modId = parts[0];
// String name = parts[1];
// return GameRegistry.findItem(modId, name);
// }
//
// public boolean canHandleBlock(Block block)
// {
// return block == harvestBlock;
// }
//
// public int getHarvestMeta()
// {
// return harvestMeta;
// }
//
// @Override
// public boolean harvestAndPlant(World world, BlockPos pos, Block block, IBlockState state)
// {
// if (!this.canHandleBlock(block) || block.getMetaFromState(state) != this.getHarvestMeta())
// {
// return false;
// }
//
// world.destroyBlock(pos, true);
//
// world.setBlockState(pos, harvestBlock.getStateFromMeta(resetMeta), 3);
//
// return true;
// }
//}

276
src/main/java/WayofTime/alchemicalWizardry/common/harvest/GenericSeededHarvestHandler.java
View file

@ -1,138 +1,138 @@
package WayofTime.alchemicalWizardry.common.harvest;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable;
import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
import cpw.mods.fml.common.registry.GameRegistry;
public class GenericSeededHarvestHandler implements IHarvestHandler
{
public Block harvestBlock;
public int harvestMeta;
public IPlantable harvestSeed;
public GenericSeededHarvestHandler(String block, int meta, String seed)
{
harvestBlock = getBlockForString(block);
harvestMeta = meta;
Item testSeed = getItemForString(seed);
if (testSeed instanceof IPlantable)
{
harvestSeed = (IPlantable) testSeed;
} else
{
harvestSeed = null;
}
}
public boolean isHarvesterValid()
{
return harvestBlock != null && harvestSeed != null;
}
public static Block getBlockForString(String str)
{
String[] parts = str.split(":");
String modId = parts[0];
String name = parts[1];
return GameRegistry.findBlock(modId, name);
}
public static Item getItemForString(String str)
{
String[] parts = str.split(":");
String modId = parts[0];
String name = parts[1];
return GameRegistry.findItem(modId, name);
}
public boolean canHandleBlock(Block block)
{
return block == harvestBlock;
}
public int getHarvestMeta()
{
return harvestMeta;
}
@Override
public boolean harvestAndPlant(World world, BlockPos pos, Block block, IBlockState state)
{
if (!this.canHandleBlock(block) || block.getMetaFromState(state) != this.getHarvestMeta())
{
return false;
}
IPlantable seed = this.getSeedItem(block);
if (seed == null)
{
world.destroyBlock(pos, true);
return true;
} else
{
int fortune = 0;
List<ItemStack> list = block.getDrops(world, pos, state, fortune);
boolean foundAndRemovedSeed = false;
for (ItemStack stack : list)
{
if (stack == null)
{
continue;
}
Item item = stack.getItem();
if (item == seed)
{
int itemSize = stack.stackSize;
if (itemSize > 1)
{
stack.stackSize--;
foundAndRemovedSeed = true;
break;
} else if (itemSize == 1)
{
list.remove(stack);
foundAndRemovedSeed = true;
break;
}
}
}
if (foundAndRemovedSeed)
{
IBlockState plantState = seed.getPlant(world, pos);
world.destroyBlock(pos, false);
world.setBlockState(pos, plantState, 3);
for (ItemStack stack : list)
{
EntityItem itemEnt = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, stack);
world.spawnEntityInWorld(itemEnt);
}
}
return false;
}
}
public IPlantable getSeedItem(Block block)
{
return harvestSeed;
}
}
//package WayofTime.alchemicalWizardry.common.harvest;
//
//import java.util.List;
//
//import net.minecraft.block.Block;
//import net.minecraft.block.state.IBlockState;
//import net.minecraft.entity.item.EntityItem;
//import net.minecraft.item.Item;
//import net.minecraft.item.ItemStack;
//import net.minecraft.util.BlockPos;
//import net.minecraft.world.World;
//import net.minecraftforge.common.IPlantable;
//import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
//import cpw.mods.fml.common.registry.GameRegistry;
//
//public class GenericSeededHarvestHandler implements IHarvestHandler
//{
// public Block harvestBlock;
// public int harvestMeta;
// public IPlantable harvestSeed;
//
// public GenericSeededHarvestHandler(String block, int meta, String seed)
// {
// harvestBlock = getBlockForString(block);
// harvestMeta = meta;
// Item testSeed = getItemForString(seed);
// if (testSeed instanceof IPlantable)
// {
// harvestSeed = (IPlantable) testSeed;
// } else
// {
// harvestSeed = null;
// }
// }
//
// public boolean isHarvesterValid()
// {
// return harvestBlock != null && harvestSeed != null;
// }
//
// public static Block getBlockForString(String str)
// {
// String[] parts = str.split(":");
// String modId = parts[0];
// String name = parts[1];
// return GameRegistry.findBlock(modId, name);
// }
//
// public static Item getItemForString(String str)
// {
// String[] parts = str.split(":");
// String modId = parts[0];
// String name = parts[1];
// return GameRegistry.findItem(modId, name);
// }
//
// public boolean canHandleBlock(Block block)
// {
// return block == harvestBlock;
// }
//
// public int getHarvestMeta()
// {
// return harvestMeta;
// }
//
// @Override
// public boolean harvestAndPlant(World world, BlockPos pos, Block block, IBlockState state)
// {
// if (!this.canHandleBlock(block) || block.getMetaFromState(state) != this.getHarvestMeta())
// {
// return false;
// }
//
// IPlantable seed = this.getSeedItem(block);
//
// if (seed == null)
// {
// world.destroyBlock(pos, true);
//
// return true;
// } else
// {
// int fortune = 0;
//
// List<ItemStack> list = block.getDrops(world, pos, state, fortune);
// boolean foundAndRemovedSeed = false;
//
// for (ItemStack stack : list)
// {
// if (stack == null)
// {
// continue;
// }
//
// Item item = stack.getItem();
// if (item == seed)
// {
// int itemSize = stack.stackSize;
// if (itemSize > 1)
// {
// stack.stackSize--;
// foundAndRemovedSeed = true;
// break;
// } else if (itemSize == 1)
// {
// list.remove(stack);
// foundAndRemovedSeed = true;
// break;
// }
// }
// }
//
// if (foundAndRemovedSeed)
// {
// IBlockState plantState = seed.getPlant(world, pos);
//
// world.destroyBlock(pos, false);
//
// world.setBlockState(pos, plantState, 3);
//
// for (ItemStack stack : list)
// {
// EntityItem itemEnt = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, stack);
//
// world.spawnEntityInWorld(itemEnt);
// }
// }
//
// return false;
// }
// }
//
// public IPlantable getSeedItem(Block block)
// {
// return harvestSeed;
// }
//}

250
src/main/java/WayofTime/alchemicalWizardry/common/harvest/PamHarvestCompatRegistry.java
View file

@ -1,125 +1,125 @@
package WayofTime.alchemicalWizardry.common.harvest;
import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
public class PamHarvestCompatRegistry
{
public static void registerPamHandlers()
{
registerSeededHandler("blackberry", 7);
registerSeededHandler("blueberry", 7);
registerSeededHandler("candleberry", 7);
registerSeededHandler("raspberry", 7);
registerSeededHandler("strawberry", 7);
registerSeededHandler("cactusfruit", 7);
registerSeededHandler("asparagus", 7);
registerSeededHandler("barley", 7);
registerSeededHandler("oats", 7);
registerSeededHandler("rye", 7);
registerSeededHandler("corn", 7);
registerSeededHandler("bambooshoot", 7);
registerSeededHandler("cantaloupe", 7);
registerSeededHandler("cucumber", 7);
registerSeededHandler("windersquash", 7);
registerSeededHandler("zucchini", 7);
registerSeededHandler("beat", 7);
registerSeededHandler("onion", 7);
registerSeededHandler("parsnip", 7);
registerSeededHandler("peanut", 7);
registerSeededHandler("radish", 7);
registerSeededHandler("rutabaga", 7);
registerSeededHandler("sweetpotato", 7);
registerSeededHandler("turnip", 7);
registerSeededHandler("rhubarb", 7);
registerSeededHandler("celery", 7);
registerSeededHandler("garlic", 7);
registerSeededHandler("ginger", 7);
registerSeededHandler("spiceleaf", 7);
registerSeededHandler("tealeaf", 7);
registerSeededHandler("coffeebean", 7);
registerSeededHandler("mustardseeds", 7);
registerSeededHandler("brocolli", 7);
registerSeededHandler("cauliflower", 7);
registerSeededHandler("leek", 7);
registerSeededHandler("lettuce", 7);
registerSeededHandler("scallion", 7);
registerSeededHandler("artichoke", 7);
registerSeededHandler("brusselsprout", 7);
registerSeededHandler("cabbage", 7);
registerSeededHandler("whitemushroom", 7);
registerSeededHandler("bean", 7);
registerSeededHandler("soybean", 7);
registerSeededHandler("bellpepper", 7);
registerSeededHandler("chili", 7);
registerSeededHandler("eggplant", 7);
registerSeededHandler("pamokra", 7);
registerSeededHandler("peas", 7);
registerSeededHandler("tomato", 7);
registerSeededHandler("cotton", 7);
registerSeededHandler("pineapple", 7);
registerSeededHandler("grape", 7);
registerSeededHandler("kiwi", 7);
registerSeededHandler("cranberry", 7);
registerSeededHandler("rice", 7);
registerSeededHandler("seaweed", 7);
registerFruitHandler("apple", 7, 0);
registerFruitHandler("Almond", 7, 0);
registerFruitHandler("Apricot", 7, 0);
registerFruitHandler("Avocado", 7, 0);
registerFruitHandler("Banana", 7, 0);
registerFruitHandler("Cashew", 7, 0);
registerFruitHandler("Cherry", 7, 0);
registerFruitHandler("Chestnut", 7, 0);
registerFruitHandler("Cinnamon", 7, 0);
registerFruitHandler("Coconut", 7, 0);
registerFruitHandler("Date", 7, 0);
registerFruitHandler("Dragonfruit", 7, 0);
registerFruitHandler("Durian", 7, 0);
registerFruitHandler("Fig", 7, 0);
registerFruitHandler("Grapefruit", 7, 0);
registerFruitHandler("Lemon", 7, 0);
registerFruitHandler("Lime", 7, 0);
registerFruitHandler("Maple", 7, 0);
registerFruitHandler("Mango", 7, 0);
registerFruitHandler("Nutmeg", 7, 0);
registerFruitHandler("Olive", 7, 0);
registerFruitHandler("Orange", 7, 0);
registerFruitHandler("Papaya", 7, 0);
registerFruitHandler("Paperbark", 7, 0);
registerFruitHandler("Peach", 7, 0);
registerFruitHandler("Pear", 7, 0);
registerFruitHandler("Pecan", 7, 0);
registerFruitHandler("Peppercorn", 7, 0);
registerFruitHandler("Persimmon", 7, 0);
registerFruitHandler("Pistachio", 7, 0);
registerFruitHandler("Plum", 7, 0);
registerFruitHandler("Pomegranate", 7, 0);
registerFruitHandler("Starfruit", 7, 0);
registerFruitHandler("Vanillabean", 7, 0);
registerFruitHandler("Walnut", 7, 0);
}
public static void registerSeededHandler(String name, int meta)
{
String block = "harvestcraft:pam" + name + "Crop";
String seed = "harvestcraft:" + name + "Item";
GenericSeededHarvestHandler handler = new GenericSeededHarvestHandler(block, meta, seed);
if (handler.isHarvesterValid())
{
HarvestRegistry.registerHarvestHandler(handler);
}
}
public static void registerFruitHandler(String name, int harvestMeta, int resetMeta)
{
String block = "harvestcraft:pam" + name;
GenericPamSeedlessFruitHarvestHandler handler = new GenericPamSeedlessFruitHarvestHandler(block, harvestMeta, resetMeta);
if (handler.isHarvesterValid())
{
HarvestRegistry.registerHarvestHandler(handler);
}
}
}
//package WayofTime.alchemicalWizardry.common.harvest;
//
//import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
//
//public class PamHarvestCompatRegistry
//{
// public static void registerPamHandlers()
// {
// registerSeededHandler("blackberry", 7);
// registerSeededHandler("blueberry", 7);
// registerSeededHandler("candleberry", 7);
// registerSeededHandler("raspberry", 7);
// registerSeededHandler("strawberry", 7);
// registerSeededHandler("cactusfruit", 7);
// registerSeededHandler("asparagus", 7);
// registerSeededHandler("barley", 7);
// registerSeededHandler("oats", 7);
// registerSeededHandler("rye", 7);
// registerSeededHandler("corn", 7);
// registerSeededHandler("bambooshoot", 7);
// registerSeededHandler("cantaloupe", 7);
// registerSeededHandler("cucumber", 7);
// registerSeededHandler("windersquash", 7);
// registerSeededHandler("zucchini", 7);
// registerSeededHandler("beat", 7);
// registerSeededHandler("onion", 7);
// registerSeededHandler("parsnip", 7);
// registerSeededHandler("peanut", 7);
// registerSeededHandler("radish", 7);
// registerSeededHandler("rutabaga", 7);
// registerSeededHandler("sweetpotato", 7);
// registerSeededHandler("turnip", 7);
// registerSeededHandler("rhubarb", 7);
// registerSeededHandler("celery", 7);
// registerSeededHandler("garlic", 7);
// registerSeededHandler("ginger", 7);
// registerSeededHandler("spiceleaf", 7);
// registerSeededHandler("tealeaf", 7);
// registerSeededHandler("coffeebean", 7);
// registerSeededHandler("mustardseeds", 7);
// registerSeededHandler("brocolli", 7);
// registerSeededHandler("cauliflower", 7);
// registerSeededHandler("leek", 7);
// registerSeededHandler("lettuce", 7);
// registerSeededHandler("scallion", 7);
// registerSeededHandler("artichoke", 7);
// registerSeededHandler("brusselsprout", 7);
// registerSeededHandler("cabbage", 7);
// registerSeededHandler("whitemushroom", 7);
// registerSeededHandler("bean", 7);
// registerSeededHandler("soybean", 7);
// registerSeededHandler("bellpepper", 7);
// registerSeededHandler("chili", 7);
// registerSeededHandler("eggplant", 7);
// registerSeededHandler("pamokra", 7);
// registerSeededHandler("peas", 7);
// registerSeededHandler("tomato", 7);
// registerSeededHandler("cotton", 7);
// registerSeededHandler("pineapple", 7);
// registerSeededHandler("grape", 7);
// registerSeededHandler("kiwi", 7);
// registerSeededHandler("cranberry", 7);
// registerSeededHandler("rice", 7);
// registerSeededHandler("seaweed", 7);
//
// registerFruitHandler("apple", 7, 0);
// registerFruitHandler("Almond", 7, 0);
// registerFruitHandler("Apricot", 7, 0);
// registerFruitHandler("Avocado", 7, 0);
// registerFruitHandler("Banana", 7, 0);
// registerFruitHandler("Cashew", 7, 0);
// registerFruitHandler("Cherry", 7, 0);
// registerFruitHandler("Chestnut", 7, 0);
// registerFruitHandler("Cinnamon", 7, 0);
// registerFruitHandler("Coconut", 7, 0);
// registerFruitHandler("Date", 7, 0);
// registerFruitHandler("Dragonfruit", 7, 0);
// registerFruitHandler("Durian", 7, 0);
// registerFruitHandler("Fig", 7, 0);
// registerFruitHandler("Grapefruit", 7, 0);
// registerFruitHandler("Lemon", 7, 0);
// registerFruitHandler("Lime", 7, 0);
// registerFruitHandler("Maple", 7, 0);
// registerFruitHandler("Mango", 7, 0);
// registerFruitHandler("Nutmeg", 7, 0);
// registerFruitHandler("Olive", 7, 0);
// registerFruitHandler("Orange", 7, 0);
// registerFruitHandler("Papaya", 7, 0);
// registerFruitHandler("Paperbark", 7, 0);
// registerFruitHandler("Peach", 7, 0);
// registerFruitHandler("Pear", 7, 0);
// registerFruitHandler("Pecan", 7, 0);
// registerFruitHandler("Peppercorn", 7, 0);
// registerFruitHandler("Persimmon", 7, 0);
// registerFruitHandler("Pistachio", 7, 0);
// registerFruitHandler("Plum", 7, 0);
// registerFruitHandler("Pomegranate", 7, 0);
// registerFruitHandler("Starfruit", 7, 0);
// registerFruitHandler("Vanillabean", 7, 0);
// registerFruitHandler("Walnut", 7, 0);
// }
//
// public static void registerSeededHandler(String name, int meta)
// {
// String block = "harvestcraft:pam" + name + "Crop";
// String seed = "harvestcraft:" + name + "Item";
//
// GenericSeededHarvestHandler handler = new GenericSeededHarvestHandler(block, meta, seed);
// if (handler.isHarvesterValid())
// {
// HarvestRegistry.registerHarvestHandler(handler);
// }
// }
//
// public static void registerFruitHandler(String name, int harvestMeta, int resetMeta)
// {
// String block = "harvestcraft:pam" + name;
//
// GenericPamSeedlessFruitHarvestHandler handler = new GenericPamSeedlessFruitHarvestHandler(block, harvestMeta, resetMeta);
// if (handler.isHarvesterValid())
// {
// HarvestRegistry.registerHarvestHandler(handler);
// }
// }
//}