From 1ea33829b365ad4c5f66eec67ab4874f1ce5a77c Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 4 Apr 2017 03:26:39 -0700 Subject: [PATCH] Update JEI integration --- gradle.properties | 2 +- src/main/java/binnie/core/BinnieCore.java | 2 +- .../core/integration/jei/Drawables.java | 2 +- .../jei/brewery/BreweryRecipeCategory.java | 25 ++++++------------- .../brewery/DistilleryRecipeCategory.java | 7 +++--- .../fruitpress/FruitPressRecipeCategory.java | 12 ++++----- .../lumbermill/LumbermillRecipeCategory.java | 19 ++++++-------- .../jei/database/DatabaseRecipeCategory.java | 12 +++------ .../jei/genepool/GenepoolRecipeCategory.java | 15 ++++++----- .../incubator/IncubatorRecipeCategory.java | 15 ++++++----- .../inoculator/InoculatorRecipeCategory.java | 18 ++++++------- .../jei/isolator/IsolatorRecipeCategory.java | 17 ++++++------- .../PolymeriserRecipeCategory.java | 24 ++++++++---------- .../sequencer/SequencerRecipeCategory.java | 15 ++++------- 14 files changed, 75 insertions(+), 110 deletions(-) diff --git a/gradle.properties b/gradle.properties index f2309fef..ab007f7e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,6 @@ version_major=2 version_minor=0 version_patch=0 -jei_version=4.3.0.252 +jei_version=4.3.1.253 jeibees_cf=2376/963 jeibees_version=0.9.0.4-mc1.11.2 diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 013c311a..fdd358fa 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -56,7 +56,7 @@ import java.util.List; useMetadata = true, dependencies = "required-after:forge@[13.20.0.2230,);" + "required-after:forestry@[5.3.2.68,);" + - "after:jei@[4.3.0,);" + "after:jei@[4.3.1,);" ) public final class BinnieCore extends AbstractMod { diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/src/main/java/binnie/core/integration/jei/Drawables.java index 2aaf959c..0fa9d5e0 100644 --- a/src/main/java/binnie/core/integration/jei/Drawables.java +++ b/src/main/java/binnie/core/integration/jei/Drawables.java @@ -31,7 +31,7 @@ public class Drawables { private Drawables(IGuiHelper guiHelper) { this.guiHelper = guiHelper; - this.tank = guiHelper.createDrawable(guiTank, 8, 28, 18, 60); + this.tank = guiHelper.createDrawable(guiTank, 8, 28, 18, 60, -1, -1, -1, -1); this.tankOverlay = guiHelper.createDrawable(guiTank, 33, 29, 16, 58); this.arrow = guiHelper.createDrawable(guiArrow, 191, 79, 14, 10); this.arrowWhite = guiHelper.createDrawable(guiArrow, 207, 79, 14, 10); diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index 5a3a1a9d..4a5a0ba6 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -40,34 +40,20 @@ public class BreweryRecipeCategory extends BlankRecipeCategory { @Override @@ -25,13 +24,6 @@ public class DatabaseRecipeCategory extends BlankRecipeCategory focus = recipeLayout.getFocus(); diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index 45cadce3..df66fd94 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -41,20 +41,10 @@ public class IsolatorRecipeCategory extends BlankRecipeCategory { if (slotIndex == 1) { tooltip.add("5x Processing Speed"); } }); + IDrawable tank = GeneticsJeiPlugin.drawables.getTank(); IDrawable tankOverlay = GeneticsJeiPlugin.drawables.getTankOverlay(); IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); fluidStacks.init(Polymeriser.TANK_BACTERIA, true, 1, 1, 16, 58, 10000, false, tankOverlay); + fluidStacks.setBackground(Polymeriser.TANK_BACTERIA, tank); fluidStacks.init(Polymeriser.TANK_DNA, true, 21, 1, 16, 58, 10000, false, tankOverlay); + fluidStacks.setBackground(Polymeriser.TANK_DNA, tank); fluidStacks.set(ingredients); } } diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java index 70665ff6..8f01ab38 100644 --- a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java @@ -7,7 +7,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class SequencerRecipeCategory extends BlankRecipeCategory { @Override @@ -25,15 +24,6 @@ public class SequencerRecipeCategory extends BlankRecipeCategory