Add some more tooltips and JEI description pages

This commit is contained in:
mezz committed 2016-08-16 16:50:00 -07:00
1 parent 2031f7fe02
commit 9f171977bb
9 files changed
+224 -40

No files matched your search

@@ -2,13 +2,13 @@ package forestry.apiculture.compat;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import forestry.api.apiculture.BeeManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.apiculture.PluginApiculture;
import forestry.apiculture.items.ItemRegistryApiculture;
import forestry.core.genetics.Genome;
import forestry.core.utils.JeiUtil;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.ISubtypeRegistry;
@@ -19,29 +19,31 @@ import net.minecraft.item.ItemStack;
public class ApicultureJeiPlugin extends BlankModPlugin {
@Override
public void register(@Nonnull IModRegistry registry) {
List<ItemStack> frames = Arrays.asList(
new ItemStack(PluginApiculture.items.frameImpregnated),
new ItemStack(PluginApiculture.items.frameProven),
new ItemStack(PluginApiculture.items.frameUntreated)
ItemRegistryApiculture items = PluginApiculture.items;
JeiUtil.addDescription(registry, "frames",
items.frameImpregnated,
items.frameProven,
items.frameUntreated
);
registry.addDescription(frames, "for.jei.description.frames");
List<ItemStack> apiaristSuit = Arrays.asList(
new ItemStack(PluginApiculture.items.apiaristBoots),
new ItemStack(PluginApiculture.items.apiaristChest),
new ItemStack(PluginApiculture.items.apiaristHat),
new ItemStack(PluginApiculture.items.apiaristLegs)
JeiUtil.addDescription(registry, "apiarist.suit",
items.apiaristBoots,
items.apiaristChest,
items.apiaristHat,
items.apiaristLegs
);
registry.addDescription(apiaristSuit, "for.jei.description.apiarist.suit");
registry.addDescription(new ItemStack(PluginApiculture.items.habitatLocator), "for.jei.description.habitat.locator");
registry.addDescription(new ItemStack(PluginApiculture.items.scoop), "for.jei.description.scoop");
JeiUtil.addDescription(registry,
items.habitatLocator,
items.scoop,
items.imprinter
);
ISubtypeRegistry subtypeRegistry = registry.getJeiHelpers().getSubtypeRegistry();
subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeDroneGE, BeeSubtypeInterpreter.INSTANCE);
subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beePrincessGE, BeeSubtypeInterpreter.INSTANCE);
subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeQueenGE, BeeSubtypeInterpreter.INSTANCE);
subtypeRegistry.registerNbtInterpreter(items.beeDroneGE, BeeSubtypeInterpreter.INSTANCE);
subtypeRegistry.registerNbtInterpreter(items.beePrincessGE, BeeSubtypeInterpreter.INSTANCE);
subtypeRegistry.registerNbtInterpreter(items.beeQueenGE, BeeSubtypeInterpreter.INSTANCE);
}
private static class BeeSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter {
@@ -0,0 +1,23 @@
package forestry.arboriculture.compat;
import javax.annotation.Nonnull;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.items.ItemRegistryArboriculture;
import forestry.core.utils.JeiUtil;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
@JEIPlugin
public class ArboricultureJeiPlugin extends BlankModPlugin {
@Override
public void register(@Nonnull IModRegistry registry) {
ItemRegistryArboriculture items = PluginArboriculture.items;
JeiUtil.addDescription(registry,
items.grafter,
items.grafterProven
);
}
}
@@ -0,0 +1,42 @@
package forestry.core.utils;
import mezz.jei.api.IModRegistry;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class JeiUtil {
public static void addDescription(IModRegistry registry, String itemKey, Item... items) {
for (Item item : items) {
addDescription(registry, item, itemKey);
}
}
public static void addDescription(IModRegistry registry, Block... blocks) {
for (Block block : blocks) {
Item item = Item.getItemFromBlock(block);
if (item != null) {
addDescription(registry, item);
} else {
Log.error("No item for block {}", block);
}
}
}
public static void addDescription(IModRegistry registry, Item... items) {
for (Item item : items) {
addDescription(registry, item);
}
}
public static void addDescription(IModRegistry registry, Item item) {
String resourcePath = item.getRegistryName().getResourcePath();
addDescription(registry, item, resourcePath);
}
public static void addDescription(IModRegistry registry, Item item, String itemKey) {
ItemStack itemStack = new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE);
registry.addDescription(itemStack, "for.jei.description." + itemKey);
}
}
@@ -2,14 +2,14 @@ package forestry.factory.recipes.jei;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.awt.Rectangle;
import java.awt.*;
import java.util.List;
import net.minecraft.item.ItemStack;
import forestry.core.gui.GuiForestry;
import forestry.core.recipes.jei.ForestryRecipeCategoryUid;
import forestry.core.utils.JeiUtil;
import forestry.factory.PluginFactory;
import forestry.factory.blocks.BlockRegistryFactory;
import forestry.factory.gui.GuiBottler;
import forestry.factory.gui.GuiCarpenter;
import forestry.factory.gui.GuiCentrifuge;
@@ -47,7 +47,6 @@ import forestry.factory.recipes.jei.squeezer.SqueezerRecipeWrapper;
import forestry.factory.recipes.jei.still.StillRecipeCategory;
import forestry.factory.recipes.jei.still.StillRecipeHandler;
import forestry.factory.recipes.jei.still.StillRecipeMaker;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@@ -55,6 +54,7 @@ import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.gui.IAdvancedGuiHandler;
import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
import net.minecraft.item.ItemStack;
@JEIPlugin
public class FactoryJeiPlugin extends BlankModPlugin {
@@ -108,20 +108,27 @@ public class FactoryJeiPlugin extends BlankModPlugin {
registry.addRecipeClickArea(GuiSqueezer.class, 76, 41, 43, 16, ForestryRecipeCategoryUid.SQUEEZER);
registry.addRecipeClickArea(GuiStill.class, 73, 17, 33, 57, ForestryRecipeCategoryUid.STILL);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.bottler), ForestryRecipeCategoryUid.BOTTLER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.carpenter), ForestryRecipeCategoryUid.CARPENTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.centrifuge), ForestryRecipeCategoryUid.CENTRIFUGE);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.fabricator), ForestryRecipeCategoryUid.FABRICATOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.fermenter), ForestryRecipeCategoryUid.FERMENTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.moistener), ForestryRecipeCategoryUid.MOISTENER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.rainmaker), ForestryRecipeCategoryUid.RAINMAKER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.squeezer), ForestryRecipeCategoryUid.SQUEEZER);
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginFactory.blocks.still), ForestryRecipeCategoryUid.STILL);
BlockRegistryFactory blocks = PluginFactory.blocks;
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.bottler), ForestryRecipeCategoryUid.BOTTLER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.carpenter), ForestryRecipeCategoryUid.CARPENTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.centrifuge), ForestryRecipeCategoryUid.CENTRIFUGE);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.fabricator), ForestryRecipeCategoryUid.FABRICATOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.fermenter), ForestryRecipeCategoryUid.FERMENTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.moistener), ForestryRecipeCategoryUid.MOISTENER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.rainmaker), ForestryRecipeCategoryUid.RAINMAKER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.squeezer), ForestryRecipeCategoryUid.SQUEEZER);
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.still), ForestryRecipeCategoryUid.STILL);
IRecipeTransferRegistry transferRegistry = registry.getRecipeTransferRegistry();
transferRegistry.addRecipeTransferHandler(new WorktableRecipeTransferHandler());
registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler());
JeiUtil.addDescription(registry,
blocks.raintank,
blocks.worktable
);
}
private static class ForestryAdvancedGuiHandler implements IAdvancedGuiHandler<GuiForestry> {
@@ -0,0 +1,21 @@
package forestry.food.compat;
import javax.annotation.Nonnull;
import forestry.core.utils.JeiUtil;
import forestry.food.PluginFood;
import forestry.food.items.ItemRegistryFood;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
@JEIPlugin
public class FoodJeiPlugin extends BlankModPlugin {
@Override
public void register(@Nonnull IModRegistry registry) {
ItemRegistryFood items = PluginFood.items;
JeiUtil.addDescription(registry,
items.infuser
);
}
}
@@ -0,0 +1,23 @@
package forestry.mail.compat;
import javax.annotation.Nonnull;
import forestry.core.utils.JeiUtil;
import forestry.mail.PluginMail;
import forestry.mail.blocks.BlockRegistryMail;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
@JEIPlugin
public class MailJeiPlugin extends BlankModPlugin {
@Override
public void register(@Nonnull IModRegistry registry) {
BlockRegistryMail blocks = PluginMail.blocks;
JeiUtil.addDescription(registry,
blocks.mailbox,
blocks.stampCollector,
blocks.tradeStation
);
}
}
@@ -4,16 +4,16 @@ import javax.annotation.Nonnull;
import java.util.List;
import forestry.core.PluginCore;
import net.minecraft.item.ItemStack;
import forestry.core.blocks.BlockRegistryCore;
import forestry.core.items.ItemRegistryCore;
import forestry.core.utils.JeiUtil;
import forestry.plugins.PluginManager;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IItemBlacklist;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraft.item.ItemStack;
@JEIPlugin
public class ForestryJeiPlugin extends BlankModPlugin {
@@ -26,8 +26,24 @@ public class ForestryJeiPlugin extends BlankModPlugin {
itemBlacklist.addItemToBlacklist(hiddenItem);
}
registry.addDescription(new ItemStack(PluginCore.items.solderingIron), "item.for.solderingIron.description");
registry.addDescription(new ItemStack(PluginCore.items.circuitboards, 1, OreDictionary.WILDCARD_VALUE), "item.for.circuitboard.description");
registry.addDescription(new ItemStack(PluginCore.items.tubes, 1, OreDictionary.WILDCARD_VALUE), "item.for.thermionicTubes.description");
ItemRegistryCore items = PluginCore.items;
JeiUtil.addDescription(registry,
items.solderingIron,
items.circuitboards,
items.tubes,
items.pipette,
items.kitPickaxe,
items.kitShovel,
items.fertilizerCompound
);
BlockRegistryCore blocks = PluginCore.blocks;
JeiUtil.addDescription(registry,
blocks.analyzer,
blocks.bogEarth,
blocks.escritoire,
blocks.humus
);
}
}
@@ -0,0 +1,50 @@
package forestry.storage.compat;
import javax.annotation.Nonnull;
import forestry.core.utils.JeiUtil;
import forestry.mail.PluginMail;
import forestry.mail.blocks.BlockRegistryMail;
import forestry.mail.items.ItemRegistryMail;
import forestry.storage.PluginStorage;
import forestry.storage.items.ItemRegistryStorage;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
@JEIPlugin
public class StorageJeiPlugin extends BlankModPlugin {
@Override
public void register(@Nonnull IModRegistry registry) {
ItemRegistryStorage items = PluginStorage.items;
JeiUtil.addDescription(registry, "minerBag",
items.minerBackpack,
items.minerBackpackT2
);
JeiUtil.addDescription(registry, "diggerBag",
items.diggerBackpack,
items.diggerBackpackT2
);
JeiUtil.addDescription(registry, "foresterBag",
items.foresterBackpack,
items.foresterBackpackT2
);
JeiUtil.addDescription(registry, "hunter",
items.hunterBackpack,
items.hunterBackpackT2
);
JeiUtil.addDescription(registry, "adventurerBag",
items.adventurerBackpack,
items.adventurerBackpackT2
);
JeiUtil.addDescription(registry, "builderBag",
items.builderBackpack,
items.builderBackpackT2
);
JeiUtil.addDescription(registry,
items.apiaristBackpack,
items.lepidopteristBackpack
);
}
}