Empowerer Plugin

port.MD

@@ -10,9 +10,9 @@
 - [x] ESDs
 - [ ] Fishing nets
 - [ ] Solar panels
-- [ ] Item repairers
+- [X] Item repairers
 - [x] Knife (food can just be crafted normally)
-- [ ] Black lotuses and black dye
+- [X] Black lotuses and black dye
 - [ ] Chest to storage crate upgrade (makes little sense with the way they are being changed), keep the other ones though
 - [x] Ring of liquid banning
 - [x] Emerald and obsidian armor and tools

src/generated/resources/.cache/cache

@@ -576,6 +576,7 @@ f44b900f61f7210d15533c2e757395c3d767e21b data/actuallyadditions/loot_tables/bloc
 069aca316e282ab12ad8ddbcfa3c389f1a13d673 data/actuallyadditions/loot_tables/blocks/wood_casing.json
 218c99fd547620a1e6ee186d427dca486212eae0 data/actuallyadditions/loot_tables/blocks/xp_solidifier.json
 64711e28d6fb7579f1ba2fed4a46440e213a2fac data/actuallyadditions/recipes/advanced_coil.json
+d2666ce077d5892a3bffde70ddf53492ec876900 data/actuallyadditions/recipes/advanced_leaf_blower.json
 a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json
 3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json
 a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json
@@ -720,6 +721,7 @@ e088aee52db067c15c72bfe743ac106b98ca4be2 data/actuallyadditions/recipes/colorcha
 11ddd815c96912369ee0d96fe719d5958370ed3c data/actuallyadditions/recipes/colorchange/yellow_stained_glass_pane.json
 a4fb51f83c38bfebceeadde885d59632e355bf6d data/actuallyadditions/recipes/colorchange/yellow_terracotta.json
 ca4f8d37d115eac5889542b04d1c01cd2e0cde43 data/actuallyadditions/recipes/colorchange/yellow_wool.json
+6a7cf2e5eb1fd134328a182b8001fdf0e622c94a data/actuallyadditions/recipes/crafter_on_a_stick.json
 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json
 341c5816febc417a36e516986f6d1461cf38cfed data/actuallyadditions/recipes/crushing/bone_crusher.json
 293cecfa94d22e62bd817a3964e82dca4479d44d data/actuallyadditions/recipes/diamond_aiot.json
@@ -750,6 +752,7 @@ db1b6e924352a7e097a5675bbf2a27888c6cbded data/actuallyadditions/recipes/empoweri
 1b59c946f4cfbfc9bc3a2e7562105cd3a0d09d69 data/actuallyadditions/recipes/empowering/restonia_block.json
 74a9dc2b89805e5c232fa66da8db8e96af0b0703 data/actuallyadditions/recipes/empowering/void.json
 d112aa7267600c2a55f5efb617cb574aaa56502e data/actuallyadditions/recipes/empowering/void_block.json
+d7205e0d7796bdcdf7280117c821ec5c6c6d8fee data/actuallyadditions/recipes/empty_cup.json
 7306e280d2cb9ef47fe1cf43a2a289752a09a488 data/actuallyadditions/recipes/ender_casing.json
 3ade772cd50a533137dc1d27a2b060b85e525d8a data/actuallyadditions/recipes/engineers_goggles.json
 f2c63622c99c5ff552e5ce408956d3fe40582e43 data/actuallyadditions/recipes/engineers_goggles_advanced.json
@@ -822,13 +825,16 @@ a37d681793afbdafb245885ab96713ce3cba988d data/actuallyadditions/recipes/miningle
 ccdc4ab92dc7c0aae4de1566435ef5d701e14934 data/actuallyadditions/recipes/mininglens/stone_lapis_ore.json
 7d99d73a12a25056891a68a73cc4b93ce622e46a data/actuallyadditions/recipes/mininglens/stone_redstone_ore.json
 7821b149dc37caa85b587a0276307f1b5cefaa03 data/actuallyadditions/recipes/netherite_aiot.json
