diff --git a/.gitignore b/.gitignore index 16bdc03..c791617 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,12 @@ !/MineTweaker3-MC18-Main/build.gradle /MineTweaker3-MC18-Main/bin +!/MineTweaker3-MC18-Mod-JEI +/MineTweaker3-MC18-Mod-JEI/* +!/MineTweaker3-MC18-Mod-JEI/src +!/MineTweaker3-MC18-Mod-JEI/libs +!/MineTweaker3-MC18-Mod-JEI/build.gradle + !/MineTweaker3-MC1710-Main /MineTweaker3-MC1710-Main/* diff --git a/MineTweaker3-MC18-Mod-JEI/build.gradle b/MineTweaker3-MC18-Mod-JEI/build.gradle new file mode 100644 index 0000000..249848e --- /dev/null +++ b/MineTweaker3-MC18-Mod-JEI/build.gradle @@ -0,0 +1,50 @@ +import minetweaker.tasks.RegisterZenClassesTask; + +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + } +} +apply plugin: 'net.minecraftforge.gradle.forge' + +version = "1.8.9-" + ext.mineTweakerVersion +archivesBaseName = project.projectDir.name + +minecraft { + version = forgeVersion18 + runDir = "eclipse" + mappings = "stable_20" + useDepAts = true + } +repositories { + maven { + url "http://dvs1.progwml6.com/files/maven" + } +} + +dependencies { + compile project(':ZenScript') + compile project(':MineTweaker3-API') + compile project(':MineTweaker3-MC18-Main') + deobfCompile "mezz.jei:jei_1.8.9:2.14.0.67" +} + +task makeRegistry(type: RegisterZenClassesTask) { + inputDir = file('build/classes/main') + outputDir = file('build/classes/main') + className = 'minetweaker.mods.jei.ClassRegistry' +} + +tasks.jar.dependsOn(makeRegistry) \ No newline at end of file diff --git a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java new file mode 100644 index 0000000..8b208e3 --- /dev/null +++ b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java @@ -0,0 +1,96 @@ +package minetweaker.mods.jei; + +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; + +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import stanhebben.zenscript.annotations.NotNull; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * MineTweaker JEI support. + * + * Adds support to hide Items in JEI + * + * @author Jared + */ +@ZenClass("mods.jei.JEI") +public class JEI { + /** + * Hides a specific item in NEI. Will take into account metadata values, if + * any. + * + * @param item + * item to be hidden + */ + @ZenMethod + public static void hide(@NotNull IItemStack item) { + MineTweakerAPI.apply(new JEIHideItemAction(item)); + } + + private static class JEIHideItemAction implements IUndoableAction { + private final IItemStack stack; + + public JEIHideItemAction(IItemStack stack) { + this.stack = stack; + } + + @Override + public void apply() { + JEIAddonPlugin.jeiHelpers.getItemBlacklist().addItemToBlacklist(getItemStack(stack)); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + JEIAddonPlugin.jeiHelpers.getItemBlacklist().removeItemFromBlacklist(getItemStack(stack)); + } + + @Override + public String describe() { + return "Hiding " + stack + " in JEI"; + } + + @Override + public String describeUndo() { + return "Displaying " + stack + " in JEI"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + // private static class NEIOverrideNameAction extends OneWayAction { + // private final ItemStack item; + // private final String name; + // + // public NEIOverrideNameAction(ItemStack item, String name) { + // this.item = item; + // this.name = name; + // } + // + // @Override + // public void apply() { + // API.setOverrideName(item, name); + // } + // + // @Override + // public String describe() { + // return "Overriding NEI item name of " + item.getUnlocalizedName() + " to + // " + name; + // } + // + // @Override + // public Object getOverrideKey() { + // return item; + // } + // } +} diff --git a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java new file mode 100644 index 0000000..b3a0c1d --- /dev/null +++ b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java @@ -0,0 +1,50 @@ +package minetweaker.mods.jei; + +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import minetweaker.MineTweakerAPI; +import net.minecraft.util.ChatComponentText; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.CommandEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@mezz.jei.api.JEIPlugin +public class JEIAddonPlugin implements IModPlugin { + + public static IJeiHelpers jeiHelpers; + public static IItemRegistry itemRegistry; + public static IRecipeRegistry recipeRegistry; + + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { + this.jeiHelpers = jeiHelpers; + } + + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) { + this.itemRegistry = itemRegistry; + } + + @Override + public void register(IModRegistry registry) { + FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void command(CommandEvent e) { + if (e.command.getCommandAliases().contains("mt") && e.parameters[0].equals("reload")) { + jeiHelpers.reload(); + } + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { + this.recipeRegistry = recipeRegistry; + } + +} diff --git a/configuration.gradle b/configuration.gradle index d218b12..d135b8e 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -29,8 +29,8 @@ ext.projects1710 = [ ext.forgeVersion18 = "1.8.9-11.15.1.1875" ext.projects18 = [ - 'MineTweaker3-MC18-Main' - //'MineTweaker3-MC18-Mod-JEI' + 'MineTweaker3-MC18-Main', + 'MineTweaker3-MC18-Mod-JEI' ] // ####################