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

Worked on some crafting

Browse source
This commit is contained in:
Robert 2013-11-11 12:23:48 -05:00
parent 5006dbe895
commit 17f5c82fef
2 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/dark/api/fluid/AdvancedFluidEvent.java
View file

@ -1,34 +0,0 @@
package dark.api.fluid;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidEvent;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3;
public class AdvancedFluidEvent extends FluidEvent
{
public AdvancedFluidEvent(FluidStack fluid, World world, Vector3 vec)
{
super(fluid, world, vec.intX(), vec.intY(), vec.intZ());
}
/** Mods should fire this event two different fluids try to merge */
public static class FluidMergeEvent extends AdvancedFluidEvent
{
FluidStack mergeFluid;
public FluidMergeEvent(FluidStack fluid, FluidStack merge, World world, Vector3 vec)
{
super(fluid, world, vec);
this.mergeFluid = merge;
}
}
public static final void fireEvent(AdvancedFluidEvent event)
{
MinecraftForge.EVENT_BUS.post(event);
}
}

5
src/dark/fluid/common/FMRecipeLoader.java
View file

@ -3,6 +3,7 @@ package dark.fluid.common;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
@ -48,7 +49,7 @@ public class FMRecipeLoader extends RecipeLoader
// release valve
GameRegistry.addRecipe(new ItemStack(blockReleaseValve, 1), new Object[] { "RPR", "PVP", "RPR", 'P', new ItemStack(blockPipe, 1), 'V', new ItemStack(CoreRecipeLoader.itemParts, 1, Parts.Valve.ordinal()), 'R', Item.redstone });
// sink
GameRegistry.addRecipe(new ItemStack(blockSink, 1), new Object[] { "I I", "SIS", "SPS", 'P', new ItemStack(blockPipe, 1), 'I', Item.ingotIron, 'S', Block.stone });
//GameRegistry.addRecipe(new ItemStack(blockSink, 1), new Object[] { "I I", "SIS", "SPS", 'P', new ItemStack(blockPipe, 1), 'I', Item.ingotIron, 'S', Block.stone });
}
public void registerTanks()
@ -83,7 +84,7 @@ public class FMRecipeLoader extends RecipeLoader
for (ColorCode color : ColorCode.values())
{
GameRegistry.addRecipe(mat.getStack(color), new Object[] { " X ", "XIX", " X ", 'I', new ItemStack(Item.dyePowder, 1, color.ordinal()), 'X', blockPipe });
new RecipeGrid(mat.getStack(), 1, 1).setRowOne(mat.getStack(color)).RegisterRecipe();
GameRegistry.addShapelessRecipe(mat.getStack(), new Object[]{mat.getStack(color)});
}
}