Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed ItemOreResource dependent on TileGutter

Browse source
This commit is contained in:
Calclavia 2014-03-11 22:01:39 +08:00
parent ced69ff4ee
commit 79e9fc8f6d
2 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -23,6 +23,9 @@ import net.minecraftforge.fluids.IFluidTank;
import org.lwjgl.opengl.GL11;
import resonantinduction.api.recipe.MachineRecipes;
import resonantinduction.api.recipe.RecipeResource;
import resonantinduction.api.recipe.MachineRecipes.RecipeType;
import resonantinduction.archaic.fluid.grate.TileGrate;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
@ -36,6 +39,7 @@ import calclavia.lib.render.FluidRenderUtility;
import calclavia.lib.render.RenderUtility;
import calclavia.lib.utility.FluidUtility;
import calclavia.lib.utility.WorldUtility;
import calclavia.lib.utility.inventory.InventoryUtility;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -183,7 +187,42 @@ public class TileGutter extends TilePressureNode
{
if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == ResonantInduction.itemDust)
{
return false;
if (!world().isRemote)
{
/**
* Manually wash dust into refined dust.
*/
ItemStack itemStack = player.getCurrentEquippedItem();
RecipeResource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.MIXER, itemStack);
if (outputs.length > 0)
{
int drainAmount = 50 + world().rand.nextInt(50);
FluidStack drain = drain(ForgeDirection.UP, drainAmount, false);
if (drain != null && drain.amount > 0 && world().rand.nextFloat() > 0.9)
{
if (world().rand.nextFloat() > 0.1)
for (RecipeResource res : outputs)
InventoryUtility.dropItemStack(world(), new Vector3(player), res.getItemStack().copy(), 0);
itemStack.stackSize--;
if (itemStack.stackSize <= 0)
itemStack = null;
player.inventory.setInventorySlotContents(player.inventory.currentItem, itemStack);
}
drain(ForgeDirection.UP, drainAmount, true);
world().playSoundEffect(x() + 0.5, y() + 0.5, z() + 0.5, "liquid.water", 0.5f, 1);
return true;
}
}
return true;
}
if (!world().isRemote)

38
src/main/java/resonantinduction/core/resource/ItemOreResource.java
View file

@ -150,44 +150,6 @@ public class ItemOreResource extends Item
}
}
if (itemStack.getItem() == ResonantInduction.itemDust && !world.isRemote)
{
/**
* Manually wash dust into refined dust.
*/
RecipeResource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.MIXER, itemStack);
if (outputs.length > 0)
{
TileEntity tile = world.getBlockTileEntity(x, y, z);
if (tile instanceof TileGutter)
{
int drainAmount = 50 + world.rand.nextInt(50);
FluidStack drain = ((TileGutter) tile).drain(ForgeDirection.UP, drainAmount, false);
if (drain != null && drain.amount > 0 && world.rand.nextFloat() > 0.9)
{
if (world.rand.nextFloat() > 0.1)
for (RecipeResource res : outputs)
InventoryUtility.dropItemStack(world, new Vector3(player), res.getItemStack().copy(), 0);
itemStack.stackSize--;
if (itemStack.stackSize <= 0)
itemStack = null;
player.inventory.setInventorySlotContents(player.inventory.currentItem, itemStack);
}
((TileGutter) tile).drain(ForgeDirection.UP, drainAmount, true);
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "liquid.water", 0.5f, 1);
return true;
}
}
}
return false;
}