diff options
Diffstat (limited to 'api')
4 files changed, 6 insertions, 7 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchEntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchEntryRenderer.java index 89f1d0034..ba7e5d150 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchEntryRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchEntryRenderer.java @@ -44,7 +44,7 @@ public interface BatchEntryRenderer<T> extends EntryRenderer<T> { void renderBase(EntryStack<T> entry, PoseStack matrices, MultiBufferSource.BufferSource immediate, Rectangle bounds, int mouseX, int mouseY, float delta); - void renderOverlay(EntryStack<T> entry, PoseStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta); + void renderOverlay(EntryStack<T> entry, PoseStack matrices, MultiBufferSource.BufferSource immediate, Rectangle bounds, int mouseX, int mouseY, float delta); void endBatch(EntryStack<T> entry, PoseStack matrices, float delta); @@ -55,7 +55,8 @@ public interface BatchEntryRenderer<T> extends EntryRenderer<T> { MultiBufferSource.BufferSource immediate = Minecraft.getInstance().renderBuffers().bufferSource(); renderBase(entry, matrices, immediate, bounds, mouseX, mouseY, delta); immediate.endBatch(); - renderOverlay(entry, matrices, bounds, mouseX, mouseY, delta); + renderOverlay(entry, matrices, immediate, bounds, mouseX, mouseY, delta); + immediate.endBatch(); endBatch(entry, matrices, delta); } }
\ No newline at end of file diff --git a/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java b/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java index 7a74f3d8b..86c47e3fc 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java @@ -47,7 +47,7 @@ public interface Views extends Reloadable<REIClientPlugin> { * @param inventoryItems the materials * @return the list of craftable entries */ - Collection<EntryStack<?>> findCraftableEntriesByItems(Iterable<? extends EntryStack<?>> inventoryItems); + Collection<EntryStack<?>> findCraftableEntriesByMaterials(Iterable<? extends EntryStack<?>> inventoryItems); /** * Returns a map of recipes for an entry diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java index cd3defe83..b75624da0 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java @@ -126,8 +126,6 @@ public interface EntryStack<T> extends TextRepresentable, Renderer { @Deprecated int hashCode(); - int hash(ComparisonContext context); - @Deprecated boolean equals(Object o); diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java index b7882298b..58cf1ada5 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java @@ -158,7 +158,7 @@ public final class EntryStacks { * @return the hash code of the {@link ComparisonContext#EXACT} context */ public static <T> int hashExact(EntryStack<T> stack) { - return stack.hash(ComparisonContext.EXACT); + return stack.getDefinition().hash(stack, stack.getValue(), ComparisonContext.EXACT); } /** @@ -172,7 +172,7 @@ public final class EntryStacks { * @return the hash code of the {@link ComparisonContext#FUZZY} context */ public static <T> int hashFuzzy(EntryStack<T> stack) { - return stack.hash(ComparisonContext.FUZZY); + return stack.getDefinition().hash(stack, stack.getValue(), ComparisonContext.FUZZY); } public static EntryStack<FluidStack> simplifyAmount(EntryStack<FluidStack> stack) { |