From c41f26649e78d5ec879690cca7fc7dae63194d2f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 30 Sep 2022 15:39:20 +0200 Subject: [PATCH] fixed JEI coordinates and names being incorrect --- .../ellpeck/naturesaura/compat/jei/AltarCategory.java | 10 +++++----- .../naturesaura/compat/jei/AnimalSpawnerCategory.java | 6 +++--- .../naturesaura/compat/jei/OfferingCategory.java | 8 ++++---- .../naturesaura/compat/jei/TreeRitualCategory.java | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/compat/jei/AltarCategory.java b/src/main/java/de/ellpeck/naturesaura/compat/jei/AltarCategory.java index f7cd3942..6cf7b11a 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/jei/AltarCategory.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/jei/AltarCategory.java @@ -34,7 +34,7 @@ public class AltarCategory implements IRecipeCategory { @Override public Component getTitle() { - return Component.translatable("container." + JEINaturesAuraPlugin.ALTAR + ".name"); + return Component.translatable("container." + JEINaturesAuraPlugin.ALTAR.getUid() + ".name"); } @Override @@ -49,9 +49,9 @@ public class AltarCategory implements IRecipeCategory { @Override public void setRecipe(IRecipeLayoutBuilder builder, AltarRecipe recipe, IFocusGroup focuses) { - builder.addSlot(RecipeIngredientRole.INPUT, 0, 18).addItemStacks(Arrays.asList(recipe.input.getItems())); - builder.addSlot(RecipeIngredientRole.OUTPUT, 80, 18).addItemStack(recipe.output); - builder.addSlot(RecipeIngredientRole.CATALYST, 26, 18).addItemStacks(recipe.catalyst == Ingredient.EMPTY ? Collections.singletonList(this.altar) : Arrays.asList(recipe.catalyst.getItems())); - builder.addSlot(RecipeIngredientRole.CATALYST, 51, 18).addItemStack(recipe.requiredType != null ? recipe.getDimensionBottle() : ItemStack.EMPTY); + builder.addSlot(RecipeIngredientRole.INPUT, 1, 19).addItemStacks(Arrays.asList(recipe.input.getItems())); + builder.addSlot(RecipeIngredientRole.OUTPUT, 81, 19).addItemStack(recipe.output); + builder.addSlot(RecipeIngredientRole.CATALYST, 27, 19).addItemStacks(recipe.catalyst == Ingredient.EMPTY ? Collections.singletonList(this.altar) : Arrays.asList(recipe.catalyst.getItems())); + builder.addSlot(RecipeIngredientRole.CATALYST, 52, 19).addItemStack(recipe.requiredType != null ? recipe.getDimensionBottle() : ItemStack.EMPTY); } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java b/src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java index 8bcfcd5c..426d4fe0 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java @@ -87,7 +87,7 @@ public class AnimalSpawnerCategory implements IRecipeCategory { @Override public Component getTitle() { - return Component.translatable("container." + JEINaturesAuraPlugin.OFFERING + ".name"); + return Component.translatable("container." + JEINaturesAuraPlugin.OFFERING.getUid() + ".name"); } @Override @@ -44,8 +44,8 @@ public class OfferingCategory implements IRecipeCategory { @Override public void setRecipe(IRecipeLayoutBuilder builder, OfferingRecipe recipe, IFocusGroup focuses) { - builder.addSlot(RecipeIngredientRole.INPUT, 0, 14).addItemStacks(Arrays.asList(recipe.input.getItems())); - builder.addSlot(RecipeIngredientRole.OUTPUT, 65, 14).addItemStack(recipe.output); - builder.addSlot(RecipeIngredientRole.INPUT, 27, 0).addItemStacks(Arrays.asList(recipe.startItem.getItems())); + builder.addSlot(RecipeIngredientRole.INPUT, 1, 15).addItemStacks(Arrays.asList(recipe.input.getItems())); + builder.addSlot(RecipeIngredientRole.OUTPUT, 66, 15).addItemStack(recipe.output); + builder.addSlot(RecipeIngredientRole.INPUT, 28, 1).addItemStacks(Arrays.asList(recipe.startItem.getItems())); } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/jei/TreeRitualCategory.java b/src/main/java/de/ellpeck/naturesaura/compat/jei/TreeRitualCategory.java index 3f58c968..324d8d5d 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/jei/TreeRitualCategory.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/jei/TreeRitualCategory.java @@ -29,7 +29,7 @@ public class TreeRitualCategory implements IRecipeCategory { @Override public Component getTitle() { - return Component.translatable("container." + JEINaturesAuraPlugin.TREE_RITUAL + ".name"); + return Component.translatable("container." + JEINaturesAuraPlugin.TREE_RITUAL.getUid() + ".name"); } @Override @@ -44,12 +44,12 @@ public class TreeRitualCategory implements IRecipeCategory { @Override public void setRecipe(IRecipeLayoutBuilder builder, TreeRitualRecipe recipe, IFocusGroup focuses) { - builder.addSlot(RecipeIngredientRole.CATALYST, 34, 34).addItemStacks(Arrays.asList(recipe.saplingType.getItems())); - builder.addSlot(RecipeIngredientRole.OUTPUT, 124, 34).addItemStack(recipe.result); + builder.addSlot(RecipeIngredientRole.CATALYST, 35, 35).addItemStacks(Arrays.asList(recipe.saplingType.getItems())); + builder.addSlot(RecipeIngredientRole.OUTPUT, 125, 35).addItemStack(recipe.result); var positions = new int[][]{{35, 1}, {35, 69}, {1, 35}, {69, 35}, {12, 12}, {58, 58}, {58, 12}, {12, 58}}; for (var i = 0; i < recipe.ingredients.length; i++) - builder.addSlot(RecipeIngredientRole.INPUT, positions[i][0] - 1, positions[i][1] - 1).addItemStacks(Arrays.asList(recipe.ingredients[i].getItems())); + builder.addSlot(RecipeIngredientRole.INPUT, positions[i][0], positions[i][1]).addItemStacks(Arrays.asList(recipe.ingredients[i].getItems())); } }