From c1b0219e8d5458ddf1eccc194d34893f698b7d88 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 9 May 2019 22:38:34 +0800 Subject: VillagerRecipeViewingScreen done --- .../rei/gui/renderables/SimpleRecipeRenderer.java | 104 +++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java (limited to 'src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java') diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java new file mode 100644 index 000000000..6067993a9 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java @@ -0,0 +1,104 @@ +package me.shedaniel.rei.gui.renderables; + +import com.google.common.collect.Lists; +import me.shedaniel.rei.api.Renderable; +import me.shedaniel.rei.gui.VillagerRecipeViewingScreen; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.GuiLighting; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.math.MathHelper; + +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +public class SimpleRecipeRenderer extends RecipeRenderer { + + private static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); + private List inputRenderer; + private ItemStackRenderer outputRenderer; + + public SimpleRecipeRenderer(Supplier>> input, Supplier> output) { + List, AtomicInteger>> newList = Lists.newArrayList(); + List, Integer>> a = input.get().stream().map(stacks -> new Pair<>(stacks, stacks.stream().map(ItemStack::getAmount).max(Integer::compareTo).orElse(1))).collect(Collectors.toList()); + for(Pair, Integer> pair : a) { + Optional, AtomicInteger>> any = newList.stream().filter(pairr -> pair.getLeft().equals(pairr.getLeft())).findAny(); + if (any.isPresent()) { + any.get().getRight().addAndGet(pair.getRight()); + } else + newList.add(new Pair<>(pair.getLeft(), new AtomicInteger(pair.getRight()))); + } + List> b = Lists.newArrayList(); + for(Pair, AtomicInteger> pair : newList) + b.add(pair.getLeft().stream().map(stack -> { + ItemStack s = stack.copy(); + s.setAmount(pair.getRight().get()); + return s; + }).collect(Collectors.toList())); + this.inputRenderer = b.stream().filter(stacks -> !stacks.isEmpty()).map(stacks -> Renderable.fromItemStacks(stacks)).collect(Collectors.toList()); + this.outputRenderer = Renderable.fromItemStacks(output.get().stream().filter(stack -> !stack.isEmpty()).collect(Collectors.toList())); + } + + @Override + public void render(int x, int y, double mouseX, double mouseY, float delta) { + int xx = x + 5, yy = y + 5; + int j = 0; + int itemsPerLine = getItemsPerLine(); + for(ItemStackRenderer itemStackRenderer : inputRenderer) { + itemStackRenderer.setBlitOffset(getBlitOffset() + 50); + itemStackRenderer.drawTooltip = MinecraftClient.getInstance().currentScreen instanceof VillagerRecipeViewingScreen; + itemStackRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta); + xx += 18; + j++; + if (j >= getItemsPerLine()) { + yy += 18; + xx = x + 5; + j = 0; + } + } + if (itemsPerLine - j + 1 < 3) { + j = 0; + xx = x + 5; + yy += 18; + } + GuiLighting.disable(); + MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); + blit(xx, yy, 0, 28, 36, 18); + xx += 36; + j += 2; + if (j >= getItemsPerLine()) { + yy += 18; + xx = x + 5; + j = 0; + } + outputRenderer.setBlitOffset(getBlitOffset() + 50); + outputRenderer.drawTooltip = MinecraftClient.getInstance().currentScreen instanceof VillagerRecipeViewingScreen; + outputRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta); + } + + @Override + public int getHeight() { + return 10 + getEntriesHeight() * 18; + } + + public int getItemsHeight() { + return MathHelper.ceil(((float) inputRenderer.size()) / getItemsPerLine()); + } + + public int getEntriesHeight() { + int itemsPerLine = getItemsPerLine(); + if (itemsPerLine - (inputRenderer.size() - MathHelper.floor(((float) inputRenderer.size()) / itemsPerLine)) < 3) + return getItemsHeight() + 1; + else + return getItemsHeight(); + } + + public int getItemsPerLine() { + return MathHelper.floor((getWidth() - 10f) / 18f); + } + +} -- cgit From b53ef8fbcc2a892a1fe5e36687763432383c9e83 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 10 May 2019 00:05:20 +0800 Subject: better rendering --- .../rei/gui/renderables/SimpleRecipeRenderer.java | 27 ++++------------------ 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java') diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java index 6067993a9..bc76ec563 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java @@ -54,27 +54,18 @@ public class SimpleRecipeRenderer extends RecipeRenderer { itemStackRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta); xx += 18; j++; - if (j >= getItemsPerLine()) { + if (j >= getItemsPerLine() - 3) { yy += 18; xx = x + 5; j = 0; } } - if (itemsPerLine - j + 1 < 3) { - j = 0; - xx = x + 5; - yy += 18; - } + xx = x + 5 + 18 * (getItemsPerLine() - 3); + yy = y + getHeight() / 2 - 8; GuiLighting.disable(); MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE); blit(xx, yy, 0, 28, 36, 18); xx += 36; - j += 2; - if (j >= getItemsPerLine()) { - yy += 18; - xx = x + 5; - j = 0; - } outputRenderer.setBlitOffset(getBlitOffset() + 50); outputRenderer.drawTooltip = MinecraftClient.getInstance().currentScreen instanceof VillagerRecipeViewingScreen; outputRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta); @@ -82,19 +73,11 @@ public class SimpleRecipeRenderer extends RecipeRenderer { @Override public int getHeight() { - return 10 + getEntriesHeight() * 18; + return 10 + getItemsHeight() * 18; } public int getItemsHeight() { - return MathHelper.ceil(((float) inputRenderer.size()) / getItemsPerLine()); - } - - public int getEntriesHeight() { - int itemsPerLine = getItemsPerLine(); - if (itemsPerLine - (inputRenderer.size() - MathHelper.floor(((float) inputRenderer.size()) / itemsPerLine)) < 3) - return getItemsHeight() + 1; - else - return getItemsHeight(); + return MathHelper.ceil(((float) inputRenderer.size()) / (getItemsPerLine() - 3)); } public int getItemsPerLine() { -- cgit