fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1086 from thatsIch/b-1061-mekanism

Browse Source 
Fixes #1061 Recipes are properly registered with new Mekanism
This commit is contained in:
thatsIch
2015-03-26 11:34:16 +01:00
parent 58db877006 33c1535bfa
commit 0542a58e4b
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/Mekanism.java
+23 -4
View File
@@ -19,13 +19,14 @@
package appeng.integration.modules;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import mekanism.api.RecipeHelper;
import cpw.mods.fml.common.event.FMLInterModComms;
import appeng.integration.BaseModule;
import appeng.integration.abstraction.IMekanism;
public class Mekanism extends BaseModule implements IMekanism
public final class Mekanism extends BaseModule implements IMekanism
{
public static Mekanism instance;
@@ -45,13 +46,31 @@ public class Mekanism extends BaseModule implements IMekanism
@Override
public void addCrusherRecipe(ItemStack in, ItemStack out)
{
RecipeHelper.addCrusherRecipe( in, out );
final NBTTagCompound sendTag = this.convertToSimpleRecipe( in, out );
FMLInterModComms.sendMessage( "mekanism", "CrusherRecipe", sendTag );
}
@Override
public void addEnrichmentChamberRecipe(ItemStack in, ItemStack out)
{
RecipeHelper.addEnrichmentChamberRecipe( in, out );
final NBTTagCompound sendTag = this.convertToSimpleRecipe( in, out );
FMLInterModComms.sendMessage( "mekanism", "EnrichmentChamberRecipe", sendTag );
}
private NBTTagCompound convertToSimpleRecipe( ItemStack in, ItemStack out )
{
final NBTTagCompound sendTag = new NBTTagCompound();
final NBTTagCompound inputTagDummy = new NBTTagCompound();
final NBTTagCompound outputTagDummy = new NBTTagCompound();
final NBTTagCompound inputTag = in.writeToNBT( inputTagDummy );
final NBTTagCompound outputTag = out.writeToNBT( outputTagDummy );
sendTag.setTag( "input", inputTag );
sendTag.setTag( "output", outputTag );
return sendTag;
}
}
src/main/resources/assets/appliedenergistics2/recipes/process.recipe
+3 -3
View File
@@ -170,10 +170,10 @@ shaped=
grindfz= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
#bug mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
#bug mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
# mekcrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
#bug mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
mekechamber= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust