From 86e9c7588dab15b783995105d06861740454a833 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 9 Jan 2019 23:35:45 +0800 Subject: Starting off rewrite --- src/main/java/me/shedaniel/gui/ConfigGui.java | 154 -------- src/main/java/me/shedaniel/gui/Drawable.java | 35 -- src/main/java/me/shedaniel/gui/GuiItemList.java | 397 --------------------- .../java/me/shedaniel/gui/REIRenderHelper.java | 280 --------------- .../java/me/shedaniel/gui/RecipeContainer.java | 14 - src/main/java/me/shedaniel/gui/RecipeGui.java | 287 --------------- src/main/java/me/shedaniel/gui/SearchArgument.java | 36 -- src/main/java/me/shedaniel/gui/widget/Button.java | 63 ---- src/main/java/me/shedaniel/gui/widget/Control.java | 127 ------- .../gui/widget/CraftableToggleButton.java | 76 ---- .../java/me/shedaniel/gui/widget/IFocusable.java | 12 - .../me/shedaniel/gui/widget/KeyBindButton.java | 59 --- src/main/java/me/shedaniel/gui/widget/REISlot.java | 188 ---------- .../java/me/shedaniel/gui/widget/SmallButton.java | 73 ---- src/main/java/me/shedaniel/gui/widget/Tab.java | 101 ------ src/main/java/me/shedaniel/gui/widget/TextBox.java | 85 ----- .../java/me/shedaniel/gui/widget/WidgetArrow.java | 50 --- 17 files changed, 2037 deletions(-) delete mode 100644 src/main/java/me/shedaniel/gui/ConfigGui.java delete mode 100755 src/main/java/me/shedaniel/gui/Drawable.java delete mode 100755 src/main/java/me/shedaniel/gui/GuiItemList.java delete mode 100755 src/main/java/me/shedaniel/gui/REIRenderHelper.java delete mode 100755 src/main/java/me/shedaniel/gui/RecipeContainer.java delete mode 100755 src/main/java/me/shedaniel/gui/RecipeGui.java delete mode 100644 src/main/java/me/shedaniel/gui/SearchArgument.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/Button.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/Control.java delete mode 100644 src/main/java/me/shedaniel/gui/widget/CraftableToggleButton.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/IFocusable.java delete mode 100644 src/main/java/me/shedaniel/gui/widget/KeyBindButton.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/REISlot.java delete mode 100644 src/main/java/me/shedaniel/gui/widget/SmallButton.java delete mode 100644 src/main/java/me/shedaniel/gui/widget/Tab.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/TextBox.java delete mode 100755 src/main/java/me/shedaniel/gui/widget/WidgetArrow.java (limited to 'src/main/java/me/shedaniel/gui') diff --git a/src/main/java/me/shedaniel/gui/ConfigGui.java b/src/main/java/me/shedaniel/gui/ConfigGui.java deleted file mode 100644 index 6deeb24ea..000000000 --- a/src/main/java/me/shedaniel/gui/ConfigGui.java +++ /dev/null @@ -1,154 +0,0 @@ -package me.shedaniel.gui; - -import me.shedaniel.ClientListener; -import me.shedaniel.Core; -import me.shedaniel.config.REIItemListOrdering; -import me.shedaniel.gui.widget.KeyBindButton; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.resource.language.I18n; - -import java.io.IOException; -import java.util.Arrays; - -public class ConfigGui extends Gui { - - private Gui parent; - - public ConfigGui(Gui parent) { - this.parent = parent; - } - - @Override - protected void onInitialized() { - addButton(new KeyBindButton(997, parent.width / 2 - 20, 30, 80, 20, Core.config.recipeKeyBind, key -> { - Core.config.recipeKeyBind = key; - ClientListener.recipeKeyBind.setKey(key); - try { - Core.saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - })); - addButton(new KeyBindButton(998, parent.width / 2 - 20, 60, 80, 20, Core.config.usageKeyBind, key -> { - Core.config.usageKeyBind = key; - ClientListener.usageKeyBind.setKey(key); - try { - Core.saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - })); - addButton(new KeyBindButton(999, parent.width / 2 - 20, 90, 80, 20, Core.config.hideKeyBind, key -> { - Core.config.hideKeyBind = key; - ClientListener.hideKeyBind.setKey(key); - try { - Core.saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - })); - addButton(new ButtonWidget(1000, parent.width / 2 - 90, 120, 150, 20, "") { - @Override - public void onPressed(double double_1, double double_2) { - Core.config.centreSearchBox = !Core.config.centreSearchBox; - try { - Core.saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void draw(int int_1, int int_2, float float_1) { - this.text = I18n.translate("text.rei.centre_searchbox", Core.config.centreSearchBox ? "§a" : "§c", Core.config.centreSearchBox); - super.draw(int_1, int_2, float_1); - if (this.hovered) - drawSuggestion(int_1, int_2); - } - - protected void drawSuggestion(int x, int y) { - drawTooltip(Arrays.asList(I18n.translate("text.rei.centre_searchbox.tooltip").split("\n")), x, y); - } - }); - addButton(new ButtonWidget(1001, parent.width / 2 - 90, 150, 150, 20, "") { - @Override - public void onPressed(double double_1, double double_2) { - Core.config.enableCraftableOnlyButton = !Core.config.enableCraftableOnlyButton; - try { - Core.saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void draw(int int_1, int int_2, float float_1) { - GuiLighting.disable(); - this.text = I18n.translate("text.rei.enable_craftable_only.button", Core.config.enableCraftableOnlyButton ? "§a" : "§c", Core.config.enableCraftableOnlyButton); - super.draw(int_1, int_2, float_1); - if (this.hovered) - drawSuggestion(int_1, int_2); - } - - protected void drawSuggestion(int x, int y) { - drawTooltip(Arrays.asList(I18n.translate("text.rei.enable_craftable_only.tooltip").split("\n")), x, y); - } - }); - addButton(new ButtonWidget(1002, parent.width / 2 - 90, 180, 150, 20, "") { - @Override - public void onPressed(double double_1, double double_2) { - int index = Arrays.asList(REIItemListOrdering.values()).indexOf(Core.config.itemListOrdering) + 1; - if (index >= REIItemListOrdering.values().length) { - index = 0; - Core.config.isAscending = !Core.config.isAscending; - } - Core.config.itemListOrdering = REIItemListOrdering.values()[index]; - try { - Core.saveConfig(); - REIRenderHelper.reiGui.updateView(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void draw(int int_1, int int_2, float float_1) { - GuiLighting.disable(); - this.text = I18n.translate("text.rei.list_ordering_button", I18n.translate(Core.config.itemListOrdering.getNameTranslationKey()), - I18n.translate(Core.config.isAscending ? "ordering.rei.ascending" : "ordering.rei.descending")); - super.draw(int_1, int_2, float_1); - } - }); - } - - @Override - public void draw(int mouseX, int mouseY, float partialTicks) { - drawBackground(); - super.draw(mouseX, mouseY, partialTicks); - GuiLighting.disable(); - String text = I18n.translate("key.rei.recipe") + ": "; - drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 30 + 6, -1); - text = I18n.translate("key.rei.use") + ": "; - drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 60 + 6, -1); - text = I18n.translate("key.rei.hide") + ": "; - drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 90 + 6, -1); - text = I18n.translate("text.rei.list_ordering") + ": "; - drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 95 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 180 + 6, -1); - } - - @Override - public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) { - if (p_keyPressed_1_ == 256 && this.doesEscapeKeyClose()) { - this.close(); - if (parent != null) - MinecraftClient.getInstance().openGui(parent); - return true; - } else { - return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_); - } - } - -} diff --git a/src/main/java/me/shedaniel/gui/Drawable.java b/src/main/java/me/shedaniel/gui/Drawable.java deleted file mode 100755 index a2e5740a4..000000000 --- a/src/main/java/me/shedaniel/gui/Drawable.java +++ /dev/null @@ -1,35 +0,0 @@ -package me.shedaniel.gui; - -import me.shedaniel.api.IDrawable; -import me.shedaniel.gui.widget.Control; - -import java.awt.*; - -/** - * Created by James on 7/28/2018. - */ -public abstract class Drawable implements IDrawable { - - protected Rectangle rect; - - public Drawable(int x, int y, int width, int height) { - rect = new Rectangle(x, y, width, height); - } - - public Drawable(Rectangle rect) { - this.rect = rect; - } - - public abstract void draw(); - - public boolean isHighlighted() { - Point mousePoint = REIRenderHelper.getMouseLoc(); - if (rect.contains(mousePoint.x, mousePoint.y)) { - if (this instanceof Control) - REIRenderHelper.reiGui.setLastHovered((Control) this); - return true; - } - return false; - } - -} diff --git a/src/main/java/me/shedaniel/gui/GuiItemList.java b/src/main/java/me/shedaniel/gui/GuiItemList.java deleted file mode 100755 index e62f21490..000000000 --- a/src/main/java/me/shedaniel/gui/GuiItemList.java +++ /dev/null @@ -1,397 +0,0 @@ -package me.shedaniel.gui; - -import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.ClientListener; -import me.shedaniel.Core; -import me.shedaniel.config.REIItemListOrdering; -import me.shedaniel.gui.widget.*; -import me.shedaniel.gui.widget.Button; -import me.shedaniel.impl.REIRecipeManager; -import me.shedaniel.listenerdefinitions.IMixinContainerGui; -import net.fabricmc.fabric.client.itemgroup.FabricCreativeGuiComponents; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.ContainerGui; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.Window; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.util.DefaultedList; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.registry.Registry; - -import java.awt.*; -import java.util.*; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class GuiItemList extends Drawable { - - public final int FOOTERSIZE; - private ContainerGui overlayedGui; - private static int page = 0; - private ArrayList displaySlots; - protected ArrayList controls; - private boolean needsResize = false; - Button buttonLeft, buttonRight, buttonCheating, buttonConfig; - private TextBox searchBox; - private ArrayList view; - private Control lastHovered; - protected boolean visible = true; - private int oldGuiLeft = 0; - private boolean cheatMode = false; - private List lastPlayerItems = new ArrayList<>(); - - public GuiItemList(ContainerGui overlayedGui) { - super(calculateRect(overlayedGui)); - FOOTERSIZE = Core.runtimeConfig.centreSearchBox ? 18 : 44; - displaySlots = new ArrayList<>(); - controls = new ArrayList<>(); - this.overlayedGui = overlayedGui; - view = new ArrayList<>(); - resize(); - } - - public boolean canCheat() { - ClientPlayerEntity player = MinecraftClient.getInstance().player; - if (cheatMode) { - if (!player.allowsPermissionLevel(1)) { - cheatClicked(0); - return false; - } - return true; - } - return false; - } - - private static Rectangle calculateRect(ContainerGui overlayedGui) { - Window res = REIRenderHelper.getResolution(); - int startX = (((IMixinContainerGui) overlayedGui).getGuiLeft() + ((IMixinContainerGui) overlayedGui).getXSize()) + 10; - int width = res.getScaledWidth() - startX; - return new Rectangle(startX, 0, width, res.getScaledHeight()); - } - - protected void resize() { - Window res = REIRenderHelper.getResolution(); - - if (overlayedGui != MinecraftClient.getInstance().currentGui) { - if (MinecraftClient.getInstance().currentGui instanceof ContainerGui) { - overlayedGui = (ContainerGui) MinecraftClient.getInstance().currentGui; - } else { - needsResize = true; - return; - } - } - oldGuiLeft = ((IMixinContainerGui) overlayedGui).getGuiLeft(); - rect = calculateRect(overlayedGui); - page = 0; - buttonLeft = new Button(rect.x, rect.y + 3, 16, 20, "<"); - buttonLeft.onClick = this::btnLeftClicked; - buttonRight = new Button(rect.x + rect.width - 18, rect.y + 3, 16, 20, ">"); - buttonRight.onClick = this::btnRightClicked; - controls.clear(); - controls.add(buttonLeft); - controls.add(buttonRight); - String savedText = ""; - if (searchBox != null) { - savedText = searchBox.getText(); - } - searchBox = new TextBox(getSearchBoxArea()); - searchBox.setText(savedText); - if (Core.config.enableCraftableOnlyButton) { - CraftableToggleButton buttonCraftableOnly = new CraftableToggleButton(getCraftableToggleArea()); - buttonCraftableOnly.setOnClick(i -> { - Core.runtimeConfig.craftableOnly = !Core.runtimeConfig.craftableOnly; - REIRenderHelper.updateSearch(); - return true; - }); - controls.add(buttonCraftableOnly); - } - controls.add(searchBox); - buttonCheating = new Button(5, 5, 45, 20, getCheatModeText()); - buttonCheating.onClick = this::cheatClicked; - buttonConfig = new Button(5, 28, 45, 20, I18n.translate("text.rei.config")); - buttonConfig.onClick = i -> { - MinecraftClient.getInstance().openGui(null); - MinecraftClient.getInstance().openGui(new ConfigGui(overlayedGui)); - return true; - }; - controls.add(buttonConfig); - controls.add(buttonCheating); - calculateSlots(); - updateView(); - fillSlots(); - controls.addAll(displaySlots); - } - - private Rectangle getSearchBoxArea() { - int widthOffset = Core.config.enableCraftableOnlyButton ? -24 : 0; - int ch = ((IMixinContainerGui) overlayedGui).getContainerHeight(), cw = ((IMixinContainerGui) overlayedGui).getContainerWidth(); - if (Core.runtimeConfig.centreSearchBox) { - if (ch + 4 + 18 > MinecraftClient.getInstance().window.getScaledHeight()) //Will be out of bounds - return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height + 100, cw + widthOffset, 18); - return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height - 31, cw + widthOffset, 18); - } - return new Rectangle(rect.x, rect.height - 31, rect.width - 4 + widthOffset, 18); - } - - private Rectangle getCraftableToggleArea() { - Rectangle searchBoxArea = getSearchBoxArea(); - searchBoxArea.setLocation(searchBoxArea.x + searchBoxArea.width + 4, searchBoxArea.y - 1); - searchBoxArea.setSize(20, 20); - return searchBoxArea; - } - - private void fillSlots() { - page = MathHelper.clamp(page, 0, MathHelper.ceil(view.size() / displaySlots.size())); - int firstSlot = page * displaySlots.size(); - for(int i = 0; i < displaySlots.size(); i++) { - if (firstSlot + i < view.size() && firstSlot + i >= 0) { - displaySlots.get(i).setStack(view.get(firstSlot + i)); - } else { - displaySlots.get(i).setStack(ItemStack.EMPTY); - } - } - } - - private void calculateSlots() { - int x = rect.x, y = rect.y + 20; - Window res = REIRenderHelper.getResolution(); - displaySlots.clear(); - int xOffset = 0, yOffset = 0, row = 0, perRow = 0, currentX = 0, currentY = 0; - while (true) { - xOffset += 18; - if (row == 0) - perRow++; - if (x + xOffset + 22 > res.getScaledWidth()) { - xOffset = 0; - yOffset += 18; - row++; - } - if (y + yOffset + 9 + FOOTERSIZE > rect.height) { - xOffset = 0; - yOffset = 0; - break; - } - } - x += (rect.width - perRow * 18) / 2; - y += (rect.height - FOOTERSIZE - 2 - row * 18) / 2; - while (true) { - REISlot slot = new REISlot(x + xOffset, y + yOffset); - slot.setCheatable(true); - if (REIRecipeManager.instance().canAddSlot(MinecraftClient.getInstance().currentGui.getClass(), slot.rect)) - displaySlots.add(slot); - xOffset += 18; - currentX++; - if (currentX >= perRow) { - xOffset = 0; - yOffset += 18; - currentX = 0; - currentY++; - } - if (currentY >= row) - break; - } - } - - @Override - public void draw() { - if (!visible) - return; - if (MinecraftClient.getInstance().currentGui instanceof ContainerGui) - overlayedGui = (ContainerGui) MinecraftClient.getInstance().currentGui; - if (needsResize == true || oldGuiLeft != ((IMixinContainerGui) overlayedGui).getGuiLeft()) - resize(); - else if (Core.runtimeConfig.craftableOnly && (!hasSameListContent(new LinkedList<>(lastPlayerItems), getInventoryItemsTypes()) || (getInventoryItemsTypes().size() != lastPlayerItems.size()))) { - this.lastPlayerItems = new LinkedList<>(getInventoryItemsTypes()); - updateView(); - } - GlStateManager.pushMatrix(); - updateButtons(); - controls.forEach(Control::draw); - GuiLighting.disable(); - String header = String.format("%s/%s", page + 1, MathHelper.ceil(view.size() / displaySlots.size()) + 1); - MinecraftClient.getInstance().fontRenderer.drawWithShadow(header, rect.x + (rect.width / 2) - (MinecraftClient.getInstance().fontRenderer.getStringWidth(header) / 2), rect.y + 10, -1); - GlStateManager.popMatrix(); - } - - private boolean hasSameListContent(List list1, List list2) { - Collections.sort(list1, (itemStack, t1) -> { - return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText()); - }); - Collections.sort(list2, (itemStack, t1) -> { - return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText()); - }); - String lastString = String.join("", list1.stream().map(itemStack -> { - return itemStack.getDisplayName().getFormattedText(); - }).collect(Collectors.toList())), currentString = String.join("", list2.stream().map(itemStack -> { - return itemStack.getDisplayName().getFormattedText(); - }).collect(Collectors.toList())); - return lastString.equals(currentString); - } - - private void updateButtons() { - buttonLeft.setEnabled(MathHelper.ceil(view.size() / displaySlots.size()) > 1); - buttonRight.setEnabled(MathHelper.ceil(view.size() / displaySlots.size()) > 1); - } - - public boolean btnRightClicked(int button) { - if (button == 0) { - page++; - if (page > MathHelper.ceil(view.size() / displaySlots.size())) - page = 0; - fillSlots(); - return true; - } - return false; - } - - public boolean btnLeftClicked(int button) { - if (button == 0) { - page--; - if (page < 0) - page = MathHelper.ceil(view.size() / displaySlots.size()); - fillSlots(); - return true; - } - return false; - } - - public boolean cheatClicked(int button) { - if (button == 0) { - cheatMode = !cheatMode; - buttonCheating.setString(getCheatModeText()); - return true; - } - return false; - } - - private String getCheatModeText() { - return I18n.translate(String.format("%s%s", "text.rei.", cheatMode ? "cheat" : "nocheat")); - } - - protected void updateView() { - String searchText = searchBox.getText(); - view.clear(); - List stacks = new ArrayList<>(); - if (ClientListener.stackList == null && !Registry.ITEM.isEmpty()) - Core.getListeners(ClientListener.class).forEach(ClientListener::onDoneLoading); - if (ClientListener.stackList != null) { - List stackList = new LinkedList<>(ClientListener.stackList); - List itemGroups = new LinkedList<>(Arrays.asList(ItemGroup.GROUPS)); - FabricCreativeGuiComponents.COMMON_GROUPS.forEach(itemGroups::add); - itemGroups.add(null); - if (Core.config.itemListOrdering != REIItemListOrdering.REGISTRY) - Collections.sort(stackList, (itemStack, t1) -> { - if (Core.config.itemListOrdering.equals(REIItemListOrdering.NAME)) - return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText()); - if (Core.config.itemListOrdering.equals(REIItemListOrdering.ITEM_GROUPS)) - return itemGroups.indexOf(itemStack.getItem().getItemGroup()) - itemGroups.indexOf(t1.getItem().getItemGroup()); - return 0; - }); - if (!Core.config.isAscending) - Collections.reverse(stackList); - Arrays.stream(searchText.split("\\|")).forEachOrdered(s -> { - List arguments = new ArrayList<>(); - while (s.startsWith(" ")) s = s.substring(1); - while (s.endsWith(" ")) s = s.substring(0, s.length()); - if (s.startsWith("@-") || s.startsWith("-@")) - arguments.add(new SearchArgument(SearchArgument.ArgumentType.MOD, s.substring(2), false)); - else if (s.startsWith("@")) - arguments.add(new SearchArgument(SearchArgument.ArgumentType.MOD, s.substring(1), true)); - else if (s.startsWith("#-") || s.startsWith("-#")) - arguments.add(new SearchArgument(SearchArgument.ArgumentType.TOOLTIP, s.substring(2), false)); - else if (s.startsWith("#")) - arguments.add(new SearchArgument(SearchArgument.ArgumentType.TOOLTIP, s.substring(1), true)); - else if (s.startsWith("-")) - arguments.add(new SearchArgument(SearchArgument.ArgumentType.TEXT, s.substring(1), false)); - else - arguments.add(new SearchArgument(SearchArgument.ArgumentType.TEXT, s, true)); - stackList.stream().filter(itemStack -> filterItem(itemStack, arguments)).forEachOrdered(stacks::add); - }); - } - List workingItems = ClientListener.stackList == null || (Core.runtimeConfig.craftableOnly && lastPlayerItems.size() > 0) ? new ArrayList<>() : ClientListener.stackList; - if (Core.runtimeConfig.craftableOnly) { - REIRecipeManager.instance().findCraftableByItems(lastPlayerItems).forEach(workingItems::add); - workingItems.addAll(lastPlayerItems); - } - final List finalWorkingItems = workingItems; - view.addAll(stacks.stream().filter(itemStack -> { - if (!Core.runtimeConfig.craftableOnly) - return true; - for(ItemStack workingItem : finalWorkingItems) - if (itemStack.isEqualIgnoreTags(workingItem)) - return true; - return false; - }).distinct().collect(Collectors.toList())); - page = 0; - fillSlots(); - } - - private List getInventoryItemsTypes() { - List> field_7543 = ImmutableList.of(MinecraftClient.getInstance().player.inventory.main, MinecraftClient.getInstance().player.inventory.armor - , MinecraftClient.getInstance().player.inventory.offHand); - List inventoryStacks = new ArrayList<>(); - field_7543.forEach(itemStacks -> itemStacks.forEach(itemStack -> { - if (!itemStack.getItem().equals(Items.AIR)) - inventoryStacks.add(itemStack); - })); - return inventoryStacks; - } - - private boolean filterItem(ItemStack itemStack, List arguments) { - String mod = getMod(itemStack); - List toolTipsList = REIRenderHelper.getOverlayedGui().getStackTooltip(itemStack); - String toolTipsMixed = toolTipsList.stream().skip(1).collect(Collectors.joining()).toLowerCase(); - String allMixed = Stream.of(itemStack.getDisplayName().getString(), toolTipsMixed).collect(Collectors.joining()).toLowerCase(); - for(SearchArgument searchArgument : arguments.stream().filter(searchArgument -> !searchArgument.isInclude()).collect(Collectors.toList())) { - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.MOD)) - if (mod.toLowerCase().contains(searchArgument.getText().toLowerCase())) - return false; - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TOOLTIP)) - if (toolTipsMixed.contains(searchArgument.getText().toLowerCase())) - return false; - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TEXT)) - if (allMixed.contains(searchArgument.getText().toLowerCase())) - return false; - } - for(SearchArgument searchArgument : arguments.stream().filter(SearchArgument::isInclude).collect(Collectors.toList())) { - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.MOD)) - if (!mod.toLowerCase().contains(searchArgument.getText().toLowerCase())) - return false; - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TOOLTIP)) - if (!toolTipsMixed.contains(searchArgument.getText().toLowerCase())) - return false; - if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TEXT)) - if (!allMixed.contains(searchArgument.getText().toLowerCase())) - return false; - } - return true; - } - - public void tick() { - controls.forEach(f -> f.tick()); - } - - public void setLastHovered(Control ctrl) { - lastHovered = ctrl; - } - - public Control getLastHovered() { - return lastHovered; - } - - private String getMod(ItemStack stack) { - if (stack != null && !stack.isEmpty()) { - Identifier location = Registry.ITEM.getId(stack.getItem()); - return location.getNamespace(); - } - return ""; - } - -} diff --git a/src/main/java/me/shedaniel/gui/REIRenderHelper.java b/src/main/java/me/shedaniel/gui/REIRenderHelper.java deleted file mode 100755 index 81d5be801..000000000 --- a/src/main/java/me/shedaniel/gui/REIRenderHelper.java +++ /dev/null @@ -1,280 +0,0 @@ -package me.shedaniel.gui; - -import me.shedaniel.ClientListener; -import me.shedaniel.gui.widget.Control; -import me.shedaniel.gui.widget.IFocusable; -import me.shedaniel.gui.widget.REISlot; -import me.shedaniel.impl.REIRecipeManager; -import me.shedaniel.listenerdefinitions.IMixinContainerGui; -import net.fabricmc.loader.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.FontRenderer; -import net.minecraft.client.gui.ContainerGui; -import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.util.Window; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - - -/** - * Created by James on 7/28/2018. - */ -public class REIRenderHelper { - - static Point mouseLoc; - static public GuiItemList reiGui; - static ContainerGui overlayedGui; - static List tooltipsToRender = new ArrayList<>(); - - public static void setMouseLoc(int x, int y) { - mouseLoc = new Point(x, y); - } - - static public IFocusable focusedControl; - - public static Point getMouseLoc() { - return mouseLoc; - } - - public static Window getResolution() { - return MinecraftClient.getInstance().window; - } - - public static String tryGettingModName(String modid) { - if (modid.equalsIgnoreCase("minecraft")) - return "Minecraft"; - return FabricLoader.INSTANCE.getModContainers().stream() - .map(modContainer -> { - return modContainer.getInfo(); - }) - .filter(modInfo -> modInfo.getId().equals(modid) || (modInfo.getName() != null && modInfo.getName().equals(modid))) - .findFirst().map(modInfo -> { - if (modInfo.getName() != null) - return modInfo.getName(); - return modid; - }).orElse(modid); - } - - public static void drawREI(ContainerGui overlayedGui) { - REIRenderHelper.overlayedGui = overlayedGui; - if (reiGui == null) { - reiGui = new GuiItemList(overlayedGui); - } - reiGui.draw(); - renderTooltips(); - } - - public static void resize(int scaledWidth, int scaledHeight) { - if (reiGui != null) { - reiGui.resize(); - } - if (overlayedGui instanceof RecipeGui) { - overlayedGui.onScaleChanged(MinecraftClient.getInstance(), scaledWidth, scaledHeight); - } - } - - public static ItemRenderer getItemRender() { - return MinecraftClient.getInstance().getItemRenderer(); - } - - public static FontRenderer getFontRenderer() { - return MinecraftClient.getInstance().fontRenderer; - } - - public static ContainerGui getOverlayedGui() { - if (overlayedGui instanceof ContainerGui) - return overlayedGui; - return null; - } - - public static void addToolTip(List text, int x, int y) { - tooltipsToRender.add(new TooltipData(text, x, y)); - } - - - private static void renderTooltips() { - tooltipsToRender.forEach(tooltipData -> getOverlayedGui().drawTooltip(tooltipData.text, tooltipData.x, tooltipData.y)); - tooltipsToRender.clear(); - } - - public static boolean mouseClick(int x, int y, int button) { - if (reiGui.visible) { - for(Control control : reiGui.controls) { - if (control.isHighlighted() && control.isEnabled() && control.onClick != null) { - if (focusedControl != null) - focusedControl.setFocused(false); - if (control instanceof IFocusable) { - focusedControl = (IFocusable) control; - ((IFocusable) control).setFocused(true); - } - return control.onClick.apply(button); - } - } - if (focusedControl != null) { - focusedControl.setFocused(false); - focusedControl = null; - } - } - if (overlayedGui instanceof RecipeGui) { - List controls = new LinkedList<>(((RecipeGui) overlayedGui).controls); - if (((RecipeGui) overlayedGui).slots != null) - controls.addAll(((RecipeGui) overlayedGui).slots); - controls.addAll(reiGui.controls.stream().filter(control -> { - return control instanceof REISlot; - }).collect(Collectors.toList())); - Optional ctrl = controls.stream().filter(Control::isHighlighted).filter(Control::isEnabled).findFirst(); - if (ctrl.isPresent()) { - try { - return ctrl.get().onClick.apply(button); - } catch (Exception e) { - } - } - } - return false; - } - - public static boolean keyDown(int typedChar, int keyCode, int unknown) { - boolean handled = false; - if (focusedControl != null && focusedControl instanceof Control) { - Control control = (Control) focusedControl; - if (control.onKeyDown != null) { - handled = control.onKeyDown.accept(typedChar, keyCode, unknown); - } - if (control.charPressed != null) - if (typedChar == 256) { - ((IFocusable) control).setFocused(false); - focusedControl = null; - } - handled = true; - } - if (!handled) { - return ClientListener.processGuiKeyBinds(typedChar); - } - return handled; - } - - public static boolean charInput(long num, int keyCode, int unknown) { - if (focusedControl != null && focusedControl instanceof Control) { - Control control = (Control) focusedControl; - if (control.charPressed != null) { - int numChars = Character.charCount(keyCode); - if (num == numChars) - control.charPressed.accept((char) keyCode, unknown); - else { - char[] chars = Character.toChars(keyCode); - for(int x = 0; x < chars.length; x++) { - control.charPressed.accept(chars[x], unknown); - } - } - return true; - } - } - return false; - } - - public static boolean mouseScrolled(double direction) { - if (!reiGui.visible) - return false; - if (MinecraftClient.getInstance().currentGui instanceof RecipeGui) { - Window window = REIRenderHelper.getResolution(); - Point mouse = new Point((int) MinecraftClient.getInstance().mouse.getX(), (int) MinecraftClient.getInstance().mouse.getY()); - int mouseX = (int) (mouse.x * (double) window.getScaledWidth() / (double) window.method_4480()); - int mouseY = (int) (mouse.y * (double) window.getScaledHeight() / (double) window.method_4507()); - mouse = new Point(mouseX, mouseY); - - RecipeGui recipeGui = (RecipeGui) MinecraftClient.getInstance().currentGui; - if (mouse.getX() < window.getScaledWidth() / 2 + recipeGui.guiWidth / 2 && mouse.getX() > window.getScaledWidth() / 2 - recipeGui.guiWidth / 2 && - mouse.getY() < window.getScaledHeight() / 2 + recipeGui.guiHeight / 2 && mouse.getY() > window.getScaledHeight() / 2 - recipeGui.guiHeight / 2 && - recipeGui.recipes.get(recipeGui.selectedCategory).size() > 2) { - boolean failed = false; - if (direction > 0 && reiGui.buttonLeft.isEnabled()) - recipeGui.btnRecipeLeft.onClick.apply(0); - else if (direction < 0 && reiGui.buttonRight.isEnabled()) - recipeGui.btnRecipeRight.onClick.apply(0); - else failed = true; - if (!failed) - return true; - } - } - if (direction > 0 && reiGui.buttonLeft.isEnabled()) - reiGui.buttonLeft.onClick.apply(0); - else if (direction < 0 && reiGui.buttonRight.isEnabled()) - reiGui.buttonRight.onClick.apply(0); - return true; - } - - private static class TooltipData { - - private final List text; - private final int x; - private final int y; - - public TooltipData(List text, int x, int y) { - this.text = text; - this.x = x; - this.y = y; - } - } - - public static void updateSearch() { - reiGui.updateView(); - } - - public static void tick() { - if (reiGui != null && MinecraftClient.getInstance().currentGui == overlayedGui) - reiGui.tick(); - } - - public static boolean isGuiVisible() { - return reiGui != null && reiGui.visible; - } - - public static boolean recipeKeyBind() { - if (!(MinecraftClient.getInstance().currentGui instanceof ContainerGui)) - return false; - Control control = reiGui.getLastHovered(); - if (control != null && control.isHighlighted() && control instanceof REISlot) { - REISlot slot = (REISlot) control; - REIRecipeManager.instance().displayRecipesFor(slot.getStack()); - return true; - } - if (((IMixinContainerGui) overlayedGui).getHoveredSlot() != null) { - ItemStack stack = ((IMixinContainerGui) overlayedGui).getHoveredSlot().getStack(); - REIRecipeManager.instance().displayRecipesFor(stack); - return true; - } - return false; - } - - public static boolean useKeyBind() { - if (!(MinecraftClient.getInstance().currentGui instanceof ContainerGui)) - return false; - Control control = reiGui.getLastHovered(); - if (control != null && control.isHighlighted() && control instanceof REISlot) { - REISlot slot = (REISlot) control; - REIRecipeManager.instance().displayUsesFor(slot.getStack()); - return true; - } - if (((IMixinContainerGui) overlayedGui).getHoveredSlot() != null) { - ItemStack stack = ((IMixinContainerGui) overlayedGui).getHoveredSlot().getStack(); - REIRecipeManager.instance().displayUsesFor(stack); - return true; - } - return false; - } - - public static boolean hideKeyBind() { - if (MinecraftClient.getInstance().currentGui == overlayedGui && reiGui != null) { - reiGui.visible = !reiGui.visible; - return true; - } - return false; - } - -} diff --git a/src/main/java/me/shedaniel/gui/RecipeContainer.java b/src/main/java/me/shedaniel/gui/RecipeContainer.java deleted file mode 100755 index 4477a10db..000000000 --- a/src/main/java/me/shedaniel/gui/RecipeContainer.java +++ /dev/null @@ -1,14 +0,0 @@ -package me.shedaniel.gui; - - -import net.minecraft.container.Container; -import net.minecraft.entity.player.PlayerEntity; - -public class RecipeContainer extends Container { - - @Override - public boolean canUse(PlayerEntity playerEntity) { - return true; - } - -} diff --git a/src/main/java/me/shedaniel/gui/RecipeGui.java b/src/main/java/me/shedaniel/gui/RecipeGui.java deleted file mode 100755 index 7e6acdef9..000000000 --- a/src/main/java/me/shedaniel/gui/RecipeGui.java +++ /dev/null @@ -1,287 +0,0 @@ -package me.shedaniel.gui; - -import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.api.IDisplayCategoryCraftable; -import me.shedaniel.api.IDisplayCategory; -import me.shedaniel.api.IRecipe; -import me.shedaniel.gui.widget.Button; -import me.shedaniel.gui.widget.Control; -import me.shedaniel.gui.widget.REISlot; -import me.shedaniel.gui.widget.Tab; -import me.shedaniel.impl.REIRecipeManager; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.ContainerGui; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.util.Window; -import net.minecraft.container.Container; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; - -import java.util.*; - -public class RecipeGui extends ContainerGui { - - private static final Identifier CREATIVE_INVENTORY_TABS = new Identifier("textures/gui/container/creative_inventory/tabs.png"); - private static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); - private final Window mainWindow; - private final Container container; - private final Gui prevScreen; - public final Map> recipes; - public final int guiWidth = 176; - public final int guiHeight = 222; - ArrayList categories = new ArrayList<>(); - private int categoryTabPage = 0; - public IDisplayCategory selectedCategory; - private int recipePointer = 0; - public List slots; - List controls = new LinkedList<>(); - private List tabs; - private boolean tabsEnabled = false; - private Button btnCategoryPageLeft, btnCategoryPageRight; - public Button btnRecipeLeft, btnRecipeRight; - - public RecipeGui(Container p_i1072_1_, Gui prevScreen, Map> recipes) { - super(new RecipeContainer()); - this.container = p_i1072_1_; - this.prevScreen = prevScreen; - this.recipes = recipes; - this.client = MinecraftClient.getInstance(); - this.itemRenderer = client.getItemRenderer(); - this.fontRenderer = client.fontRenderer; - this.mainWindow = client.window; - - setupCategories(); - } - - public Gui getPrevScreen() { - return prevScreen; - } - - private void setupCategories() { - for(IDisplayCategory adapter : REIRecipeManager.instance().getDisplayAdapters()) - if (recipes.containsKey(adapter)) - categories.add(adapter); - selectedCategory = categories.get(0); - categoryTabPage = 0; - tabs = new ArrayList<>(); - for(int i = 0; i < 6; i++) - tabs.add(new Tab(i, 0, 0, 0, 28, 32)); - tabs.forEach(tab -> tab.setOnClick(i -> { - if (tab.getId() + categoryTabPage * 6 == categories.indexOf(selectedCategory)) - return false; - selectedCategory = categories.get(tab.getId() + categoryTabPage * 6); - recipePointer = 0; - updateRecipe(); - return false; - })); - updateRecipe(); - } - - @Override - public void draw(int mouseX, int mouseY, float partialTicks) { - drawBackground(); - super.draw(mouseX, mouseY, partialTicks); - int y = (int) ((mainWindow.getScaledHeight() / 2 - this.guiHeight / 2)); - GuiLighting.disable(); - drawStringCentered(this.fontRenderer, selectedCategory.getDisplayName(), left + guiWidth / 2, y + 11, -1); - drawStringCentered(this.fontRenderer, String.format("%d/%d", 1 + getCurrentPage(), getTotalPages()), left + guiWidth / 2, y + 34, -1); - controls.forEach(Control::draw); - } - - private int getCurrentPage() { - return recipePointer / 2; - } - - @Override - public void update() { - super.update(); - slots.forEach(REISlot::tick); - controls.forEach(Control::tick); - } - - @Override - public void onScaleChanged(MinecraftClient p_onResize_1_, int p_onResize_2_, int p_onResize_3_) { - super.onScaleChanged(p_onResize_1_, p_onResize_2_, p_onResize_3_); - updateRecipe(); - } - - private void updateRecipe() { - IRecipe recipe = recipes.get(selectedCategory).get(recipePointer); - selectedCategory.resetRecipes(); - selectedCategory.addRecipe(recipe); - slots = selectedCategory.setupDisplay(0); - if (recipes.get(selectedCategory).size() >= recipePointer + 2) { - IRecipe recipe2 = recipes.get(selectedCategory).get(recipePointer + 1); - selectedCategory.addRecipe(recipe2); - slots.addAll(selectedCategory.setupDisplay(1)); - } - - left = (int) ((mainWindow.getScaledWidth() / 2 - this.guiWidth / 2)); - top = (int) ((mainWindow.getScaledHeight() / 2 - this.guiHeight / 2)); - - slots.forEach(reiSlot -> reiSlot.move(left, top)); - - Button btnCategoryLeft = new Button(left + 10, top + 5, 15, 20, "<"); - Button btnCategoryRight = new Button(left + guiWidth - 25, top + 5, 15, 20, ">"); - btnCategoryRight.onClick = this::btnCategoryRight; - btnCategoryLeft.onClick = this::btnCategoryLeft; - - btnRecipeLeft = new Button(left + 10, top + 28, 15, 20, "<"); - btnRecipeRight = new Button(left + guiWidth - 25, top + 28, 15, 20, ">"); - btnRecipeLeft.setEnabled(recipes.get(selectedCategory).size() > 2); - btnRecipeRight.setEnabled(recipes.get(selectedCategory).size() > 2); - btnRecipeRight.onClick = this::btnRecipeRight; - btnRecipeLeft.onClick = this::btnRecipeLeft; - - controls.clear(); - controls.add(btnCategoryLeft); - controls.add(btnCategoryRight); - if (categories.size() <= 1) { - btnCategoryLeft.setEnabled(false); - btnCategoryRight.setEnabled(false); - } else if (categories.size() > 6) { - btnCategoryPageLeft = new Button(left, top - 52, 20, 20, "<"); - btnCategoryPageRight = new Button(left + guiWidth - 20, top - 52, 20, 20, ">"); - btnCategoryPageLeft.setOnClick(i -> { - categoryTabPage--; - if (categoryTabPage <= 0) - categoryTabPage = MathHelper.ceil(categories.size() / 6d); - updateRecipe(); - return true; - }); - btnCategoryPageRight.setOnClick(i -> { - categoryTabPage++; - if (categoryTabPage >= MathHelper.ceil(categories.size() / 6d)) - categoryTabPage = 0; - updateRecipe(); - return true; - }); - if (top - 52 >= 2) - controls.addAll(Arrays.asList(btnCategoryPageLeft, btnCategoryPageRight)); - } - - controls.add(btnRecipeLeft); - controls.add(btnRecipeRight); - - List newControls = new LinkedList<>(); - selectedCategory.addWidget(newControls, 0); - if (selectedCategory instanceof IDisplayCategoryCraftable) - ((IDisplayCategoryCraftable) selectedCategory).registerAutoCraftButton(newControls, this, getPrevScreen(), recipe, 0); - if (recipes.get(selectedCategory).size() >= recipePointer + 2) { - selectedCategory.addWidget(newControls, 1); - if (selectedCategory instanceof IDisplayCategoryCraftable) - ((IDisplayCategoryCraftable) selectedCategory).registerAutoCraftButton(newControls, this, getPrevScreen(), recipes.get(selectedCategory).get(recipePointer + 1), 1); - } - newControls.forEach(f -> f.move(left, top)); - controls.addAll(newControls); - - updateTabs(); - } - - private void updateTabs() { - tabsEnabled = top - 28 > 4; - if (tabsEnabled) { - tabs.forEach(tab -> tab.moveTo(left + 4, left + 2 + tabs.indexOf(tab) * 28, top - 28)); - for(int i = 0; i < tabs.size(); i++) { - int ref = i + categoryTabPage * 6; - if (categories.size() > ref) { - tabs.get(i).setItem(categories.get(ref).getCategoryIcon(), categories.get(ref).getDisplayName(), categories.get(ref).equals(selectedCategory)); - } else tabs.get(i).setItem(null, null, false); - } - controls.addAll(tabs); - } - } - - @Override - protected void drawBackground(float v, int i, int i1) { - //Tabs - if (tabsEnabled) { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiLighting.enableForItems(); - this.client.getTextureManager().bindTexture(CREATIVE_INVENTORY_TABS); - tabs.stream().filter(tab -> tab.getId() + categoryTabPage * 6 == categories.indexOf(selectedCategory)).forEach(Tab::drawTab); - } - - drawBackground(); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiLighting.disable(); - this.client.getTextureManager().bindTexture(CHEST_GUI_TEXTURE); - - int lvt_4_1_ = (int) ((mainWindow.getScaledWidth() / 2 - this.guiWidth / 2)); - int lvt_5_1_ = (int) ((mainWindow.getScaledHeight() / 2 - this.guiHeight / 2)); - - this.drawTexturedRect(lvt_4_1_, lvt_5_1_, 0, 0, this.guiWidth, this.guiHeight); - slots.forEach(reiSlot -> { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiLighting.disable(); - reiSlot.draw(); - }); - - if (tabsEnabled) - tabs.stream().filter(tab -> tab.getId() + categoryTabPage * 6 != categories.indexOf(selectedCategory)).forEach(tab -> { - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiLighting.enableForItems(); - this.client.getTextureManager().bindTexture(CREATIVE_INVENTORY_TABS); - tab.drawTab(); - }); - } - - @Override - public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) { - if (p_keyPressed_1_ == 256 && prevScreen != null) { - this.client.openGui(prevScreen); - return true; - } - return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_); - } - - private boolean btnCategoryLeft(int button) { - recipePointer = 0; - int categoryPointer = categories.indexOf(selectedCategory); - categoryPointer--; - if (categoryPointer <= 0) - categoryPointer = categories.size() - 1; - selectedCategory = categories.get(categoryPointer); - categoryTabPage = categoryPointer / 6; - updateRecipe(); - return true; - } - - private boolean btnCategoryRight(int button) { - recipePointer = 0; - int categoryPointer = categories.indexOf(selectedCategory); - categoryPointer++; - if (categoryPointer >= categories.size()) - categoryPointer = 0; - selectedCategory = categories.get(categoryPointer); - categoryTabPage = categoryPointer / 6; - updateRecipe(); - return true; - } - - private boolean btnRecipeLeft(int button) { - recipePointer -= 2; - if (recipePointer <= 0) - recipePointer = MathHelper.floor((recipes.get(selectedCategory).size() - 1) / 2d) * 2; - updateRecipe(); - return true; - } - - private boolean btnRecipeRight(int button) { - recipePointer += 2; - if (recipePointer >= recipes.get(selectedCategory).size()) - recipePointer = 0; - updateRecipe(); - return true; - } - - private int riseDoublesToInt(double i) { - return MathHelper.ceil(i); - } - - private int getTotalPages() { - return MathHelper.clamp(riseDoublesToInt(recipes.get(selectedCategory).size() / 2d), 1, Integer.MAX_VALUE); - } - -} diff --git a/src/main/java/me/shedaniel/gui/SearchArgument.java b/src/main/java/me/shedaniel/gui/SearchArgument.java deleted file mode 100644 index 5eeddf01c..000000000 --- a/src/main/java/me/shedaniel/gui/SearchArgument.java +++ /dev/null @@ -1,36 +0,0 @@ -package me.shedaniel.gui; - -public class SearchArgument { - - public enum ArgumentType { - TEXT, MOD, TOOLTIP - } - - private ArgumentType argumentType; - private String text; - private boolean include; - - public SearchArgument(ArgumentType argumentType, String text, boolean include) { - this.argumentType = argumentType; - this.text = text; - this.include = include; - } - - public ArgumentType getArgumentType() { - return argumentType; - } - - public String getText() { - return text; - } - - public boolean isInclude() { - return include; - } - - @Override - public String toString() { - return String.format("Argument[%s]: name = %s, include = %b", argumentType.name(), text, include); - } - -} diff --git a/src/main/java/me/shedaniel/gui/widget/Button.java b/src/main/java/me/shedaniel/gui/widget/Button.java deleted file mode 100755 index f87b72f73..000000000 --- a/src/main/java/me/shedaniel/gui/widget/Button.java +++ /dev/null @@ -1,63 +0,0 @@ -package me.shedaniel.gui.widget; - -import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.gui.REIRenderHelper; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.FontRenderer; -import net.minecraft.client.gui.ContainerGui; -import net.minecraft.util.Identifier; - -import java.awt.*; - -/** - * Created by James on 7/29/2018. - */ -public class Button extends Control { - - private String buttonText; - protected static final Identifier BUTTON_TEXTURES = new Identifier("textures/gui/widgets.png"); - - public Button(int x, int y, int width, int height, String buttonText) { - super(x, y, width, height); - this.buttonText = buttonText; - } - - public Button(Rectangle rect, String buttonText) { - super(rect); - this.buttonText = buttonText; - } - - public void setString(String text) { - buttonText = text; - } - - @Override - public void draw() { - GlStateManager.pushMatrix(); - GlStateManager.disableLighting(); - ContainerGui gui = REIRenderHelper.getOverlayedGui(); - MinecraftClient lvt_4_1_ = MinecraftClient.getInstance(); - FontRenderer lvt_5_1_ = lvt_4_1_.fontRenderer; - lvt_4_1_.getTextureManager().bindTexture(BUTTON_TEXTURES); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - int hoverState = (byte) 0; - if (this.isEnabled()) { - if (!this.isHighlighted()) - hoverState = (byte) 1; - else - hoverState = (byte) 2; - } - - GlStateManager.enableBlend(); - GlStateManager.blendFuncSeparate(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcBlendFactor.ONE, GlStateManager.DstBlendFactor.ZERO); - GlStateManager.blendFunc(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA); - gui.drawTexturedRect(rect.x, rect.y, 0, 46 + hoverState * 20, rect.width / 2, rect.height); - gui.drawTexturedRect(rect.x + rect.width / 2, rect.y, 200 - rect.width / 2, 46 + hoverState * 20, rect.width / 2, rect.height); - int lvt_7_1_ = 14737632; - - gui.drawStringCentered(lvt_5_1_, this.buttonText, rect.x + rect.width / 2, rect.y + (rect.height - 8) / 2, lvt_7_1_); - GlStateManager.enableLighting(); - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/me/shedaniel/gui/widget/Control.java b/src/main/java/me/shedaniel/gui/widget/Control.java deleted file mode 100755 index d549e05f2..000000000 --- a/src/main/java/me/shedaniel/gui/widget/Control.java +++ /dev/null @@ -1,127 +0,0 @@ -package me.shedaniel.gui.widget; - -import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.api.TriBooleanSupplier; -import me.shedaniel.gui.Drawable; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormats; - -import java.awt.*; -import java.util.function.BiConsumer; -import java.util.function.IntFunction; - -/** - * Created by James on 7/29/2018. - */ -public abstract class Control extends Drawable { - - private boolean enabled = true; - public IntFunction onClick; - public TriBooleanSupplier onKeyDown; - public BiConsumer charPressed; - - public Control(int x, int y, int width, int height) { - super(x, y, width, height); - } - - public Control(Rectangle rect) { - super(rect); - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public void move(int x, int y) { - rect.x += x; - rect.y += y; - //rect.move(x+rect.x,rect.y+y);//Why the fuck? - } - - protected static void drawRect(int p_drawRect_0_, int p_drawRect_1_, int p_drawRect_2_, int p_drawRect_3_, int p_drawRect_4_) { - int lvt_5_3_; - if (p_drawRect_0_ < p_drawRect_2_) { - lvt_5_3_ = p_drawRect_0_; - p_drawRect_0_ = p_drawRect_2_; - p_drawRect_2_ = lvt_5_3_; - } - - if (p_drawRect_1_ < p_drawRect_3_) { - lvt_5_3_ = p_drawRect_1_; - p_drawRect_1_ = p_drawRect_3_; - p_drawRect_3_ = lvt_5_3_; - } - float lvt_5_3_1 = (float) (p_drawRect_4_ >> 24 & 255) / 255.0F; - float lvt_6_1_ = (float) (p_drawRect_4_ >> 16 & 255) / 255.0F; - float lvt_7_1_ = (float) (p_drawRect_4_ >> 8 & 255) / 255.0F; - float lvt_8_1_ = (float) (p_drawRect_4_ & 255) / 255.0F; - Tessellator lvt_9_1_ = Tessellator.getInstance(); - BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder(); - GlStateManager.enableAlphaTest(); - GlStateManager.enableBlend(); - GlStateManager.disableTexture(); - GlStateManager.blendFuncSeparate(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcBlendFactor.ONE, GlStateManager.DstBlendFactor.ZERO); - GlStateManager.color4f(lvt_6_1_, lvt_7_1_, lvt_8_1_, lvt_5_3_1); - lvt_10_1_.begin(7, VertexFormats.POSITION); - lvt_10_1_.vertex((double) p_drawRect_0_, (double) p_drawRect_3_, 0.0D).next(); - lvt_10_1_.vertex((double) p_drawRect_2_, (double) p_drawRect_3_, 0.0D).next(); - lvt_10_1_.vertex((double) p_drawRect_2_, (double) p_drawRect_1_, 0.0D).next(); - lvt_10_1_.vertex((double) p_drawRect_0_, (double) p_drawRect_1_, 0.0D).next(); - lvt_9_1_.draw(); - GlStateManager.enableTexture(); - GlStateManager.disableBlend(); - GlStateManager.disableAlphaTest(); - } - - protected void drawTexturedModalRect(int x, int y, int u, int v, int width, int height) { - float lvt_7_1_ = 0.00390625F; - float lvt_8_1_ = 0.00390625F; - Tessellator lvt_9_1_ = Tessellator.getInstance(); - BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder(); - lvt_10_1_.begin(7, VertexFormats.POSITION_UV); - lvt_10_1_.vertex((double) (x + 0), (double) (y + height), (double) 200).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + width), (double) (y + height), (double) 200).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + width), (double) (y + 0), (double) 200).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + 0), (double) (y + 0), (double) 200).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next(); - lvt_9_1_.draw(); - } - - protected void drawTexturedModalRect(int x, int y, int u, int v, int width, int height, float zLevel) { - float lvt_7_1_ = 0.00390625F; - float lvt_8_1_ = 0.00390625F; - Tessellator lvt_9_1_ = Tessellator.getInstance(); - BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder(); - lvt_10_1_.begin(7, VertexFormats.POSITION_UV); - lvt_10_1_.vertex((double) (x + 0), (double) (y + height), zLevel).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + width), (double) (y + height), zLevel).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + width), (double) (y + 0), zLevel).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next(); - lvt_10_1_.vertex((double) (x + 0), (double) (y + 0), zLevel).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next(); - lvt_9_1_.draw(); - } - - public void drawTexturedRect(int int_1, int int_2, int int_3, int int_4, int int_5, int int_6, double zOffset) { - float float_1 = 0.00390625F; - float float_2 = 0.00390625F; - Tessellator tessellator_1 = Tessellator.getInstance(); - BufferBuilder bufferBuilder_1 = tessellator_1.getBufferBuilder(); - bufferBuilder_1.begin(7, VertexFormats.POSITION_UV); - bufferBuilder_1.vertex((double)(int_1 + 0), (double)(int_2 + int_6), zOffset).texture((double)((float)(int_3 + 0) * 0.00390625F), (double)((float)(int_4 + int_6) * 0.00390625F)).next(); - bufferBuilder_1.vertex((double)(int_1 + int_5), (double)(int_2 + int_6), zOffset).texture((double)((float)(int_3 + int_5) * 0.00390625F), (double)((float)(int_4 + int_6) * 0.00390625F)).next(); - bufferBuilder_1.vertex((double)(int_1 + int_5), (double)(int_2 + 0), zOffset).texture((double)((float)(int_3 + int_5) * 0.00390625F), (double)((float)(int_4 + 0) * 0.00390625F)).next(); - bufferBuilder_1.vertex((double)(int_1 + 0), (double)(int_2 + 0), zOffset).texture((double)((float)(int_3 + 0) * 0.00390625F), (double)((float)(int_4 + 0) * 0.00390625F)).next(); - tessellator_1.draw(); - } - - public void tick() { - } - - public void setOnClick(IntFunction onClick) { - this.onClick = onClick; - } - -} diff --git a/src/main/java/me/shedaniel/gui/widget/CraftableToggleButton.java b/src/main/java/me/shedaniel/gui/widget/CraftableToggleButton.java deleted file mode 100644 index a91f6a476..000000000 --- a/src/main/java/me/shedaniel/gui/widget/CraftableToggleButton.java +++ /dev/null @@ -1,76 +0,0 @@ -package me.shedaniel.gui.widget; - -import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.Core; -import me.shedaniel.gui.REIRenderHelper; -import net.minecraft.block.Blocks; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.FontRenderer; -import net.minecraft.client.render.GuiL