Update JEI, add JEI info for PSD and Machines

Author: robotgryphon

gradle.properties

@@ -11,9 +11,9 @@ mod_id=compactmachines
 mod_version=4.0.0-beta.2
 
 # Dependencies and Libs
-jei_mc_version=1.16.4
-jei_version=7.6.1.71
-top_version=1.16-3.0.7-13
+jei_mc_version=1.16.5
+jei_version=7.7.1.110
+top_version=1.16-3.1.4-22
 
 # Curseforge
 cf_project=224218

src/main/java/dev/compactmods/machines/api/core/JeiInfo.java

@@ -0,0 +1,10 @@
+package dev.compactmods.machines.api.core;
+
+import com.mojang.datafixers.kinds.Const;
+import net.minecraft.util.ResourceLocation;
+
+public class JeiInfo {
+    public static final ResourceLocation MACHINE = new ResourceLocation(Constants.MOD_ID, "machines");
+
+    public static final ResourceLocation SHRINKING_DEVICE = new ResourceLocation(Constants.MOD_ID, "shrinking_device");
+}

src/main/java/dev/compactmods/machines/compat/jei/CompactMachinesJeiPlugin.java

@@ -1,11 +1,21 @@
 package dev.compactmods.machines.compat.jei;
 
+import java.util.Arrays;
 import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.api.core.JeiInfo;
+import dev.compactmods.machines.api.core.Messages;
+import dev.compactmods.machines.block.BlockCompactMachine;
 import dev.compactmods.machines.core.Registration;
+import dev.compactmods.machines.reference.EnumMachineSize;
+import dev.compactmods.machines.util.TranslationUtil;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.ingredients.IIngredientType;
+import mezz.jei.api.registration.IRecipeRegistration;
 import mezz.jei.api.registration.ISubtypeRegistration;
 import mezz.jei.api.runtime.IJeiRuntime;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 @JeiPlugin
@@ -15,6 +25,22 @@ public ResourceLocation getPluginUid() {
         return new ResourceLocation(CompactMachines.MOD_ID, "main");
     }
 
