Merge pull request #1086 from thatsIch/b-1061-mekanism
Fixes #1061 Recipes are properly registered with new Mekanism
This commit is contained in:
commit
0542a58e4b
4 changed files with 28 additions and 9 deletions
|
@ -33,7 +33,7 @@ api_craftguide_version=1
|
|||
api_ic2_version=1
|
||||
api_immibis_version=1
|
||||
api_invtweaks_version=1
|
||||
api_mekansim_version=1
|
||||
api_mekansim_version=1.7.10-8.0.1.198
|
||||
api_mfr_version=1
|
||||
api_railcraft_version=1
|
||||
api_rblocks_version=1
|
||||
|
|
|
@ -53,7 +53,7 @@ dependencies {
|
|||
compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
|
||||
compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
|
||||
compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
|
||||
compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
|
||||
compile(group: 'api', name: 'mekanism', version: "${config.api_mekansim_version}", classifier: 'api')
|
||||
compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
|
||||
compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
|
||||
compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue