tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Added lava as casting recipe

Browse source
This commit is contained in:
Calclavia 2014-02-25 18:38:34 +08:00
parent cc92a5e29b
commit 988e85bf42
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java
View file

@ -72,7 +72,6 @@ public class BlockCastingMold extends BlockTile
tile.onInventoryChanged();
}
}
}
@ -95,6 +94,8 @@ public class BlockCastingMold extends BlockTile
InventoryUtility.dropItemStack(world, new Vector3(player), output, 0);
tile.setInventorySlotContents(0, null);
}
return true;
}
return false;

20
archaic/src/main/java/resonantinduction/archaic/process/TileCastingMold.java
View file

@ -1,8 +1,6 @@
package resonantinduction.archaic.process;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraftforge.common.ForgeDirection;
@ -12,17 +10,15 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.api.recipe.MachineRecipes;
import resonantinduction.api.recipe.MachineRecipes.RecipeType;
import resonantinduction.api.recipe.RecipeResource;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.resource.fluid.BlockFluidMaterial;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.prefab.tile.TileExternalInventory;
import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.utility.FluidUtility;
import com.google.common.io.ByteArrayDataInput;
@ -83,26 +79,20 @@ public class TileCastingMold extends TileExternalInventory implements IFluidHand
* Check blocks above for fluid.
*/
Vector3 checkPos = new Vector3(this).translate(0, 1, 0);
int blockID = checkPos.getBlockID(worldObj);
Block block = Block.blocksList[blockID];
FluidStack drainStack = FluidUtility.drainBlock(worldObj, checkPos, false);
if (block instanceof BlockFluidMaterial)
if (MachineRecipes.INSTANCE.getOutput(RecipeType.SMELTER, drainStack).length > 0)
{
/**
* Only drain if everything is accepted by the tank.
*/
FluidStack drainStack = ((BlockFluidMaterial) block).drain(worldObj, checkPos.intX(), checkPos.intY(), checkPos.intZ(), false);
if (drainStack.amount == tank.fill(drainStack, false))
{
tank.fill(((BlockFluidMaterial) block).drain(worldObj, checkPos.intX(), checkPos.intY(), checkPos.intZ(), true), true);
tank.fill(FluidUtility.drainBlock(worldObj, checkPos, true), true);
}
}
/**
* Attempt to cast the fluid
*/
if (tank.getFluidAmount() > amountPerIngot)
while (tank.getFluidAmount() >= amountPerIngot && (getStackInSlot(0) == null || getStackInSlot(0).stackSize < getStackInSlot(0).getMaxStackSize()))
{
RecipeResource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.SMELTER, tank.getFluid());

3
src/main/java/resonantinduction/api/recipe/RecipeResource.java
View file

@ -156,6 +156,9 @@ public abstract class RecipeResource
@Override
public boolean equals(Object obj)
{
if (obj instanceof FluidStackResource)
return equals(((FluidStackResource) obj).fluidStack);
return (obj instanceof FluidStack) ? ((FluidStack) obj).equals(obj) : false;
}

2
src/main/java/resonantinduction/core/resource/ResourceGenerator.java
View file

@ -93,6 +93,8 @@ public class ResourceGenerator
OreDictionary.registerOre("oreIron", Block.oreIron);
OreDictionary.registerOre("oreLapis", Block.oreLapis);
MachineRecipes.INSTANCE.addRecipe(RecipeType.SMELTER, new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(Block.stone));
for (String materialName : materialNames)
{
// Caps version of the name