+    @Override
+    public void registerRecipes(IRecipeRegistration registration) {
+        Arrays.stream(EnumMachineSize.values())
+                .map(BlockCompactMachine::getItemBySize)
+                .forEach(i -> registration.addIngredientInfo(
+                        new ItemStack(i),
+                        VanillaTypes.ITEM,
+                        TranslationUtil.jeiInfo(JeiInfo.MACHINE)));
+
+
+        registration.addIngredientInfo(
+                new ItemStack(Registration.PERSONAL_SHRINKING_DEVICE.get()),
+                VanillaTypes.ITEM,
+                TranslationUtil.jeiInfo(JeiInfo.SHRINKING_DEVICE));
+    }
+
     @Override
     public void registerItemSubtypes(ISubtypeRegistration registration) {
         registration.useNbtForSubtypes(Registration.ITEM_TUNNEL.get());

src/main/java/dev/compactmods/machines/util/TranslationUtil.java

@@ -45,4 +45,8 @@ public static TranslationTextComponent advancementTitle(ResourceLocation advance
     public static TranslationTextComponent advancementDesc(ResourceLocation advancement) {
         return new TranslationTextComponent(Util.makeDescriptionId("advancement", advancement) + ".desc");
     }
+
+    public static TranslationTextComponent jeiInfo(ResourceLocation jei) {
+        return new TranslationTextComponent(Util.makeDescriptionId("jei", jei));
+    }
 }

src/main/resources/assets/compactmachines/lang/en_us.json

@@ -1,48 +1,39 @@
 {
   "itemGroup.compactmachines": "Compact Machines",
-
   "tooltip.compactmachines.machine.id": "Machine ID: %s",
   "tooltip.compactmachines.machine.owner": "Owner: %s",
   "tooltip.compactmachines.machine.size": "Internal Size: %1$sx%1$sx%1$s",
   "tooltip.compactmachines.unknown_player": "Unknown Player",
   "tooltip.compactmachines.tunnel_type": "Type ID: %1$s",
-
   "tooltip.compactmachines.hint.hold_shift": "Hold shift for details.",
   "tooltip.compactmachines.details.psd": "Used as in-game documentation and to enter Compact Machines.",
   "tooltip.compactmachines.details.solid_wall": "Warning! Unbreakable for non-creative players!",
-
   "message.compactmachines.new_machine": "New Machine",
   "message.compactmachines.cannot_enter": "You fumble with the shrinking device, to no avail. It refuses to work.",
   "message.compactmachines.spawnpoint_set": "New spawn point set.",
   "message.compactmachines.no_machine_data": "No machine data loaded; report this.",
   "message.compactmachines.teleport_oob": "An otherworldly force prevents your teleportation.",
   "message.compactmachines.fixbiome_bad_dim": "Cannot use fixbiome command outside of a machine room.",
-
   "block.compactmachines.machine": "Compact Machine",
   "block.compactmachines.machine_tiny": "Compact Machine (Tiny)",
   "block.compactmachines.machine_small": "Compact Machine (Small)",
   "block.compactmachines.machine_normal": "Compact Machine (Normal)",
   "block.compactmachines.machine_large": "Compact Machine (Large)",
   "block.compactmachines.machine_giant": "Compact Machine (Giant)",
   "block.compactmachines.machine_maximum": "Compact Machine (Maximum)",
-
   "block.compactmachines.solid_wall": "Solid Compact Machine Wall",
   "block.compactmachines.wall": "Compact Machine Wall",
   "block.compactmachines.tunnel_wall": "Solid Compact Machine Wall (with Tunnel)",
-
   "item.compactmachines.machine_tiny": "Compact Machine (Tiny)",
   "item.compactmachines.machine_small": "Compact Machine (Small)",
   "item.compactmachines.machine_normal": "Compact Machine (Normal)",
   "item.compactmachines.machine_large": "Compact Machine (Large)",
   "item.compactmachines.machine_giant": "Compact Machine (Giant)",
   "item.compactmachines.machine_maximum": "Compact Machine (Maximum)",
-
   "item.compactmachines.personal_shrinking_device": "Personal Shrinking Device",
-
   "item.compactmachines.tunnels.item": "Item Tunnel",
   "item.compactmachines.tunnels.redstone_in": "Redstone Tunnel (In)",
   "item.compactmachines.tunnels.redstone_out": "Redstone Tunnel (Out)",
-
   "compactmachines.connected_block": "Connected: %s",
   "compactmachines.direction.side": "Side: %s",
   "compactmachines.direction.up": "Up",
@@ -51,12 +42,9 @@
   "compactmachines.direction.south": "South",
   "compactmachines.direction.west": "West",
   "compactmachines.direction.east": "East",
-
   "compactmachines.psd.pages.machines.title": "Compact Machines",
   "compactmachines.psd.pages.machines": "Compact Machines are the core mechanic of this mod. They allow you to build large rooms in a single block space connected to the outside world. They come in various sizes ranging from 3x3x3 to 13x13x13.\n\nYou can use Tunnels to connect the outside block faces with any of the inside walls to transport items, fluids etc.\n\nYou can enter a Compact Machine by right-clicking it with a Personal Shrinking Device. Please use JEI to look up crafting recipes.",
-
   "compactmachines.errors.unknown_tunnel_type": "Unknown Tunnel Type (%s)",
-
   "advancement.compactmachines.root": "Compact Machines",
   "advancement.compactmachines.root.desc": "",
   "advancement.compactmachines.how_did_you_get_here": "How Did You Get Here?!",
@@ -76,5 +64,7 @@
   "advancement.compactmachines.claimed_machine_giant": "Got Enough Space?",
   "advancement.compactmachines.claimed_machine_giant.desc": "Claim a giant compact machine.",
   "advancement.compactmachines.claimed_machine_max": "Room for Activities!",
-  "advancement.compactmachines.claimed_machine_max.desc": "Claim a maximum compact machine."
+  "advancement.compactmachines.claimed_machine_max.desc": "Claim a maximum compact machine.",
+  "jei.compactmachines.shrinking_device": "Use the Personal Shrinking Device (PSD) on a machine in order to enter a compact space. You can also right click it in the overworld for more info.",
+  "jei.compactmachines.machines": "Machines are used to make pocket dimensions. Craft a machine and place it in world, then use a Personal Shrinking Device to go inside."
 }