fix: Move JEI support to common so it's available on Fabric too

TwelveIterationMods · Jul 4, 2024 · b76607b · b76607b
1 parent b70acc7
commit b76607b
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 23 deletions.
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -30,6 +30,9 @@
     ],
     "modmenu": [
       "net.blay09.mods.excompressum.fabric.compat.ModMenuIntegration"
+    ],
+    "jei_mod_plugin": [
+      "net.blay09.mods.excompressum.compat.jei.JEIAddon"
     ]
   },
   "mixins": [

diff --git a/...at/jei/ChickenStickJeiRecipeCategory.java → ...at/jei/ChickenStickJeiRecipeCategory.java b/...at/jei/ChickenStickJeiRecipeCategory.java → ...at/jei/ChickenStickJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -9,6 +9,7 @@
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedChickenStickRecipe;
 import net.blay09.mods.excompressum.item.ModItems;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;

diff --git a/...ei/CompressedHammerJeiRecipeCategory.java → ...ei/CompressedHammerJeiRecipeCategory.java b/...ei/CompressedHammerJeiRecipeCategory.java → ...ei/CompressedHammerJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,6 +10,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedCompressedHammerRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;

diff --git a/...i/CraftChickenStickJeiRecipeCategory.java → ...i/CraftChickenStickJeiRecipeCategory.java b/...i/CraftChickenStickJeiRecipeCategory.java → ...i/CraftChickenStickJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;

diff --git a/...e/compat/jei/CraftChickenStickRecipe.java → ...m/compat/jei/CraftChickenStickRecipe.java b/...e/compat/jei/CraftChickenStickRecipe.java → ...m/compat/jei/CraftChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import net.blay09.mods.excompressum.item.ModItems;
 import net.minecraft.nbt.CompoundTag;

diff --git a/...e/compat/jei/HammerJeiRecipeCategory.java → ...m/compat/jei/HammerJeiRecipeCategory.java b/...e/compat/jei/HammerJeiRecipeCategory.java → ...m/compat/jei/HammerJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,6 +10,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedHammerRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;

diff --git a/...mpat/jei/HeavySieveJeiRecipeCategory.java → ...mpat/jei/HeavySieveJeiRecipeCategory.java b/...mpat/jei/HeavySieveJeiRecipeCategory.java → ...mpat/jei/HeavySieveJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -11,12 +11,12 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedHeavySieveRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.List;
 
 public class HeavySieveJeiRecipeCategory implements IRecipeCategory<ExpandedHeavySieveRecipe> {
 

diff --git a/...compressum/forge/compat/jei/JEIAddon.java → ...ods/excompressum/compat/jei/JEIAddon.java b/...compressum/forge/compat/jei/JEIAddon.java → ...ods/excompressum/compat/jei/JEIAddon.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
@@ -11,6 +11,7 @@
 import mezz.jei.api.registration.IRecipeRegistration;
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.excompressum.ExCompressum;
+import net.blay09.mods.excompressum.compat.recipeviewers.*;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.block.HeavySieveBlock;
 import net.blay09.mods.excompressum.block.ModBlocks;

diff --git a/...compressum/forge/compat/jei/JeiUtils.java → ...ods/excompressum/compat/jei/JeiUtils.java b/...compressum/forge/compat/jei/JeiUtils.java → ...ods/excompressum/compat/jei/JeiUtils.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;

diff --git a/...ge/compat/jei/SieveJeiRecipeCategory.java → ...um/compat/jei/SieveJeiRecipeCategory.java b/...ge/compat/jei/SieveJeiRecipeCategory.java → ...um/compat/jei/SieveJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -11,6 +11,7 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedSieveRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;

diff --git a/.../jei/WoodenCrucibleJeiRecipeCategory.java → .../jei/WoodenCrucibleJeiRecipeCategory.java b/.../jei/WoodenCrucibleJeiRecipeCategory.java → .../jei/WoodenCrucibleJeiRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -10,12 +10,12 @@
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
+import net.blay09.mods.excompressum.compat.recipeviewers.ExpandedWoodenCrucibleRecipe;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.List;
 
 public class WoodenCrucibleJeiRecipeCategory implements IRecipeCategory<ExpandedWoodenCrucibleRecipe> {
 
@@ -56,7 +56,7 @@ public IDrawable getIcon() {
 
     @Override
     public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedWoodenCrucibleRecipe recipe, IFocusGroup focusGroup) {
-        recipeLayoutBuilder.addSlot(RecipeIngredientRole.OUTPUT, 75, 10).addFluidStack(recipe.getFluid(), recipe.getFluidStack().getAmount());
+        recipeLayoutBuilder.addSlot(RecipeIngredientRole.OUTPUT, 75, 10).addFluidStack(recipe.getFluid(), recipe.getAmount());
 
         final var inputs = recipe.getInputs();
         for (int i = 0; i < inputs.size(); i++) {

diff --git a/...ompat/jei/ExpandedChickenStickRecipe.java → ...peviewers/ExpandedChickenStickRecipe.java b/...ompat/jei/ExpandedChickenStickRecipe.java → ...peviewers/ExpandedChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;

diff --git a/...t/jei/ExpandedCompressedHammerRecipe.java → ...ewers/ExpandedCompressedHammerRecipe.java b/...t/jei/ExpandedCompressedHammerRecipe.java → ...ewers/ExpandedCompressedHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.CompressedHammerRecipe;
 import net.blay09.mods.excompressum.loot.LootTableEntry;

diff --git a/...orge/compat/jei/ExpandedHammerRecipe.java → ...t/recipeviewers/ExpandedHammerRecipe.java b/...orge/compat/jei/ExpandedHammerRecipe.java → ...t/recipeviewers/ExpandedHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.HammerRecipe;
 import net.blay09.mods.excompressum.loot.LootTableEntry;

diff --git a/.../compat/jei/ExpandedHeavySieveRecipe.java → ...cipeviewers/ExpandedHeavySieveRecipe.java b/.../compat/jei/ExpandedHeavySieveRecipe.java → ...cipeviewers/ExpandedHeavySieveRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import net.blay09.mods.excompressum.api.recipe.HeavySieveRecipe;
 import net.blay09.mods.excompressum.api.sievemesh.CommonMeshType;

diff --git a/...forge/compat/jei/ExpandedSieveRecipe.java → ...at/recipeviewers/ExpandedSieveRecipe.java b/...forge/compat/jei/ExpandedSieveRecipe.java → ...at/recipeviewers/ExpandedSieveRecipe.java
@@ -1,6 +1,5 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
-import net.blay09.mods.excompressum.api.recipe.HeavySieveRecipe;
 import net.blay09.mods.excompressum.api.recipe.SieveRecipe;
 import net.blay09.mods.excompressum.api.sievemesh.CommonMeshType;
 import net.blay09.mods.excompressum.api.sievemesh.SieveMeshRegistryEntry;

diff --git a/...pat/jei/ExpandedWoodenCrucibleRecipe.java → ...viewers/ExpandedWoodenCrucibleRecipe.java b/...pat/jei/ExpandedWoodenCrucibleRecipe.java → ...viewers/ExpandedWoodenCrucibleRecipe.java
@@ -1,10 +1,9 @@
-package net.blay09.mods.excompressum.forge.compat.jei;
+package net.blay09.mods.excompressum.compat.recipeviewers;
 
 import com.mojang.datafixers.util.Pair;
 import net.blay09.mods.excompressum.registry.woodencrucible.WoodenCrucibleRecipe;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,8 +32,8 @@ public Fluid getFluid() {
         return fluid;
     }
 
-    public FluidStack getFluidStack() {
-        return new FluidStack(fluid, 1000);
+    public int getAmount() {
+        return 1000;
     }
 
     public WoodenCrucibleRecipe getEntryAt(int index) {