Compiles again.

This commit is contained in:
Sebastian Hartte
2020-07-27 23:50:28 +02:00
parent 56ecda5173
commit 84e6aaa122
136 changed files with 1004 additions and 1108 deletions
@@ -28,6 +28,7 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.matrix.MatrixStack;
import jdk.nashorn.internal.objects.annotations.Function;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
@@ -43,7 +44,6 @@ import mezz.jei.api.gui.ingredient.IGuiItemStackGroup;
import mezz.jei.api.helpers.IGuiHelper;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.category.IRecipeCategory;
import mezz.jei.gui.HoverChecker;
import appeng.api.config.CondenserOutput;
import appeng.api.definitions.IMaterials;
@@ -68,8 +68,6 @@ class CondenserCategory implements IRecipeCategory<CondenserOutput> {
private final IDrawable icon;
private final HoverChecker buttonHoverChecker;
private final Map<CondenserOutput, IDrawable> buttonIcons;
public CondenserCategory(IGuiHelper guiHelper) {
@@ -94,7 +92,6 @@ class CondenserCategory implements IRecipeCategory<CondenserOutput> {
guiHelper.drawableBuilder(statesLocation, 16, 112, 14, 14).addPadding(28, 0, 78, 0).build());
this.buttonIcons.put(CondenserOutput.SINGULARITY,
guiHelper.drawableBuilder(statesLocation, 32, 112, 14, 14).addPadding(28, 0, 78, 0).build());
this.buttonHoverChecker = new HoverChecker(28, 28 + 16, 78, 78 + 16);
}
private ItemStack getOutput(CondenserOutput recipe) {
@@ -189,7 +186,7 @@ class CondenserCategory implements IRecipeCategory<CondenserOutput> {
@Override
public List<ITextComponent> getTooltipStrings(CondenserOutput output, double mouseX, double mouseY) {
if (this.buttonHoverChecker.checkHover((int) mouseX, (int) mouseY)) {
if (mouseX >= 28 && mouseX < 28 + 16 && mouseY >= 78 && mouseY < 78 + 16) {
String key;
switch (output) {
@@ -18,6 +18,7 @@
package appeng.integration.modules.jei;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
@@ -109,7 +110,7 @@ class InscriberRecipeCategory implements IRecipeCategory<InscriberRecipe> {
}
@Override
public void draw(InscriberRecipe recipe, double mouseX, double mouseY) {
this.progress.draw();
public void draw(InscriberRecipe recipe, MatrixStack matrixStack, double mouseX, double mouseY) {
this.progress.draw(matrixStack);
}
}
@@ -32,10 +32,6 @@ public enum TheOneProbeText {
this.root = "theoneprobe.appliedenergistics2";
}
public String getTranslationString(Object... args) {
return getTranslationComponent(args).getFormattedText();
}
public TranslationTextComponent getTranslationComponent(Object... args) {
return new TranslationTextComponent(this.getUnlocalized(), args);
}