-4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_connector.json
+4590b472dcb90700ea525a3c6ac3f325458fab19 data/actuallyadditions/recipes/phantom_clearing.json
+2fbfcfa1d6330b9585a1eb1ffd4bedaf67754120 data/actuallyadditions/recipes/phantom_connector.json
+68e330f212e20f2d0b46190d06d8f4ae3b0e6271 data/actuallyadditions/recipes/player_probe.json
 6a1050a9aaadea6d3961b7e77ee17880404a56e0 data/actuallyadditions/recipes/pressing/canola.json
 68e7d4bd5e6ea852ef57ff5032d922a9a703fd77 data/actuallyadditions/recipes/quadruple_battery.json
 6797b2f74af9eb67a8ea6bdfa198cab7052db2a0 data/actuallyadditions/recipes/quintuple_battery.json
 70fc9365035ac3642771f921513990c88618de8f data/actuallyadditions/recipes/rice_seeds.json
 5b104e2c32eafdf802743d0e8d4c1a7e14071668 data/actuallyadditions/recipes/rice_slime.json
 85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json
+77a4b16cceff940cbf18b49fab9a97d4aa8eef7d data/actuallyadditions/recipes/ring_of_growth.json
 469f920b7b32f5d29c435cb73cec09776c882c3d data/actuallyadditions/recipes/ring_of_magnetizing.json
 d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json
 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json

src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " F",
+    "DP",
+    "DC"
+  ],
+  "key": {
+    "F": {
+      "item": "minecraft:flint"
+    },
+    "D": {
+      "item": "actuallyadditions:diamatine_crystal"
+    },
+    "P": {
+      "item": "minecraft:piston"
+    },
+    "C": {
+      "item": "actuallyadditions:advanced_coil"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:advanced_leaf_blower"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/crafter_on_a_stick.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:crafting_table"
+    },
+    {
+      "tag": "minecraft:signs"
+    }
+  ],
+  "result": {
+    "item": "actuallyadditions:crafter_on_a_stick"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/empty_cup.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "S S",
+    "SCS",
+    "SSS"
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:stone"
+    },
+    "C": {
+      "item": "actuallyadditions:coffee_beans"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:empty_cup"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/phantom_clearing.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "actuallyadditions:phantom_connector"
+    }
+  ],
+  "result": {
+    "item": "actuallyadditions:phantom_connector"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/phantom_connector.json

@@ -1,10 +1,21 @@
 {
-  "type": "minecraft:crafting_shapeless",
+  "type": "minecraft:crafting_shaped",
-  "ingredients": [
+  "pattern": [
-    {
+    "YE",
-      "item": "actuallyadditions:phantom_connector"
+    "EY",
-    }
+    "S "
   ],
+  "key": {
+    "Y": {
+      "item": "minecraft:ender_eye"
+    },
+    "E": {
+      "tag": "forge:ender_pearls"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
   "result": {
     "item": "actuallyadditions:phantom_connector"
   }

src/generated/resources/data/actuallyadditions/recipes/player_probe.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "A A",
+    "AIA",
+    "RHR"
+  ],
+  "key": {
+    "A": {
+      "item": "minecraft:iron_bars"
+    },
+    "R": {
+      "item": "actuallyadditions:empowered_restonia_crystal"
+    },
+    "H": {
+      "item": "minecraft:wither_skeleton_skull"
+    },
+    "I": {
+      "item": "minecraft:iron_helmet"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:player_probe"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/ring_of_growth.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SIS",
+    "IOI",
+    "SIS"
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:seeds"
+    },
+    "I": {
+      "item": "actuallyadditions:empowered_enori_crystal"
+    },
+    "O": {
+      "item": "actuallyadditions:ring"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:ring_of_growth"
+  }
+}

src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java

@@ -113,7 +113,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
 
         //Clearing NBT Storage
         Recipe.shapeless(ActuallyItems.LASER_WRENCH.get()).ingredients(ActuallyItems.LASER_WRENCH.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "laser_wrench_nbt")).save(consumer);
-        Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).save(consumer);
+        Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "phantom_clearing")).save(consumer);
 
         //Disenchanting Lens
         Recipe.shapeless(ActuallyItems.LENS_OF_DISENCHANTING.get())
@@ -206,6 +206,14 @@ public class ItemRecipeGenerator extends RecipeProvider {
             .define('F', Items.FLINT)
             .define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer);
 
+        //Advanced Leaf Blower
+        Recipe.shaped(ActuallyItems.ADVANCED_LEAF_BLOWER.get()).pattern(" F", "DP", "DC")
+                .define('F', Items.FLINT)
+                .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
+                .define('P', Items.PISTON)
+                .define('C', ActuallyItems.ADVANCED_COIL.get())
+                .save(consumer);
+
         //Drill //TODO the rest of the coloring recipes
         Recipe.shaped(ActuallyItems.DRILL_MAIN.get())
             .pattern("DDD")
