From bf526920c4ab4bb6719e27c305a35e1772b2873b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 18 Jan 2019 21:22:16 +0800 Subject: Can't compile yet --- src/main/java/me/shedaniel/rei/api/IRecipeCategory.java | 15 ++++----------- .../me/shedaniel/rei/api/IRecipeCategoryCraftable.java | 5 ++--- src/main/java/me/shedaniel/rei/api/IRecipeDisplay.java | 8 ++++---- 3 files changed, 10 insertions(+), 18 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/api') diff --git a/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java b/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java index 4640b6d24..44fb1ad4d 100644 --- a/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java +++ b/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java @@ -1,26 +1,19 @@ package me.shedaniel.rei.api; -import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; -import me.shedaniel.rei.listeners.IMixinContainerGui; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormats; +import me.shedaniel.rei.listeners.IMixinGuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; +import net.minecraft.util.ResourceLocation; import java.awt.*; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; public interface IRecipeCategory { - public Identifier getIdentifier(); + public ResourceLocation getResourceLocation(); public ItemStack getCategoryIcon(); @@ -30,7 +23,7 @@ public interface IRecipeCategory { return false; } - default public List setupDisplay(IMixinContainerGui containerGui, T recipeDisplay, Rectangle bounds) { + default public List setupDisplay(IMixinGuiContainer containerGui, T recipeDisplay, Rectangle bounds) { return Arrays.asList(new RecipeBaseWidget(bounds)); } diff --git a/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java b/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java index 49156a943..d16f66654 100644 --- a/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java +++ b/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java @@ -1,8 +1,7 @@ package me.shedaniel.rei.api; import me.shedaniel.rei.gui.widget.IWidget; -import me.shedaniel.rei.gui.widget.RecipeViewingWidget; -import me.shedaniel.rei.listeners.IMixinContainerGui; +import me.shedaniel.rei.listeners.IMixinGuiContainer; import net.minecraft.client.gui.Gui; import java.awt.*; @@ -14,6 +13,6 @@ public interface IRecipeCategoryCraftable { public boolean performAutoCraft(Gui gui, T recipe); - public void registerAutoCraftButton(List widgets, Rectangle rectangle, IMixinContainerGui parentGui, T recipe); + public void registerAutoCraftButton(List widgets, Rectangle rectangle, IMixinGuiContainer parentGui, T recipe); } diff --git a/src/main/java/me/shedaniel/rei/api/IRecipeDisplay.java b/src/main/java/me/shedaniel/rei/api/IRecipeDisplay.java index 1a19b21c5..ae0800f1c 100644 --- a/src/main/java/me/shedaniel/rei/api/IRecipeDisplay.java +++ b/src/main/java/me/shedaniel/rei/api/IRecipeDisplay.java @@ -2,12 +2,12 @@ package me.shedaniel.rei.api; import com.google.common.collect.Lists; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.Recipe; -import net.minecraft.util.Identifier; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; import java.util.List; -public interface IRecipeDisplay { +public interface IRecipeDisplay { public abstract T getRecipe(); @@ -19,6 +19,6 @@ public interface IRecipeDisplay { return Lists.newArrayList(); } - public Identifier getRecipeCategory(); + public ResourceLocation getRecipeCategory(); } -- cgit