Make emi category field names consistent

LordDeatHunter · Jul 19, 2023 · 4a66610 · 4a66610
1 parent 0881b5f
commit 4a66610
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/FENEmiPlugin.java b/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/FENEmiPlugin.java
@@ -27,11 +27,11 @@ public class FENEmiPlugin implements EmiPlugin {
     public static final EmiRecipeCategory SIEVE_CATEGORY = new EmiRecipeCategory(id("sieve"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.sieve()));
     public static final EmiRecipeCategory WITCH_WATER_WORLD_CATEGORY = new EmiRecipeCategory(id("witch_water_world"), EmiStack.of(WitchWaterFluid.STILL));
     public static final EmiRecipeCategory WITCH_WATER_ENTITY_CATEGORY = new EmiRecipeCategory(id("witch_water_entity"), EmiStack.of(WitchWaterFluid.STILL));
+    public static final EmiRecipeCategory CRUCIBLE_HEAT_CATEGORY = new EmiRecipeCategory(id("crucible_heat"), EmiStack.of(DefaultApiModule.INSTANCE.porcelainCrucible));
     public static final EmiRecipeCategory FIREPROOF_CRUCIBLE = new EmiRecipeCategory(id("fireproof_crucible"), EmiStack.of(DefaultApiModule.INSTANCE.porcelainCrucible));
-    public static final EmiRecipeCategory CRUCIBLE_HEAT = new EmiRecipeCategory(id("crucible_heat"), EmiStack.of(DefaultApiModule.INSTANCE.porcelainCrucible));
-    public static final EmiRecipeCategory WOODEN_CRUCIBLE = new EmiRecipeCategory(id("wooden_crucible"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.crucible()));
-    public static final EmiRecipeCategory MILKING = new EmiRecipeCategory(id("barrel/milking"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.barrel()));
-    public static final EmiRecipeCategory BARREL = new EmiRecipeCategory(id("barrel"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.barrel()));
+    public static final EmiRecipeCategory WOODEN_CRUCIBLE_CATEGORY = new EmiRecipeCategory(id("wooden_crucible"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.crucible()));
+    public static final EmiRecipeCategory MILKING_CATEGORY = new EmiRecipeCategory(id("barrel/milking"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.barrel()));
+    public static final EmiRecipeCategory BARREL_CATEGORY = new EmiRecipeCategory(id("barrel"), EmiStack.of(DefaultApiModule.INSTANCE.oakBlocks.barrel()));
 
     @Override
     public void register(EmiRegistry registry) {
@@ -47,14 +47,14 @@ public void register(EmiRegistry registry) {
         registry.addWorkstation(WITCH_WATER_ENTITY_CATEGORY, EmiIngredient.of(WitchWaterFluid.TAG));
         registry.addCategory(FIREPROOF_CRUCIBLE);
         registry.addWorkstation(FIREPROOF_CRUCIBLE, EmiStack.of(DefaultApiModule.INSTANCE.porcelainCrucible));
-        registry.addCategory(CRUCIBLE_HEAT);
-        registry.addWorkstation(CRUCIBLE_HEAT, EmiIngredient.of(ModTags.CRUCIBLES));
-        registry.addCategory(WOODEN_CRUCIBLE);
-        registry.addWorkstation(WOODEN_CRUCIBLE, EmiIngredient.of(ModTags.CRUCIBLES));
-        registry.addCategory(MILKING);
-        registry.addWorkstation(MILKING, EmiIngredient.of(ModTags.BARRELS));
-        registry.addCategory(BARREL);
-        registry.addWorkstation(BARREL, EmiIngredient.of(ModTags.BARRELS));
+        registry.addCategory(CRUCIBLE_HEAT_CATEGORY);
+        registry.addWorkstation(CRUCIBLE_HEAT_CATEGORY, EmiIngredient.of(ModTags.CRUCIBLES));
+        registry.addCategory(WOODEN_CRUCIBLE_CATEGORY);
+        registry.addWorkstation(WOODEN_CRUCIBLE_CATEGORY, EmiIngredient.of(ModTags.CRUCIBLES));
+        registry.addCategory(MILKING_CATEGORY);
+        registry.addWorkstation(MILKING_CATEGORY, EmiIngredient.of(ModTags.BARRELS));
+        registry.addCategory(BARREL_CATEGORY);
+        registry.addWorkstation(BARREL_CATEGORY, EmiIngredient.of(ModTags.BARRELS));
 
         addRecipes(registry, ModRecipes.CROOK, EmiToolRecipe::new);
         addRecipes(registry, ModRecipes.HAMMER, EmiToolRecipe::new);

diff --git a/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiBarrelRecipe.java b/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiBarrelRecipe.java
@@ -110,7 +110,7 @@ private EmiIngredient getTriggerItem(BarrelRecipe recipe) {
 
     @Override
     public EmiRecipeCategory getCategory() {
-        return FENEmiPlugin.BARREL;
+        return FENEmiPlugin.BARREL_CATEGORY;
     }
 
     @Override

diff --git a/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiCrucibleHeatRecipe.java b/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiCrucibleHeatRecipe.java
@@ -16,7 +16,7 @@ public class EmiCrucibleHeatRecipe extends BasicEmiRecipe {
     private final int heat;
 
     public EmiCrucibleHeatRecipe(CrucibleHeatRecipe recipe) {
-        super(FENEmiPlugin.CRUCIBLE_HEAT, recipe.getId(), WIDTH, HEIGHT);
+        super(FENEmiPlugin.CRUCIBLE_HEAT_CATEGORY, recipe.getId(), WIDTH, HEIGHT);
         block = EmiIngredientUtil.ingredientOf(recipe.getBlock());
         catalysts.add(block);
         heat = recipe.getHeat();

diff --git a/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiCrucibleRecipe.java b/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiCrucibleRecipe.java
@@ -17,7 +17,7 @@ public class EmiCrucibleRecipe extends BasicEmiRecipe {
     private final EmiStack output;
 
     public EmiCrucibleRecipe(CrucibleRecipe recipe) {
-        super(recipe.requiresFireproofCrucible() ? FENEmiPlugin.FIREPROOF_CRUCIBLE : FENEmiPlugin.WOODEN_CRUCIBLE, recipe.getId(), WIDTH, HEIGHT);
+        super(recipe.requiresFireproofCrucible() ? FENEmiPlugin.FIREPROOF_CRUCIBLE : FENEmiPlugin.WOODEN_CRUCIBLE_CATEGORY, recipe.getId(), WIDTH, HEIGHT);
         input = EmiIngredient.of(recipe.getInput());
         inputs.add(input);
         output = FabricEmiStack.of(recipe.getFluid()).setAmount(recipe.getAmount());

diff --git a/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiMilkingRecipe.java b/src/main/java/wraith/fabricaeexnihilo/compatibility/emi/recipes/EmiMilkingRecipe.java
@@ -23,7 +23,7 @@ public class EmiMilkingRecipe extends BasicEmiRecipe {
     private final int cooldown;
 
     public EmiMilkingRecipe(MilkingRecipe recipe) {
-        super(FENEmiPlugin.MILKING, recipe.getId(), WIDTH, HEIGHT);
+        super(FENEmiPlugin.MILKING_CATEGORY, recipe.getId(), WIDTH, HEIGHT);
         entity = recipe.getEntity();
         fluid = FabricEmiStack.of(recipe.getFluid(), recipe.getAmount());
         outputs.add(fluid);