@@ -401,12 +409,16 @@ public class ItemRecipeGenerator extends RecipeProvider {
                 .define('O', ActuallyItems.RING.get())
                 .save(consumer);
 
+        //Growth Ring
+        Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get())
+                .pattern("SIS", "IOI", "SIS")
+                .define('S', Tags.Items.SEEDS)
+                .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get())
+                .define('O', ActuallyItems.RING.get())
+                .save(consumer);
+
         Recipe.shapeless(ActuallyItems.CRAFTER_ON_A_STICK.get()).requires(Items.CRAFTING_TABLE).requires(ItemTags.SIGNS).save(consumer);
 
-
-
-
-
         ConditionalRecipe.builder()
                 .addCondition(new BoolConfigCondition("tinyCoalStuff"))
                 .addRecipe(
@@ -443,33 +455,32 @@ public class ItemRecipeGenerator extends RecipeProvider {
                 .requires(ActuallyItems.RICE.get())
                 .save(consumer);
 
+        //Cup
+        Recipe.shaped(ActuallyItems.EMPTY_CUP.get())
+                .pattern("S S", "SCS", "SSS")
+                .define('S', Tags.Items.STONE)
+                .define('C', ActuallyItems.COFFEE_BEANS.get())
+                .save(consumer);
 
+        //Phantom Connector
+        Recipe.shaped(ActuallyItems.PHANTOM_CONNECTOR.get())
+                .pattern("YE", "EY", "S ")
+                .define('Y', Items.ENDER_EYE)
+                .define('E', Tags.Items.ENDER_PEARLS)
+                .define('S', Tags.Items.RODS_WOODEN)
+                .save(consumer);
+
+        //Player Probe
+        Recipe.shaped(ActuallyItems.PLAYER_PROBE.get())
+                .pattern("A A", "AIA", "RHR")
+                .define('A', Items.IRON_BARS)
+                .define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get())
+                .define('H', Items.WITHER_SKELETON_SKULL)
+                .define('I', Items.IRON_HELMET)
+                .save(consumer);
 
-        //        //Growth Ring
-        //        RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemGrowthRing), "SIS", "IOI", "SIS", 'S', new ItemStack(Items.WHEAT_SEEDS), 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()));
-        //        recipeGrowthRing = RecipeUtil.lastIRecipe();
-        //
-        //        //Cup
-        //        RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()), "S S", "SCS", "SSS", 'S', "stone", 'C', "cropCoffee");
-        //        recipeCup = RecipeUtil.lastIRecipe();
-        //        //Advanced Leaf Blower
-        //        RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemLeafBlowerAdvanced), " F", "DP", "DC", 'F', new ItemStack(Items.FLINT), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'P', new ItemStack(Blocks.PISTON), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()));
-        //        recipeLeafBlowerAdvanced = RecipeUtil.lastIRecipe();
-        //
-        //        //Phantom Connector
-        //        RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemPhantomConnector), "YE", "EY", "S ", 'Y', Items.ENDER_EYE, 'E', Items.ENDER_PEARL, 'S', "stickWood");
-        //        recipePhantomConnector = RecipeUtil.lastIRecipe();
-        //
-        //        //Player Probe
-        //        RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemPlayerProbe), "A A", "AIA", "RHR", 'A', new ItemStack(Blocks.IRON_BARS), 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'H', new ItemStack(Items.SKULL, 1, 1), 'I', new ItemStack(Items.IRON_HELMET));
-        //        recipePlayerProbe = RecipeUtil.lastIRecipe();
-        //
         //        //Quartz
         //        GameRegistry.addSmelting(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 1F);
-        //
-        //        //Knife
-        //        RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemKnife), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()));
-        //        recipeKnife = RecipeUtil.lastIRecipe();
 
         //        //Ingots from Dusts
         //        GameRegistry.addSmelting(new ItemStack(InitItems.itemDust, 1, TheDusts.IRON.ordinal()), new ItemStack(Items.IRON_INGOT), 1F);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java

@@ -1,67 +0,0 @@
-// TODO: [port] no longer used
-///*
-// * This file ("BlockItemRepairer.java") is part of the Actually Additions mod for Minecraft.
-// * It is created and owned by Ellpeck and distributed
-// * under the Actually Additions License to be found at
-// * http://ellpeck.de/actaddlicense
-// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
-// *
-// * © 2015-2017 Ellpeck
-// */
-//
-//package de.ellpeck.actuallyadditions.mod.blocks;
-//
-//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
-//import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
-//import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-//import net.minecraft.block.SoundType;
-//import net.minecraft.block.material.Material;
-//import net.minecraft.entity.player.PlayerEntity;
-//import net.minecraft.item.EnumRarity;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.tileentity.TileEntity;
-//import net.minecraft.util.Hand;
-//import net.minecraft.util.math.BlockPos;
-//import net.minecraft.world.IBlockAccess;
-//import net.minecraft.world.World;
-//
-//public class BlockItemRepairer extends BlockContainerBase {
-//
-//    public BlockItemRepairer() {
-//        super(Material.ROCK, this.name);
-//        this.setHarvestLevel("pickaxe", 0);
-//        this.setHardness(20.0F);
-//        this.setResistance(15.0F);
-//        this.setSoundType(SoundType.STONE);
-//        this.setTickRandomly(true);
-//    }
-//
-//    @Override
-//    public TileEntity createNewTileEntity(IBlockReader worldIn) {
-//        return new TileEntityItemRepairer();
-//    }
-//
-//    @Override
-//    public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
-//        if (!world.isRemote) {
-//            TileEntityItemRepairer repairer = (TileEntityItemRepairer) world.getTileEntity(pos);
-//            if (repairer != null) {
-//                player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.REPAIRER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
-//            }
-//            return true;
-//        }
-//        return true;
-//    }
-//
-//    @Override
-//    public int getLightValue(BlockState state, IBlockAccess world, BlockPos pos) {
-//        return this.getMetaFromState(state) == 1
-//            ? 12
-//            : 0;
-//    }
-//
-//    @Override
-//    public EnumRarity getRarity(ItemStack stack) {
-//        return EnumRarity.EPIC;
-//    }
-//}

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LaserRecipe.java

@@ -47,6 +47,10 @@ public class LaserRecipe implements IRecipe<IInventory> {
         return itemIngredient.test(itemStack);
     }
 
+    public Ingredient getInput() {
+        return itemIngredient;
+    }
+
     //nah
     @Override
     public boolean matches(IInventory pInv, World pLevel) {

src/main/java/de/ellpeck/actuallyadditions/mod/jei/EmpowererRecipeCategory.java

@@ -0,0 +1,97 @@
+/*
+ * This file ("EmpowererRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2017 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.mod.jei;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.crafting.EmpowererRecipe;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.drawable.IDrawableStatic;
+import mezz.jei.api.helpers.IGuiHelper;
+import mezz.jei.api.ingredients.IIngredients;
+import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class EmpowererRecipeCategory implements IRecipeCategory<EmpowererRecipe> {
+
+    public static final ResourceLocation ID = new ResourceLocation(ActuallyAdditions.MODID, "empowerer_jei");
+
+    private final IDrawableStatic background;
+
+    public EmpowererRecipeCategory(IGuiHelper helper) {
+        this.background = helper.drawableBuilder(AssetUtil.getGuiLocation("gui_nei_empowerer"), 0, 0, 135, 80).setTextureSize(256,256).build();
+    }
+
+    @Override
+    public ResourceLocation getUid() {
+        return ID;
+    }
+
+    @Override
+    public Class<? extends EmpowererRecipe> getRecipeClass() {
+        return EmpowererRecipe.class;
+    }
+
+    @Override
+    public String getTitle() {
+        return I18n.get("container.actuallyadditions.empowerer");
+    }
+
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public IDrawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public void setIngredients(EmpowererRecipe empowererRecipe, IIngredients ingredients) {
+        ArrayList<ItemStack> input = new ArrayList<>();
+        input.addAll(Arrays.asList(empowererRecipe.getInput().getItems()));
+        input.addAll(Arrays.asList(empowererRecipe.getStandOne().getItems()));
+        input.addAll(Arrays.asList(empowererRecipe.getStandTwo().getItems()));
+        input.addAll(Arrays.asList(empowererRecipe.getStandThree().getItems()));
+        input.addAll(Arrays.asList(empowererRecipe.getStandFour().getItems()));
+        ingredients.setInputs(VanillaTypes.ITEM, input);
+        ingredients.setOutput(VanillaTypes.ITEM, empowererRecipe.getOutput());
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, EmpowererRecipe recipe, IIngredients ingredients) {
+        recipeLayout.getItemStacks().init(0, true, 31, 31);
+        recipeLayout.getItemStacks().set(0, Arrays.asList(recipe.getInput().getItems()));
+
+        recipeLayout.getItemStacks().init(1, true, 1, 31);
+        recipeLayout.getItemStacks().set(1, Arrays.asList(recipe.getStandOne().getItems()));
+
+        recipeLayout.getItemStacks().init(2, true, 31, 1);
+        recipeLayout.getItemStacks().set(2, Arrays.asList(recipe.getStandTwo().getItems()));
+
+        recipeLayout.getItemStacks().init(3, true, 61, 31);
+        recipeLayout.getItemStacks().set(3, Arrays.asList(recipe.getStandThree().getItems()));
+
+        recipeLayout.getItemStacks().init(4, true, 31, 61);
+        recipeLayout.getItemStacks().set(4, Arrays.asList(recipe.getStandFour().getItems()));
+
+        recipeLayout.getItemStacks().init(5, false, 112, 31);
+        recipeLayout.getItemStacks().set(5, recipe.getResultItem());
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java

@@ -39,6 +39,8 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin {
         IJeiHelpers helpers = registry.getJeiHelpers();
 
         registry.addRecipeCategories(new FermentingCategory(helpers.getGuiHelper()));
+        registry.addRecipeCategories(new LaserRecipeCategory(helpers.getGuiHelper()));
+        registry.addRecipeCategories(new EmpowererRecipeCategory(helpers.getGuiHelper()));
 
         //registry.addRecipeCategories(new CoffeeMachineRecipeCategory(helpers.getGuiHelper()), new CompostRecipeCategory(helpers.getGuiHelper()), new CrusherRecipeCategory(helpers.getGuiHelper()), new ReconstructorRecipeCategory(helpers.getGuiHelper()), new EmpowererRecipeCategory(helpers.getGuiHelper()), new BookletRecipeCategory(helpers.getGuiHelper()));
     }
@@ -47,6 +49,8 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin {
     public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) {
         registry.addRecipeCatalyst(new ItemStack(ActuallyItems.CRAFTER_ON_A_STICK.get()), VanillaRecipeCategoryUid.CRAFTING);
         registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.FERMENTING_BARREL.getItem()), FermentingCategory.ID);
+        registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.getItem()), LaserRecipeCategory.ID);
+        registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.EMPOWERER.getItem()), EmpowererRecipeCategory.ID);
 
 //        registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.blockFurnaceDouble.get()), VanillaRecipeCategoryUid.SMELTING);
 //        registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.blockGrinder.get()), CrusherRecipeCategory.NAME);
@@ -63,14 +67,13 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin {
         World level = Minecraft.getInstance().level;
 
         registry.addRecipes(level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.FERMENTING), FermentingCategory.ID);
+        registry.addRecipes(level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.LASER), LaserRecipeCategory.ID);
+        registry.addRecipes(level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING), EmpowererRecipeCategory.ID);
 
 
         //registry.addRecipes(ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_OR_FLUID_DATA, BookletRecipeCategory.NAME);
         //registry.addRecipes(ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS, CoffeeMachineRecipeCategory.NAME);
         //registry.addRecipes(ActuallyAdditionsAPI.CRUSHER_RECIPES, CrusherRecipeCategory.NAME);
-        //registry.addRecipes(ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES, ReconstructorRecipeCategory.NAME);
-        //registry.addRecipes(ActuallyAdditionsAPI.EMPOWERER_RECIPES, EmpowererRecipeCategory.NAME);
-        //registry.addRecipes(ActuallyAdditionsAPI.COMPOST_RECIPES, CompostRecipeCategory.NAME);
     }
 
 //    @Override

src/main/java/de/ellpeck/actuallyadditions/mod/jei/LaserRecipeCategory.java

@@ -0,0 +1,83 @@
+/*
+ * This file ("ReconstructorRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2017 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.mod.jei;
+
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
+import de.ellpeck.actuallyadditions.mod.crafting.LaserRecipe;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.drawable.IDrawableStatic;
+import mezz.jei.api.helpers.IGuiHelper;
+import mezz.jei.api.ingredients.IIngredients;
+import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.TranslationTextComponent;
+
+import javax.annotation.Nonnull;
+import java.util.Arrays;
+
+public class LaserRecipeCategory implements IRecipeCategory<LaserRecipe> {
+
+    public static final ResourceLocation ID = new ResourceLocation(ActuallyAdditions.MODID, "laser_jei");
+    private final IDrawableStatic background;
+    private final ItemStack RECONSTRUCTOR = new ItemStack(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.getItem());
+
+    public LaserRecipeCategory(IGuiHelper helper) {
+        this.background = helper.drawableBuilder(AssetUtil.getGuiLocation("gui_nei_atomic_reconstructor"), 0, 0, 96, 60).setTextureSize(256,256).build();
+    }
+
+    @Override
+    public ResourceLocation getUid() {
+        return ID;
+    }
+
+    @Override
+    public Class<? extends LaserRecipe> getRecipeClass() {
+        return LaserRecipe.class;
+    }
+
+    @Override
+    public String getTitle() {
+        return new TranslationTextComponent("container.actuallyadditions.reconstructor").getString();
+    }
+
+    @Override
+    public IDrawable getBackground() {
+        return this.background;
+    }
+
+    @Override
+    public IDrawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public void setIngredients(LaserRecipe laserRecipe, IIngredients ingredients) {
+        ingredients.setInputs(VanillaTypes.ITEM, Arrays.asList(laserRecipe.getInput().getItems()));
+        ingredients.setOutput(VanillaTypes.ITEM, laserRecipe.getResultItem());
+    }
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout layout, @Nonnull LaserRecipe laserRecipe, @Nonnull IIngredients iIngredients) {
+        layout.getItemStacks().init(0, true, 4, 18);
+        layout.getItemStacks().set(0, iIngredients.getInputs(VanillaTypes.ITEM).get(0));
+
+        layout.getItemStacks().init(1, false, 34, 19);
+        layout.getItemStacks().set(1, RECONSTRUCTOR);
+
+        layout.getItemStacks().init(2, false, 66, 18);
+        layout.getItemStacks().set(2, iIngredients.getOutputs(VanillaTypes.ITEM).get(0));
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java

@@ -1,74 +0,0 @@
-///*
-// * This file ("EmpowererRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
-// * It is created and owned by Ellpeck and distributed
-// * under the Actually Additions License to be found at
-// * http://ellpeck.de/actaddlicense
-// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
-// *
-// * © 2015-2017 Ellpeck
-// */
-//
-//package de.ellpeck.actuallyadditions.mod.jei.empowerer;
-//
-//import java.util.Arrays;
-//
-//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
-//import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-//import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-//import mezz.jei.api.IGuiHelper;
-//import mezz.jei.api.gui.IDrawable;
-//import mezz.jei.api.gui.IRecipeLayout;
-//import mezz.jei.api.ingredients.IIngredients;
-//import mezz.jei.api.recipe.IRecipeCategory;
-//
-//public class EmpowererRecipeCategory implements IRecipeCategory<EmpowererRecipeWrapper> {
-//
-//    public static final String NAME = "actuallyadditions.empowerer";
-//
-//    private final IDrawable background;
-//
-//    public EmpowererRecipeCategory(IGuiHelper helper) {
-//        this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_empowerer"), 0, 0, 135, 80);
-//    }
-//
-//    @Override
-//    public String getUid() {
-//        return NAME;
-//    }
-//
-//    @Override
-//    public String getTitle() {
-//        return StringUtil.localize("container.nei." + NAME + ".name");
-//    }
-//
-//    @Override
-//    public String getModName() {
-//        return ActuallyAdditions.NAME;
-//    }
-//
-//    @Override
-//    public IDrawable getBackground() {
-//        return this.background;
-//    }
-//
-//    @Override
-//    public void setRecipe(IRecipeLayout recipeLayout, EmpowererRecipeWrapper wrapper, IIngredients ingredients) {
-//        recipeLayout.getItemStacks().init(0, true, 31, 31);
-//        recipeLayout.getItemStacks().set(0, Arrays.asList(wrapper.theRecipe.getInput().getMatchingStacks()));
-//
-//        recipeLayout.getItemStacks().init(1, true, 1, 31);
-//        recipeLayout.getItemStacks().set(1, Arrays.asList(wrapper.theRecipe.getStandOne().getMatchingStacks()));
-//
-//        recipeLayout.getItemStacks().init(2, true, 31, 1);
-//        recipeLayout.getItemStacks().set(2, Arrays.asList(wrapper.theRecipe.getStandTwo().getMatchingStacks()));
-//
-//        recipeLayout.getItemStacks().init(3, true, 61, 31);
-//        recipeLayout.getItemStacks().set(3, Arrays.asList(wrapper.theRecipe.getStandThree().getMatchingStacks()));
-//
-//        recipeLayout.getItemStacks().init(4, true, 31, 61);
-//        recipeLayout.getItemStacks().set(4, Arrays.asList(wrapper.theRecipe.getStandFour().getMatchingStacks()));
-//
-//        recipeLayout.getItemStacks().init(5, false, 112, 31);
-//        recipeLayout.getItemStacks().set(5, wrapper.theRecipe.getOutput());
-//    }
-//}

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java

@@ -1,70 +0,0 @@
-///*
-// * This file ("EmpowererRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
-// * It is created and owned by Ellpeck and distributed
-// * under the Actually Additions License to be found at
-// * http://ellpeck.de/actaddlicense
-// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
-// *
-// * © 2015-2017 Ellpeck
-// */
-//
-//package de.ellpeck.actuallyadditions.mod.jei.empowerer;
-//
-//import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-//import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
-//import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
-//import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils;
-//import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
-//import mezz.jei.api.ingredients.IIngredients;
-//import mezz.jei.api.ingredients.VanillaTypes;
-//import net.minecraft.item.ItemStack;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//public class EmpowererRecipeWrapper extends RecipeWrapperWithButton {
-//
-//    public final EmpowererRecipe theRecipe;
-//
-//    public EmpowererRecipeWrapper(EmpowererRecipe recipe) {
-//        this.theRecipe = recipe;
-//    }
-//
-//    @Override
-//    public void getIngredients(IIngredients ingredients) {
-//        List<ItemStack> inputs = new ArrayList<>();
-//        for (ItemStack s : this.theRecipe.getInput().getMatchingStacks()) {
-//            inputs.add(s);
-//        }
-//        for (ItemStack s : this.theRecipe.getStandOne().getMatchingStacks()) {
-//            inputs.add(s);
-//        }
-//        for (ItemStack s : this.theRecipe.getStandTwo().getMatchingStacks()) {
-//            inputs.add(s);
-//        }
-//        for (ItemStack s : this.theRecipe.getStandThree().getMatchingStacks()) {
-//            inputs.add(s);
-//        }
-//        for (ItemStack s : this.theRecipe.getStandFour().getMatchingStacks()) {
-//            inputs.add(s);
-//        }
-//
-//        ingredients.setInputs(VanillaTypes.ITEM, inputs);
-//        ingredients.setOutput(VanillaTypes.ITEM, this.theRecipe.getOutput());
-//    }
-//
-//    @Override
-//    public int getButtonX() {
-//        return 2;
-//    }
-//
-//    @Override
-//    public int getButtonY() {
-//        return 2;
-//    }
-//
-//    @Override
-//    public IBookletPage getPage() {
-//        return BookletUtils.findFirstPageForStack(new ItemStack(ActuallyBlocks.blockEmpowerer));
-//    }
-//}

src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java

@@ -1,69 +0,0 @@
-///*
-// * This file ("ReconstructorRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
-// * It is created and owned by Ellpeck and distributed
-// * under the Actually Additions License to be found at
-// * http://ellpeck.de/actaddlicense
-// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
-// *
-// * © 2015-2017 Ellpeck
-// */
-//
-//package de.ellpeck.actuallyadditions.mod.jei.reconstructor;
-//
-//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
-//import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
-//import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-//import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-//import mezz.jei.api.IGuiHelper;
-//import mezz.jei.api.gui.IDrawable;
-//import mezz.jei.api.gui.IRecipeLayout;
-//import mezz.jei.api.ingredients.IIngredients;
-//import mezz.jei.api.ingredients.VanillaTypes;
-//import mezz.jei.api.recipe.IRecipeCategory;
-//import net.minecraft.client.Minecraft;
-//import net.minecraft.item.ItemStack;
-//
-//public class ReconstructorRecipeCategory implements IRecipeCategory<ReconstructorRecipeWrapper> {
-//
-//    public static final String NAME = "actuallyadditions.reconstructor";
-//
-//    private static final ItemStack RECONSTRUCTOR = new ItemStack(ActuallyBlocks.blockAtomicReconstructor);
-//    private final IDrawable background;
-//
-//    public ReconstructorRecipeCategory(IGuiHelper helper) {
-//        this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_atomic_reconstructor"), 0, 0, 96, 60);
-//    }
-//
-//    @Override
-//    public String getUid() {
-//        return NAME;
-//    }
-//
-//    @Override
-//    public String getTitle() {
-//        return StringUtil.localize("container.nei." + NAME + ".name");
-//    }
-//
-//    @Override
-//    public String getModName() {
-//        return ActuallyAdditions.NAME;
-//    }
-//
-//    @Override
-//    public IDrawable getBackground() {
-//        return this.background;
-//    }
-//
-//    @Override
-//    public void drawExtras(Minecraft minecraft) {
-//        AssetUtil.renderStackToGui(RECONSTRUCTOR, 34, 19, 1.0F);
-//    }
-//
-//    @Override
-//    public void setRecipe(IRecipeLayout recipeLayout, ReconstructorRecipeWrapper wrapper, IIngredients ingredients) {
-//        recipeLayout.getItemStacks().init(0, true, 4, 18);
-//        recipeLayout.getItemStacks().set(0, ingredients.getInputs(VanillaTypes.ITEM).get(0).get(0));
-//        recipeLayout.getItemStacks().init(1, false, 66, 18);
-//        recipeLayout.getItemStacks().set(1, ingredients.getOutputs(VanillaTypes.ITEM).get(0).get(0));
-//    }
-//}

src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java

@@ -1,98 +0,0 @@
-///*
-// * This file ("ReconstructorRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
-// * It is created and owned by Ellpeck and distributed
-// * under the Actually Additions License to be found at
-// * http://ellpeck.de/actaddlicense
-// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
-// *
-// * © 2015-2017 Ellpeck
-// */
-//
-//package de.ellpeck.actuallyadditions.mod.jei.reconstructor;
-//
-//import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-//import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
-//import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
-//import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils;
-//import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
-//import de.ellpeck.actuallyadditions.mod.recipe.EnchBookConversion;
-//import mezz.jei.api.ingredients.IIngredients;
-//import mezz.jei.api.ingredients.VanillaTypes;
-//import mezz.jei.api.recipe.IRecipeWrapperFactory;
-//import net.minecraft.client.Minecraft;
-//import net.minecraft.client.resources.I18n;
-//import net.minecraft.init.Items;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.nbt.CompoundNBT;
-//import net.minecraft.nbt.ListNBT;
-//import net.minecraft.nbt.NBTTagString;
-//
-//import java.util.Arrays;
-//
-//public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton {
-//
-//    public static final IRecipeWrapperFactory<LensConversionRecipe> FACTORY = (recipe) -> {
-//        if (recipe instanceof EnchBookConversion) {
-//            return new EnchBookWrapper((EnchBookConversion) recipe);
-//        }
-//        return new ReconstructorRecipeWrapper(recipe);
-//    };
-//
-//    public final LensConversionRecipe theRecipe;
-//
-//    public ReconstructorRecipeWrapper(LensConversionRecipe recipe) {
-//        this.theRecipe = recipe;
-//    }
-//
-//    @Override
-//    public void getIngredients(IIngredients ingredients) {
-//        ingredients.setInputs(VanillaTypes.ITEM, Arrays.asList(this.theRecipe.getInput().getMatchingStacks()));
-//        ingredients.setOutput(VanillaTypes.ITEM, this.theRecipe.getOutput());
-//    }
-//
-//    @Override
-//    public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
-//        minecraft.fontRenderer.drawString(this.theRecipe.getEnergyUsed() + " " + I18n.format("actuallyadditions.cf"), 55, 0, 0xFFFFFF, true);
-//        super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
-//    }
-//
-//    @Override
-//    public int getButtonX() {
-//        return 3;
-//    }
-//
-//    @Override
-//    public int getButtonY() {
-//        return 40;
-//    }
-//
-//    @Override
-//    public IBookletPage getPage() {
-//        return BookletUtils.findFirstPageForStack(new ItemStack(ActuallyBlocks.blockAtomicReconstructor));
-//    }
-//
-//    public static class EnchBookWrapper extends ReconstructorRecipeWrapper {
-//
-//        private static final ItemStack BOOK = new ItemStack(Items.ENCHANTED_BOOK);
-//        private static final ItemStack OUT = new ItemStack(Items.ENCHANTED_BOOK);
-//
-//        static {
-//            OUT.setStackDisplayName("Split Book");
-//            CompoundNBT t = OUT.getTagCompound().getCompoundTag("display");
-//            ListNBT l = new ListNBT();
-//            l.appendTag(new NBTTagString("Book will be split based on enchantments!"));
-//            t.setTag("Lore", l);
-//        }
-//
-//        public EnchBookWrapper(EnchBookConversion recipe) {
-//            super(recipe);
-//        }
-//
-//        @Override
-//        public void getIngredients(IIngredients ingredients) {
-//            ingredients.setInput(VanillaTypes.ITEM, BOOK);
-//            ingredients.setOutput(VanillaTypes.ITEM, OUT);
-//        }
-//
-//    }
-//}