mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 04:22:32 +00:00
Update JEI integration
This commit is contained in:
1 parent
a3c79c0427
commit
3a51df154a
7 files changed
+44
-23
No files matched your search
@@ -51,12 +51,12 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
*/
|
||||
@Mod(
|
||||
modid = Constants.MOD_ID,
|
||||
name = "Forestry",
|
||||
name = Constants.MOD_NAME,
|
||||
version = Constants.VERSION,
|
||||
guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
|
||||
acceptedMinecraftVersions = "[1.11]",
|
||||
dependencies = "required-after:forge@[13.20.0.2270,);"
|
||||
+ "after:JEI@[4.3.0,);"
|
||||
+ "after:JEI@[4.5.0,);"
|
||||
+ "after:" + PluginIC2.modId + ";")
|
||||
public class Forestry {
|
||||
|
||||
|
||||
@@ -7,20 +7,25 @@ import mezz.jei.api.BlankModPlugin;
|
||||
import mezz.jei.api.IGuiHelper;
|
||||
import mezz.jei.api.IModRegistry;
|
||||
import mezz.jei.api.JEIPlugin;
|
||||
import mezz.jei.api.recipe.IRecipeCategoryRegistration;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@JEIPlugin
|
||||
public class CharcoalJeiPlugin extends BlankModPlugin {
|
||||
|
||||
public static final String RECIPE_UID = "forestry.charcoal.pile";
|
||||
|
||||
|
||||
@Override
|
||||
public void registerCategories(IRecipeCategoryRegistration registry) {
|
||||
IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper();
|
||||
registry.addRecipeCategories(new CharcoalPileWallCategory(guiHelper));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper();
|
||||
registry.addRecipeCategories(new CharcoalPileWallCategory(guiHelper));
|
||||
registry.handleRecipes(CharcoalPileWall.class, CharcoalPileWallWrapper::new, RECIPE_UID);
|
||||
registry.addRecipes(TreeManager.pileWalls, RECIPE_UID);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(PluginArboriculture.getBlocks().woodPile), RECIPE_UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(PluginArboriculture.getBlocks().woodPile), RECIPE_UID);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class Constants implements IForestryConstants {
|
||||
// System
|
||||
public static final String MOD_NAME = "Forestry";
|
||||
public static final String MOD_ID = "forestry";
|
||||
public static final String URL = "http://forestry.sengir.net/";
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package forestry.core.recipes.jei;
|
||||
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.utils.Translator;
|
||||
import mezz.jei.api.gui.IDrawable;
|
||||
import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||
@@ -19,6 +20,11 @@ public abstract class ForestryRecipeCategory<T extends IRecipeWrapper> extends B
|
||||
return localizedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModName() {
|
||||
return Constants.MOD_NAME;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDrawable getBackground() {
|
||||
return background;
|
||||
|
||||
@@ -17,7 +17,7 @@ public class JeiUtil {
|
||||
itemStacks.add(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
|
||||
registry.addDescription(itemStacks, "for.jei.description." + itemKey);
|
||||
registry.addIngredientInfo(itemStacks, ItemStack.class, "for.jei.description." + itemKey);
|
||||
}
|
||||
|
||||
public static void addDescription(IModRegistry registry, Block... blocks) {
|
||||
@@ -44,6 +44,6 @@ public class JeiUtil {
|
||||
|
||||
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);
|
||||
registry.addIngredientInfo(itemStack, ItemStack.class, "for.jei.description." + itemKey);
|
||||
}
|
||||
}
|
||||
@@ -46,6 +46,7 @@ import mezz.jei.api.IJeiHelpers;
|
||||
import mezz.jei.api.IModRegistry;
|
||||
import mezz.jei.api.JEIPlugin;
|
||||
import mezz.jei.api.gui.BlankAdvancedGuiHandler;
|
||||
import mezz.jei.api.recipe.IRecipeCategoryRegistration;
|
||||
import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
|
||||
import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -59,10 +60,8 @@ public class FactoryJeiPlugin extends BlankModPlugin {
|
||||
public static IJeiHelpers jeiHelpers;
|
||||
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler());
|
||||
|
||||
if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){
|
||||
public void registerCategories(IRecipeCategoryRegistration registry) {
|
||||
if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -80,6 +79,16 @@ public class FactoryJeiPlugin extends BlankModPlugin {
|
||||
new SqueezerRecipeCategory(guiHelper),
|
||||
new StillRecipeCategory(guiHelper)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler());
|
||||
|
||||
if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){
|
||||
return;
|
||||
}
|
||||
jeiHelpers = registry.getJeiHelpers();
|
||||
|
||||
registry.addRecipes(BottlerRecipeMaker.getBottlerRecipes(registry.getIngredientRegistry()), ForestryRecipeCategoryUid.BOTTLER);
|
||||
registry.addRecipes(CarpenterRecipeMaker.getCarpenterRecipes(), ForestryRecipeCategoryUid.CARPENTER);
|
||||
@@ -106,16 +115,16 @@ public class FactoryJeiPlugin extends BlankModPlugin {
|
||||
BlockRegistryFactory blocks = PluginFactory.getBlocks();
|
||||
Preconditions.checkNotNull(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);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(blocks.worktable), VanillaRecipeCategoryUid.CRAFTING);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.bottler), ForestryRecipeCategoryUid.BOTTLER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.carpenter), ForestryRecipeCategoryUid.CARPENTER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.centrifuge), ForestryRecipeCategoryUid.CENTRIFUGE);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.fabricator), ForestryRecipeCategoryUid.FABRICATOR);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.fermenter), ForestryRecipeCategoryUid.FERMENTER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.moistener), ForestryRecipeCategoryUid.MOISTENER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.rainmaker), ForestryRecipeCategoryUid.RAINMAKER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.squeezer), ForestryRecipeCategoryUid.SQUEEZER);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.still), ForestryRecipeCategoryUid.STILL);
|
||||
registry.addRecipeCatalyst(new ItemStack(blocks.worktable), VanillaRecipeCategoryUid.CRAFTING);
|
||||
|
||||
IRecipeTransferRegistry transferRegistry = registry.getRecipeTransferRegistry();
|
||||
transferRegistry.addRecipeTransferHandler(new WorktableRecipeTransferHandler(), VanillaRecipeCategoryUid.CRAFTING);
|
||||
|
||||
Reference in new issue
Block a user