Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix nei recipe handlers

Browse source
This commit is contained in:
Ellpeck 2015-10-02 20:06:03 +02:00
parent a92396204a
commit 7e0d524b0f
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
View file

@ -14,7 +14,6 @@ import cpw.mods.fml.common.Loader;
import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
import ellpeck.actuallyadditions.nei.NeiScreenEvents; import ellpeck.actuallyadditions.nei.NeiScreenEvents;
import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier; import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier;
import ellpeck.actuallyadditions.util.CompatUtil;
import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.Util; import ellpeck.actuallyadditions.util.Util;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@ -39,7 +38,7 @@ public class InitEvents{
Util.registerEvent(new TooltipEvent()); Util.registerEvent(new TooltipEvent());
Util.registerEvent(new RenderPlayerEventAA()); Util.registerEvent(new RenderPlayerEventAA());
if(Loader.isModLoaded(CompatUtil.NEI_MOD_ID)){ if(Loader.isModLoaded("NotEnoughItems")){
Util.registerEvent(new NeiScreenEvents()); Util.registerEvent(new NeiScreenEvents());
} }

7
src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java
View file

@ -12,12 +12,10 @@ package ellpeck.actuallyadditions.nei;
import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.IRecipeHandler;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import ellpeck.actuallyadditions.booklet.GuiBooklet; import ellpeck.actuallyadditions.booklet.GuiBooklet;
import ellpeck.actuallyadditions.booklet.InitBooklet; import ellpeck.actuallyadditions.booklet.InitBooklet;
import ellpeck.actuallyadditions.booklet.page.BookletPage; import ellpeck.actuallyadditions.booklet.page.BookletPage;
import ellpeck.actuallyadditions.util.CompatUtil;
import ellpeck.actuallyadditions.util.ItemUtil; import ellpeck.actuallyadditions.util.ItemUtil;
import ellpeck.actuallyadditions.util.StringUtil; import ellpeck.actuallyadditions.util.StringUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -30,7 +28,6 @@ public class NeiScreenEvents{
private static final int NEI_BUTTON_ID = 123782; private static final int NEI_BUTTON_ID = 123782;
private GuiBooklet.TexturedButton neiButton; private GuiBooklet.TexturedButton neiButton;
@Optional.Method(modid = CompatUtil.NEI_MOD_ID)
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@SubscribeEvent @SubscribeEvent
public void onInitGuiForNEI(GuiScreenEvent.InitGuiEvent event){ public void onInitGuiForNEI(GuiScreenEvent.InitGuiEvent event){
@ -53,11 +50,11 @@ public class NeiScreenEvents{
}; };
event.buttonList.add(this.neiButton); event.buttonList.add(this.neiButton);
this.neiButton.visible = theGui.getCurrentRecipeHandlers().get(theGui.recipetype) instanceof INeiRecipeHandler; IRecipeHandler handler = theGui.getCurrentRecipeHandlers().get(theGui.recipetype);
this.neiButton.visible = handler instanceof INeiRecipeHandler && ((INeiRecipeHandler)handler).getStackForInfo() != null;
} }
} }
@Optional.Method(modid = CompatUtil.NEI_MOD_ID)
@SubscribeEvent @SubscribeEvent
public void guiPostAction(GuiScreenEvent.ActionPerformedEvent.Post event){ public void guiPostAction(GuiScreenEvent.ActionPerformedEvent.Post event){
if(this.neiButton != null && event.gui instanceof GuiRecipe){ if(this.neiButton != null && event.gui instanceof GuiRecipe){

2
src/main/java/ellpeck/actuallyadditions/util/CompatUtil.java
View file

@ -19,8 +19,6 @@ import net.minecraft.nbt.NBTTagCompound;
public class CompatUtil{ public class CompatUtil{
public static final String NEI_MOD_ID = "NotEnoughItems";
public static void registerMFRPlant(Block block){ public static void registerMFRPlant(Block block){
FMLInterModComms.sendMessage("MineFactoryReloaded", "registerHarvestable_Crop", new ItemStack(block, 1, 7)); FMLInterModComms.sendMessage("MineFactoryReloaded", "registerHarvestable_Crop", new ItemStack(block, 1, 7));