From 93dc019f11596f7a9386a6e3f597667fa1b50eb8 Mon Sep 17 00:00:00 2001 From: Daniel She Date: Thu, 14 Feb 2019 14:38:18 +0100 Subject: REI Update v2.3 (#35) * Fixes #33 * Fixes #32 * Fix #29 * Highlight Cursor * Fix #15 * Remove Unwanted Imports * Making it actually v2.3 * LOLCATS & Upside Down Lanuage + Credits Screen * better credits * Better Config * Better Config Button Handling + Campfire text using container sub-colour * Better Plugin Handling * Split ItemRegisterer out from ClientHelper * Option to disable default plugin. --- .../me/shedaniel/rei/RoughlyEnoughItemsCore.java | 21 ++- .../java/me/shedaniel/rei/api/IItemRegisterer.java | 35 ++++ .../java/me/shedaniel/rei/api/IPluginDisabler.java | 23 +++ .../java/me/shedaniel/rei/api/IRecipePlugin.java | 12 +- .../java/me/shedaniel/rei/api/PluginFunction.java | 5 + .../java/me/shedaniel/rei/client/ClientHelper.java | 57 +----- .../java/me/shedaniel/rei/client/ConfigHelper.java | 9 + .../java/me/shedaniel/rei/client/GuiHelper.java | 19 +- .../me/shedaniel/rei/client/ItemListHelper.java | 53 ++++++ .../java/me/shedaniel/rei/client/REIConfig.java | 1 + .../java/me/shedaniel/rei/client/RecipeHelper.java | 19 +- .../shedaniel/rei/gui/ContainerScreenOverlay.java | 58 +++--- .../me/shedaniel/rei/gui/config/ConfigEntry.java | 70 +++++++ .../rei/gui/config/ConfigEntryListWidget.java | 35 ++++ .../me/shedaniel/rei/gui/config/ConfigScreen.java | 207 +++++++++++++++++++++ .../me/shedaniel/rei/gui/credits/CreditsEntry.java | 22 +++ .../rei/gui/credits/CreditsEntryListWidget.java | 35 ++++ .../shedaniel/rei/gui/credits/CreditsScreen.java | 64 +++++++ .../me/shedaniel/rei/gui/widget/ButtonWidget.java | 42 ++--- .../me/shedaniel/rei/gui/widget/ConfigWidget.java | 177 ------------------ .../gui/widget/CraftableToggleButtonWidget.java | 9 +- .../shedaniel/rei/gui/widget/ItemListOverlay.java | 35 ++-- .../shedaniel/rei/gui/widget/ItemSlotWidget.java | 35 +++- .../rei/gui/widget/RecipeViewingWidgetScreen.java | 3 +- .../rei/gui/widget/SpeedCraftingButtonWidget.java | 1 + .../rei/listeners/IMixinContainerScreen.java | 15 +- .../shedaniel/rei/mixin/MixinContainerScreen.java | 23 +-- .../rei/plugin/DefaultBlastingCategory.java | 2 +- .../rei/plugin/DefaultCampfireCategory.java | 4 +- .../me/shedaniel/rei/plugin/DefaultPlugin.java | 93 ++++++--- .../rei/plugin/DefaultSmeltingCategory.java | 2 +- .../rei/plugin/DefaultSmokingCategory.java | 2 +- .../me/shedaniel/rei/plugin/PluginManager.java | 43 +++++ .../me/shedaniel/rei/update/UpdateChecker.java | 5 +- 34 files changed, 834 insertions(+), 402 deletions(-) create mode 100644 src/main/java/me/shedaniel/rei/api/IItemRegisterer.java create mode 100644 src/main/java/me/shedaniel/rei/api/IPluginDisabler.java create mode 100644 src/main/java/me/shedaniel/rei/api/PluginFunction.java create mode 100644 src/main/java/me/shedaniel/rei/client/ItemListHelper.java create mode 100644 src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java create mode 100644 src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java create mode 100644 src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java create mode 100644 src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java create mode 100644 src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java create mode 100644 src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java delete mode 100644 src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java create mode 100644 src/main/java/me/shedaniel/rei/plugin/PluginManager.java (limited to 'src/main/java/me') diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index 686e34006..faa647b3f 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -1,12 +1,15 @@ package me.shedaniel.rei; import com.google.common.collect.Maps; +import me.shedaniel.rei.api.IItemRegisterer; +import me.shedaniel.rei.api.IPluginDisabler; import me.shedaniel.rei.api.IRecipePlugin; -import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.ConfigHelper; import me.shedaniel.rei.client.GuiHelper; +import me.shedaniel.rei.client.ItemListHelper; import me.shedaniel.rei.client.RecipeHelper; import me.shedaniel.rei.plugin.DefaultPlugin; +import me.shedaniel.rei.plugin.PluginManager; import me.shedaniel.rei.update.UpdateChecker; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ModInitializer; @@ -33,7 +36,8 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer, ModInitiali public static final Identifier DELETE_ITEMS_PACKET = new Identifier("roughlyenoughitems", "delete_item"); public static final Identifier CREATE_ITEMS_PACKET = new Identifier("roughlyenoughitems", "create_item"); private static final RecipeHelper RECIPE_HELPER = new RecipeHelper(); - private static final ClientHelper CLIENT_HELPER = new ClientHelper(); + private static final PluginManager PLUGIN_MANAGER = new PluginManager(); + private static final ItemListHelper ITEM_LIST_HELPER = new ItemListHelper(); private static final Map plugins = Maps.newHashMap(); private static ConfigHelper configHelper; @@ -45,13 +49,18 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer, ModInitiali return configHelper; } - public static ClientHelper getClientHelper() { - return CLIENT_HELPER; + public static IItemRegisterer getItemRegisterer() { + return ITEM_LIST_HELPER; + } + + public static IPluginDisabler getPluginDisabler() { + return PLUGIN_MANAGER; } public static IRecipePlugin registerPlugin(Identifier identifier, IRecipePlugin plugin) { plugins.put(identifier, plugin); RoughlyEnoughItemsCore.LOGGER.info("REI: Registered plugin %s from %s", identifier.toString(), plugin.getClass().getSimpleName()); + plugin.onFirstLoad(getPluginDisabler()); return plugin; } @@ -66,14 +75,16 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer, ModInitiali return null; } + @SuppressWarnings("deprecation") @Override public void onInitializeClient() { + configHelper = new ConfigHelper(); + // If pluginloader is not installed, base functionality should still remain if (!FabricLoader.INSTANCE.getModContainers().stream().map(modContainer -> modContainer.getInfo().getId()).anyMatch(s -> s.equalsIgnoreCase("pluginloader"))) { RoughlyEnoughItemsCore.LOGGER.warn("REI: Plugin Loader is not loaded! Please consider installing https://minecraft.curseforge.com/projects/pluginloader for REI plugin compatibility!"); registerPlugin(new Identifier("roughlyenoughitems", "default_plugin"), new DefaultPlugin()); } - configHelper = new ConfigHelper(); ClientTickCallback.EVENT.register(GuiHelper::onTick); if (getConfigHelper().checkUpdates()) diff --git a/src/main/java/me/shedaniel/rei/api/IItemRegisterer.java b/src/main/java/me/shedaniel/rei/api/IItemRegisterer.java new file mode 100644 index 000000000..090e26742 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/api/IItemRegisterer.java @@ -0,0 +1,35 @@ +package me.shedaniel.rei.api; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public interface IItemRegisterer { + + public List getItemList(); + + @Deprecated + public List getModifiableItemList(); + + public ItemStack[] getAllStacksFromItem(Item item); + + public void registerItemStack(Item afterItem, ItemStack stack); + + default public void registerItemStack(Item afterItem, ItemStack... stacks) { + for(ItemStack stack : stacks) + if (stack != null && !stack.isEmpty()) + registerItemStack(afterItem, stack); + } + + default public void registerItemStack(ItemStack... stacks) { + for(ItemStack stack : stacks) + if (stack != null && !stack.isEmpty()) + registerItemStack(null, stack); + } + + default boolean alreadyContain(ItemStack stack) { + return getItemList().stream().anyMatch(stack1 -> ItemStack.areEqual(stack, stack1)); + } + +} diff --git a/src/main/java/me/shedaniel/rei/api/IPluginDisabler.java b/src/main/java/me/shedaniel/rei/api/IPluginDisabler.java new file mode 100644 index 000000000..8663e76bd --- /dev/null +++ b/src/main/java/me/shedaniel/rei/api/IPluginDisabler.java @@ -0,0 +1,23 @@ +package me.shedaniel.rei.api; + +import net.minecraft.util.Identifier; + +public interface IPluginDisabler { + + default public void disablePluginFunctions(Identifier plugin, PluginFunction... functions) { + for(PluginFunction function : functions) + disablePluginFunction(plugin, function); + } + + default public void enablePluginFunctions(Identifier plugin, PluginFunction... functions) { + for(PluginFunction function : functions) + enablePluginFunction(plugin, function); + } + + public void disablePluginFunction(Identifier plugin, PluginFunction function); + + public void enablePluginFunction(Identifier plugin, PluginFunction function); + + public boolean isFunctionEnabled(Identifier plugin, PluginFunction function); + +} diff --git a/src/main/java/me/shedaniel/rei/api/IRecipePlugin.java b/src/main/java/me/shedaniel/rei/api/IRecipePlugin.java index 064f20abe..6ba6c70e7 100644 --- a/src/main/java/me/shedaniel/rei/api/IRecipePlugin.java +++ b/src/main/java/me/shedaniel/rei/api/IRecipePlugin.java @@ -1,12 +1,18 @@ package me.shedaniel.rei.api; +import me.shedaniel.rei.client.RecipeHelper; + public interface IRecipePlugin { - public void registerPluginCategories(); + default public void onFirstLoad(IPluginDisabler pluginDisabler) {} + + public void registerItems(IItemRegisterer itemRegisterer); + + public void registerPluginCategories(RecipeHelper recipeHelper); - public void registerRecipes(); + public void registerRecipeDisplays(RecipeHelper recipeHelper); - public void registerSpeedCraft(); + public void registerSpeedCraft(RecipeHelper recipeHelper); default public int getPriority() { return 0; diff --git a/src/main/java/me/shedaniel/rei/api/PluginFunction.java b/src/main/java/me/shedaniel/rei/api/PluginFunction.java new file mode 100644 index 000000000..bef757db1 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/api/PluginFunction.java @@ -0,0 +1,5 @@ +package me.shedaniel.rei.api; + +public enum PluginFunction { + REGISTER_ITEMS, REGISTER_CATEGORIES, REGISTER_RECIPE_DISPLAYS, REGISTER_SPEED_CRAFT; +} diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelper.java b/src/main/java/me/shedaniel/rei/client/ClientHelper.java index fb2522f01..474fdf1ce 100644 --- a/src/main/java/me/shedaniel/rei/client/ClientHelper.java +++ b/src/main/java/me/shedaniel/rei/client/ClientHelper.java @@ -1,26 +1,22 @@ package me.shedaniel.rei.client; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import io.netty.buffer.Unpooled; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.IRecipeCategory; import me.shedaniel.rei.api.IRecipeDisplay; import me.shedaniel.rei.gui.ContainerScreenOverlay; -import me.shedaniel.rei.gui.widget.ConfigWidget; +import me.shedaniel.rei.gui.config.ConfigScreen; import me.shedaniel.rei.gui.widget.RecipeViewingWidgetScreen; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding; import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl; -import net.fabricmc.loader.FabricLoader; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.Mouse; import net.minecraft.client.gui.Screen; import net.minecraft.client.util.InputUtil; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.DefaultedList; @@ -30,7 +26,6 @@ import net.minecraft.util.registry.Registry; import java.awt.*; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,13 +35,8 @@ public class ClientHelper implements ClientModInitializer { private static final Identifier USAGE_KEYBIND = new Identifier("roughlyenoughitems", "usage_keybind"); private static final Identifier HIDE_KEYBIND = new Identifier("roughlyenoughitems", "hide_keybind"); public static FabricKeyBinding RECIPE, USAGE, HIDE; - private static List itemList; private static boolean cheating; - public ClientHelper() { - this.itemList = Lists.newLinkedList(); - } - public static String getModFromItemStack(ItemStack stack) { if (!stack.isEmpty()) { Identifier location = Registry.ITEM.getId(stack.getItem()); @@ -54,7 +44,7 @@ public class ClientHelper implements ClientModInitializer { String modid = location.getNamespace(); if (modid.equalsIgnoreCase("minecraft")) return "Minecraft"; - return FabricLoader.INSTANCE.getModContainers().stream().map(modContainer -> { + return ((net.fabricmc.loader.FabricLoader) FabricLoader.getInstance()).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) @@ -65,10 +55,6 @@ public class ClientHelper implements ClientModInitializer { return ""; } - public static List getItemList() { - return itemList; - } - public static Point getMouseLocation() { MinecraftClient client = MinecraftClient.getInstance(); Mouse mouse = client.mouse; @@ -127,7 +113,7 @@ public class ClientHelper implements ClientModInitializer { } public static void openConfigWindow(Screen parent) { - MinecraftClient.getInstance().openScreen(new ConfigWidget(parent)); + MinecraftClient.getInstance().openScreen(new ConfigScreen(parent)); } public static List getInventoryItemsTypes() { @@ -140,41 +126,6 @@ public class ClientHelper implements ClientModInitializer { return inventoryStacks; } - public void clientLoaded() { - Registry.ITEM.forEach(item -> { - if (!item.equals(Items.ENCHANTED_BOOK)) - registerItem(item); - }); - Registry.ENCHANTMENT.forEach(enchantment -> { - for(int i = enchantment.getMinimumLevel(); i < enchantment.getMaximumLevel(); i++) { - Map map = new HashMap<>(); - map.put(enchantment, i); - ItemStack itemStack = new ItemStack(Items.ENCHANTED_BOOK); - EnchantmentHelper.set(map, itemStack); - registerItemStack(itemStack); - } - }); - } - - public void registerItem(Item item) { - registerItemStack(item.getDefaultStack()); - DefaultedList stacks = DefaultedList.create(); - item.addStacksForDisplay(item.getItemGroup(), stacks); - stacks.forEach(this::registerItemStack); - } - - public void registerItemStack(ItemStack stack) { - if (!stack.getItem().equals(Items.AIR) && !alreadyContain(stack)) - itemList.add(stack); - } - - private boolean alreadyContain(ItemStack stack) { - for(ItemStack itemStack : itemList) - if (ItemStack.areEqual(stack, itemStack)) - return true; - return false; - } - @Override public void onInitializeClient() { this.cheating = false; diff --git a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java index ccc340af3..caf307313 100644 --- a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java +++ b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java @@ -20,6 +20,7 @@ public class ConfigHelper { this.craftableOnly = false; try { loadConfig(); + RoughlyEnoughItemsCore.LOGGER.info("REI: Config is loaded."); } catch (IOException e) { e.printStackTrace(); } @@ -119,4 +120,12 @@ public class ConfigHelper { config.mirrorItemPanel = mirrorItemPanel; } + public boolean isLoadingDefaultPlugin() { + return config.loadDefaultPlugin; + } + + public void setLoadingDefaultPlugin(boolean loadDefaultPlugin) { + config.loadDefaultPlugin = loadDefaultPlugin; + } + } diff --git a/src/main/java/me/shedaniel/rei/client/GuiHelper.java b/src/main/java/me/shedaniel/rei/client/GuiHelper.java index 2b453c784..cf74fafbd 100644 --- a/src/main/java/me/shedaniel/rei/client/GuiHelper.java +++ b/src/main/java/me/shedaniel/rei/client/GuiHelper.java @@ -17,7 +17,6 @@ public class GuiHelper { private static boolean overlayVisible = true; private static ContainerScreenOverlay overlay; private static ContainerScreen lastContainerScreen; - private static IMixinContainerScreen lastMixinContainerScreen; public static boolean isOverlayVisible() { return overlayVisible; @@ -27,19 +26,21 @@ public class GuiHelper { overlayVisible = !overlayVisible; } - public static ContainerScreenOverlay getLastOverlay() { + public static ContainerScreenOverlay getLastOverlay(boolean reset) { + if (overlay == null || reset) { + overlay = new ContainerScreenOverlay(); + overlay.onInitialized(); + } return overlay; } - public static void setOverlay(ContainerScreenOverlay overlay) { - GuiHelper.overlay = overlay; - overlay.onInitialized(); + public static ContainerScreenOverlay getLastOverlay() { + return getLastOverlay(false); } public static void onTick(MinecraftClient client) { if (client.currentScreen instanceof ContainerScreen && lastContainerScreen != client.currentScreen) { GuiHelper.lastContainerScreen = (ContainerScreen) client.currentScreen; - GuiHelper.lastMixinContainerScreen = (IMixinContainerScreen) lastContainerScreen; } } @@ -52,11 +53,7 @@ public class GuiHelper { } public static IMixinContainerScreen getLastMixinContainerScreen() { - return lastMixinContainerScreen; - } - - public static void setLastMixinContainerScreen(IMixinContainerScreen lastMixinContainerScreen) { - GuiHelper.lastMixinContainerScreen = lastMixinContainerScreen; + return (IMixinContainerScreen) lastContainerScreen; } } diff --git a/src/main/java/me/shedaniel/rei/client/ItemListHelper.java b/src/main/java/me/shedaniel/rei/client/ItemListHelper.java new file mode 100644 index 000000000..81c882d49 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/client/ItemListHelper.java @@ -0,0 +1,53 @@ +package me.shedaniel.rei.client; + +import com.google.common.collect.Lists; +import me.shedaniel.rei.api.IItemRegisterer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.DefaultedList; + +import java.util.Collections; +import java.util.List; +import java.util.TreeSet; +import java.util.stream.Collectors; + +public class ItemListHelper implements IItemRegisterer { + + private final List itemList = Lists.newLinkedList(); + + @Override + public List getItemList() { + return Collections.unmodifiableList(itemList); + } + + @Deprecated + @Override + public List getModifiableItemList() { + return itemList; + } + + @Override + public ItemStack[] getAllStacksFromItem(Item item) { + DefaultedList list = DefaultedList.create(); + list.add(item.getDefaultStack()); + item.addStacksForDisplay(item.getItemGroup(), list); + TreeSet stackSet = list.stream().collect(Collectors.toCollection(() -> new TreeSet((p1, p2) -> ItemStack.areEqual(p1, p2) ? 0 : 1))); + return Lists.newArrayList(stackSet).toArray(new ItemStack[0]); + } + + @Override + public void registerItemStack(Item afterItem, ItemStack stack) { + if (!stack.isEmpty() && !alreadyContain(stack)) + if (afterItem == null || afterItem.equals(Items.AIR)) + itemList.add(stack); + else { + int last = itemList.size(); + for(int i = 0; i < itemList.size(); i++) + if (itemList.get(i).getItem().equals(afterItem)) + last = i + 1; + itemList.add(last, stack); + } + } + +} diff --git a/src/main/java/me/shedaniel/rei/client/REIConfig.java b/src/main/java/me/shedaniel/rei/client/REIConfig.java index b5b798371..be4eabfeb 100644 --- a/src/main/java/me/shedaniel/rei/client/REIConfig.java +++ b/src/main/java/me/shedaniel/rei/client/REIConfig.java @@ -14,5 +14,6 @@ public class REIConfig { public String giveCommandPrefix = "/give"; public boolean checkUpdates = true; public boolean mirrorItemPanel = false; + public boolean loadDefaultPlugin = true; } diff --git a/src/main/java/me/shedaniel/rei/client/RecipeHelper.java b/src/main/java/me/shedaniel/rei/client/RecipeHelper.java index 80d76c5f1..96490c6dd 100644 --- a/src/main/java/me/shedaniel/rei/client/RecipeHelper.java +++ b/src/main/java/me/shedaniel/rei/client/RecipeHelper.java @@ -59,7 +59,7 @@ public class RecipeHelper { recipeCategoryListMap.put(category.getIdentifier(), Lists.newLinkedList()); } - public void registerRecipe(Identifier categoryIdentifier, IRecipeDisplay display) { + public void registerDisplay(Identifier categoryIdentifier, IRecipeDisplay display) { if (!recipeCategoryListMap.containsKey(categoryIdentifier)) return; recipeCategoryListMap.get(categoryIdentifier).add(display); @@ -147,6 +147,7 @@ public class RecipeHelper { speedCraftFunctionalMap.put(category, list); } + @SuppressWarnings("deprecation") public void recipesLoaded(RecipeManager recipeManager) { this.recipeManager = recipeManager; this.recipeCategoryListMap.clear(); @@ -162,10 +163,20 @@ public class RecipeHelper { return identifier == null ? "NULL" : identifier.toString(); }).collect(Collectors.toList()))); Collections.reverse(plugins); + RoughlyEnoughItemsCore.getItemRegisterer().getModifiableItemList().clear(); + IPluginDisabler pluginDisabler = RoughlyEnoughItemsCore.getPluginDisabler(); plugins.forEach(plugin -> { - plugin.registerPluginCategories(); - plugin.registerRecipes(); - plugin.registerSpeedCraft(); + Identifier identifier = RoughlyEnoughItemsCore.getPluginIdentifier(plugin); + if (identifier == null) + identifier = new Identifier("null"); + if (pluginDisabler.isFunctionEnabled(identifier, PluginFunction.REGISTER_ITEMS)) + plugin.registerItems(RoughlyEnoughItemsCore.getItemRegisterer()); + if (pluginDisabler.isFunctionEnabled(identifier, PluginFunction.REGISTER_CATEGORIES)) + plugin.registerPluginCategories(this); + if (pluginDisabler.isFunctionEnabled(identifier, PluginFunction.REGISTER_RECIPE_DISPLAYS)) + plugin.registerRecipeDisplays(this); + if (pluginDisabler.isFunctionEnabled(identifier, PluginFunction.REGISTER_SPEED_CRAFT)) + plugin.registerSpeedCraft(this); }); RoughlyEnoughItemsCore.LOGGER.info("Registered REI Categories: " + String.join(", ", categories.stream().map(category -> { return category.getCategoryName(); diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index eb1daa9a4..41700f7c1 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -5,11 +5,12 @@ import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.GuiHelper; +import me.shedaniel.rei.gui.credits.CreditsScreen; import me.shedaniel.rei.gui.widget.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.DrawableContainer; import net.minecraft.client.gui.GuiEventListener; -import net.minecraft.client.gui.Screen; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.Window; @@ -22,7 +23,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class ContainerScreenOverlay extends Screen { +public class ContainerScreenOverlay extends DrawableContainer { private static final List QUEUED_TOOLTIPS = Lists.newArrayList(); public static String searchTerm = ""; @@ -80,7 +81,13 @@ public class ContainerScreenOverlay extends Screen { ClientHelper.openConfigWindow(GuiHelper.getLastContainerScreen()); } }); - this.widgets.add(new LabelWidget(rectangle.x + (rectangle.width / 2), rectangle.y + 10, "") { + widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel() ? window.getScaledWidth() - 50 : 10, window.getScaledHeight() - 30, 40, 20, I18n.translate("text.rei.credits")) { + @Override + public void onPressed(int button, double mouseX, double mouseY) { + MinecraftClient.getInstance().openScreen(new CreditsScreen(GuiHelper.getLastContainerScreen())); + } + }); + widgets.add(new LabelWidget(rectangle.x + (rectangle.width / 2), rectangle.y + 10, "") { @Override public void draw(int mouseX, int mouseY, float partialTicks) { page = MathHelper.clamp(page, 0, getTotalPage()); @@ -101,7 +108,7 @@ public class ContainerScreenOverlay extends Screen { }; GuiHelper.searchField.setChangedListener(s -> { searchTerm = s; - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); }); GuiHelper.searchField.setBounds(getTextFieldArea()); this.widgets.add(GuiHelper.searchField); @@ -111,12 +118,11 @@ public class ContainerScreenOverlay extends Screen { @Override public void onPressed(int button, double mouseX, double mouseY) { RoughlyEnoughItemsCore.getConfigHelper().toggleCraftableOnly(); - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); } }); this.itemListOverlay.updateList(getItemListArea(), page, searchTerm); - this.listeners.addAll(widgets); } private Rectangle getTextFieldArea() { @@ -127,7 +133,7 @@ public class ContainerScreenOverlay extends Screen { RecipeViewingWidgetScreen widget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen; return new Rectangle(widget.getBounds().x, window.getScaledHeight() - 22, widget.getBounds().width - widthRemoved, 18); } - return new Rectangle(GuiHelper.getLastMixinContainerScreen().getContainerLeft(), window.getScaledHeight() - 22, GuiHelper.getLastMixinContainerScreen().getContainerWidth() - widthRemoved, 18); + return new Rectangle(GuiHelper.getLastMixinContainerScreen().rei_getContainerLeft(), window.getScaledHeight() - 22, GuiHelper.getLastMixinContainerScreen().rei_getContainerWidth() - widthRemoved, 18); } private Rectangle getCraftableToggleArea() { @@ -149,13 +155,13 @@ public class ContainerScreenOverlay extends Screen { return rectangle; } - public void render(int mouseX, int mouseY, float partialTicks) { + public void drawOverlay(int mouseX, int mouseY, float partialTicks) { List currentStacks = ClientHelper.getInventoryItemsTypes(); if (getLeft() != lastLeft) onInitialized(); else if (RoughlyEnoughItemsCore.getConfigHelper().craftableOnly() && (!hasSameListContent(new LinkedList<>(GuiHelper.inventoryStacks), currentStacks) || (currentStacks.size() != GuiHelper.inventoryStacks.size()))) { GuiHelper.inventoryStacks = ClientHelper.getInventoryItemsTypes(); - itemListOverlay.updateList(page, searchTerm); + itemListOverlay.updateList(getItemListArea(), page, searchTerm); } GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GuiLighting.disable(); @@ -185,7 +191,6 @@ public class ContainerScreenOverlay extends Screen { QUEUED_TOOLTIPS.add(queuedTooltip); } - @Override public void draw(int int_1, int int_2, float float_1) { if (!GuiHelper.isOverlayVisible()) return; @@ -194,14 +199,11 @@ public class ContainerScreenOverlay extends Screen { widget.draw(int_1, int_2, float_1); }); GuiLighting.disable(); - itemListOverlay.draw(int_1, int_2, float_1); - GuiLighting.disable(); - super.draw(int_1, int_2, float_1); } private Rectangle calculateBoundary() { if (!RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel()) { - int startX = GuiHelper.getLastMixinContainerScreen().getContainerLeft() + GuiHelper.getLastMixinContainerScreen().getContainerWidth() + 10; + int startX = GuiHelper.getLastMixinContainerScreen().rei_getContainerLeft() + GuiHelper.getLastMixinContainerScreen().rei_getContainerWidth() + 10; int width = window.getScaledWidth() - startX; if (MinecraftClient.getInstance().currentScreen instanceof RecipeViewingWidgetScreen) { RecipeViewingWidgetScreen widget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen; @@ -210,12 +212,7 @@ public class ContainerScreenOverlay extends Screen { } return new Rectangle(startX, 0, width, window.getScaledHeight()); } - int width = GuiHelper.getLastMixinContainerScreen().getContainerLeft() - 6; - if (MinecraftClient.getInstance().currentScreen instanceof RecipeViewingWidgetScreen) { - RecipeViewingWidgetScreen widget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen; - width = widget.getBounds().x - 6; - } - return new Rectangle(4, 0, width, window.getScaledHeight()); + return new Rectangle(4, 0, getLeft() - 6, window.getScaledHeight()); } private int getLeft() { @@ -223,7 +220,9 @@ public class ContainerScreenOverlay extends Screen { RecipeViewingWidgetScreen widget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen; return widget.getBounds().x; } - return GuiHelper.getLastMixinContainerScreen().getContainerLeft(); + if (MinecraftClient.getInstance().player.getRecipeBook().isGuiOpen()) + return GuiHelper.getLastMixinContainerScreen().rei_getContainerLeft() - 147 - 30; + return GuiHelper.getLastMixinContainerScreen().rei_getContainerLeft(); } private int getTotalPage() { @@ -251,15 +250,15 @@ public class ContainerScreenOverlay extends Screen { @Override public boolean keyPressed(int int_1, int int_2, int int_3) { + for(GuiEventListener listener : widgets) + if (listener.keyPressed(int_1, int_2, int_3)) + return true; if (ClientHelper.HIDE.matchesKey(int_1, int_2)) { GuiHelper.toggleOverlayVisible(); return true; } if (!GuiHelper.isOverlayVisible()) return false; - for(GuiEventListener listener : listeners) - if (listener.keyPressed(int_1, int_2, int_3)) - return true; Point point = ClientHelper.getMouseLocation(); ItemStack itemStack = null; for(IWidget widget : itemListOverlay.getListeners()) @@ -276,8 +275,8 @@ public class ContainerScreenOverlay extends Screen { } } if (itemStack == null && MinecraftClient.getInstance().currentScreen instanceof ContainerScreen) - if (GuiHelper.getLastMixinContainerScreen().getHoveredSlot() != null) - itemStack = GuiHelper.getLastMixinContainerScreen().getHoveredSlot().getStack(); + if (GuiHelper.getLastMixinContainerScreen().rei_getHoveredSlot() != null) + itemStack = GuiHelper.getLastMixinContainerScreen().rei_getHoveredSlot().getStack(); if (itemStack != null && !itemStack.isEmpty()) { if (ClientHelper.RECIPE.matchesKey(int_1, int_2)) return ClientHelper.executeRecipeKeyBind(this, itemStack); @@ -291,12 +290,17 @@ public class ContainerScreenOverlay extends Screen { public boolean charTyped(char char_1, int int_1) { if (!GuiHelper.isOverlayVisible()) return false; - for(GuiEventListener listener : listeners) + for(GuiEventListener listener : getEntries()) if (listener.charTyped(char_1, int_1)) return true; return super.charTyped(char_1, int_1); } + @Override + protected List getEntries() { + return widgets; + } + @Override public boolean mouseClicked(double double_1, double double_2, int int_1) { if (!GuiHelper.isOverlayVisible()) diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java new file mode 100644 index 000000000..013dd9cbe --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java @@ -0,0 +1,70 @@ +package me.shedaniel.rei.gui.config; + +import me.shedaniel.rei.client.ClientHelper; +import me.shedaniel.rei.gui.widget.ButtonWidget; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.audio.PositionedSoundInstance; +import net.minecraft.client.gui.widget.EntryListWidget; +import net.minecraft.client.util.Window; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.TextComponent; + +import java.awt.*; + +public class ConfigEntry extends EntryListWidget.Entry { + + private TextComponent nameComponent; + private ConfigEntryButtonProvider buttonProvider; + private ButtonWidget buttonWidget; + + public ConfigEntry(TextComponent nameComponent, ConfigEntryButtonProvider buttonProvider) { + this.nameComponent = nameComponent; + this.buttonProvider = buttonProvider; + this.buttonWidget = new ButtonWidget(0, 0, 150, 20, "") { + @Override + public boolean onMouseClick(int button, double mouseX, double mouseY) { + if (getBounds().contains(mouseX, mouseY) && enabled) + if (buttonProvider.onPressed(button, mouseX, mouseY)) { + MinecraftClient.getInstance().getSoundLoader().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + return true; + } + return false; + } + + @Override + public void onPressed(int button, double mouseX, double mouseY) {} + }; + } + + @Override + public void draw(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) { + int x = getX(); + int y = getY(); + Window window = MinecraftClient.getInstance().window; + Point mouse = ClientHelper.getMouseLocation(); + MinecraftClient.getInstance().fontRenderer.drawWithShadow(nameComponent.getFormattedText(), x + 5, y + 5, -1); + this.buttonWidget.text = buttonProvider.getText(); + this.buttonWidget.getBounds().setLocation(window.getScaledWidth() - 190, y + 2); + buttonProvider.draw(buttonWidget, mouse, delta); + } + + @Override + public boolean mouseClicked(double double_1, double double_2, int int_1) { + if (buttonWidget.mouseClicked(double_1, double_2, int_1)) + return true; + return false; + } + + interface ConfigEntryButtonProvider { + + public boolean onPressed(int button, double mouseX, double mouseY); + + public String getText(); + + default public void draw(ButtonWidget button, Point mouse, float delta) { + button.draw(mouse.x, mouse.y, delta); + } + + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java new file mode 100644 index 000000000..ee74cc568 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java @@ -0,0 +1,35 @@ +package me.shedaniel.rei.gui.config; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.EntryListWidget; + +public class ConfigEntryListWidget extends EntryListWidget { + + public ConfigEntryListWidget(MinecraftClient client, int width, int height, int startY, int endY, int entryHeight) { + super(client, width, height, startY, endY, entryHeight); + method_1943(false); //toggleShowSelection + } + + public void configClearEntries() { + clearEntries(); + } + + private ConfigEntry getEntry(int int_1) { + return this.getEntries().get(int_1); + } + + public void configAddEntry(ConfigEntry entry) { + addEntry(entry); + } + + @Override + public int getEntryWidth() { + return width - 80; + } + + @Override + protected int getScrollbarPosition() { + return width - 40; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java new file mode 100644 index 000000000..65007b2f5 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java @@ -0,0 +1,207 @@ +package me.shedaniel.rei.gui.config; + +import me.shedaniel.rei.RoughlyEnoughItemsCore; +import me.shedaniel.rei.client.GuiHelper; +import me.shedaniel.rei.client.REIItemListOrdering; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.GuiEventListener; +import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.render.GuiLighting; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.TranslatableTextComponent; + +import java.awt.*; +import java.io.IOException; +import java.util.Arrays; + +public class ConfigScreen extends Screen { + + private Screen parent; + private ConfigEntryListWidget entryListWidget; + + public ConfigScreen(Screen parent) { + this.parent = parent; + } + + @Override + public boolean keyPressed(int int_1, int int_2, int int_3) { + if (int_1 == 256 && this.doesEscapeKeyClose()) { + MinecraftClient.getInstance().openScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + return true; + } else { + return super.keyPressed(int_1, int_2, int_3); + } + } + + @Override + protected void onInitialized() { + listeners.add(entryListWidget = new ConfigEntryListWidget(client, width, height, 32, height - 32, 24)); + entryListWidget.configClearEntries(); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.side_searchbox"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + RoughlyEnoughItemsCore.getConfigHelper().setSideSearchField(!RoughlyEnoughItemsCore.getConfigHelper().sideSearchField()); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().sideSearchField()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.enable_craftable_only"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + RoughlyEnoughItemsCore.getConfigHelper().setShowCraftableOnlyButton(!RoughlyEnoughItemsCore.getConfigHelper().showCraftableOnlyButton()); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().showCraftableOnlyButton()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.list_ordering"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + int index = Arrays.asList(REIItemListOrdering.values()).indexOf(RoughlyEnoughItemsCore.getConfigHelper().getItemListOrdering()) + 1; + if (index >= REIItemListOrdering.values().length) { + index = 0; + RoughlyEnoughItemsCore.getConfigHelper().setAscending(!RoughlyEnoughItemsCore.getConfigHelper().isAscending()); + } + RoughlyEnoughItemsCore.getConfigHelper().setItemListOrdering(REIItemListOrdering.values()[index]); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return I18n.translate("text.rei.list_ordering_button", I18n.translate(RoughlyEnoughItemsCore.getConfigHelper().getItemListOrdering().getNameTranslationKey()), I18n.translate(RoughlyEnoughItemsCore.getConfigHelper().isAscending() ? "ordering.rei.ascending" : "ordering.rei.descending")); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.mirror_rei"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + RoughlyEnoughItemsCore.getConfigHelper().setMirrorItemPanel(!RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel()); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.check_updates"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + RoughlyEnoughItemsCore.getConfigHelper().setCheckUpdates(!RoughlyEnoughItemsCore.getConfigHelper().checkUpdates()); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().checkUpdates()); + } + })); + entryListWidget.configAddEntry(new ConfigEntry(new TranslatableTextComponent("text.rei.load_default_plugin"), new ConfigEntry.ConfigEntryButtonProvider() { + @Override + public boolean onPressed(int button, double mouseX, double mouseY) { + if (button == 0) + RoughlyEnoughItemsCore.getConfigHelper().setLoadingDefaultPlugin(!RoughlyEnoughItemsCore.getConfigHelper().isLoadingDefaultPlugin()); + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String getText() { + return getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().isLoadingDefaultPlugin()); + } + + @Override + public void draw(me.shedaniel.rei.gui.widget.ButtonWidget button, Point mouse, float delta) { + button.draw(mouse.x, mouse.y, delta); + if (button.getBounds().contains(mouse)) { + GuiLighting.disable(); + drawTooltip(Arrays.asList(I18n.translate("text.rei.load_default_plugin.restart_tooltip").split("\n")), mouse.x, mouse.y); + GuiLighting.disable(); + } + } + })); + addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) { + @Override + public void onPressed(double double_1, double double_2) { + try { + RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); + } catch (IOException e) { + e.printStackTrace(); + } + ConfigScreen.this.client.openScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + } + }); + super.onInitialized(); + } + + private String getTrueFalseText(boolean showCraftableOnlyButton) { + return String.format("%s%b", showCraftableOnlyButton ? "§a" : "§c", showCraftableOnlyButton); + } + + @Override + public void draw(int int_1, int int_2, float float_1) { + this.drawTextureBackground(0); + this.entryListWidget.draw(int_1, int_2, float_1); + this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.config"), this.width / 2, 16, 16777215); + super.draw(int_1, int_2, float_1); + } + + @Override + public boolean isPauseScreen() { + return false; + } + + @Override + public GuiEventListener getFocused() { + return entryListWidget; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java new file mode 100644 index 000000000..65f7a3fd5 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntry.java @@ -0,0 +1,22 @@ +package me.shedaniel.rei.gui.credits; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.EntryListWidget; +import net.minecraft.text.TextComponent; + +public class CreditsEntry extends EntryListWidget.Entry { + + private TextComponent textComponent; + + public CreditsEntry(TextComponent textComponent) { + this.textComponent = textComponent; + } + + @Override + public void draw(int entryWidth, int height, int i3, int i4, boolean isSelected, float delta) { + int x = getX(); + int y = getY(); + MinecraftClient.getInstance().fontRenderer.drawWithShadow(textComponent.getFormattedText(), x + 5, y + 5, -1); + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java new file mode 100644 index 000000000..81f48c40c --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java @@ -0,0 +1,35 @@ +package me.shedaniel.rei.gui.credits; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.EntryListWidget; + +public class CreditsEntryListWidget extends EntryListWidget { + + public CreditsEntryListWidget(MinecraftClient client, int width, int height, int startY, int endY, int entryHeight) { + super(client, width, height, startY, endY, entryHeight); + method_1943(false); //toggleShowSelection + } + + public void creditsClearEntries() { + clearEntries(); + } + + private CreditsEntry getEntry(int int_1) { + return this.getEntries().get(int_1); + } + + public void creditsAddEntry(CreditsEntry entry) { + addEntry(entry); + } + + @Override + public int getEntryWidth() { + return width - 80; + } + + @Override + protected int getScrollbarPosition() { + return width - 40; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java new file mode 100644 index 000000000..ed0464e07 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -0,0 +1,64 @@ +package me.shedaniel.rei.gui.credits; + +import me.shedaniel.rei.client.GuiHelper; +import net.minecraft.client.gui.ContainerScreen; +import net.minecraft.client.gui.GuiEventListener; +import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.StringTextComponent; + +public class CreditsScreen extends Screen { + + private ContainerScreen parent; + private CreditsEntryListWidget entryListWidget; + + public CreditsScreen(ContainerScreen parent) { + this.parent = parent; + } + + @Override + public boolean keyPressed(int int_1, int int_2, int int_3) { + if (int_1 == 256 && this.doesEscapeKeyClose()) { + this.client.openScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + return true; + } + return super.keyPressed(int_1, int_2, int_3); + } + + @Override + protected void onInitialized() { + listeners.add(entryListWidget = new CreditsEntryListWidget(client, width, height, 32, height - 32, 12)); + entryListWidget.creditsClearEntries(); + for(String line : I18n.translate("text.rei.credit.text").split("\n")) + entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent(line))); + entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent(""))); + addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) { + @Override + public void onPressed(double double_1, double double_2) { + CreditsScreen.this.client.openScreen(parent); + GuiHelper.getLastOverlay().onInitialized(); + } + }); + } + + @Override + public void draw(int int_1, int int_2, float float_1) { + this.drawTextureBackground(0); + this.entryListWidget.draw(int_1, int_2, float_1); + this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.credits"), this.width / 2, 16, 16777215); + super.draw(int_1, int_2, float_1); + } + + @Override + public boolean isPauseScreen() { + return false; + } + + @Override + public GuiEventListener getFocused() { + return entryListWidget; + } + +} diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index 96fbc54b3..eb6584798 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -16,32 +16,22 @@ import java.util.List; public abstract class ButtonWidget extends Drawable implements IWidget { protected static final Identifier WIDGET_TEX = new Identifier("textures/gui/widgets.png"); - public int x; - public int y; public String text; public boolean enabled; public boolean visible; - protected int width; - protected int height; protected boolean hovered; private boolean pressed; private Rectangle bounds; public ButtonWidget(Rectangle rectangle, String text) { - this(rectangle.x, rectangle.y, rectangle.width, rectangle.height, text); - } - - public ButtonWidget(int x, int y, int width, int height, String text) { - this.width = 200; - this.height = 20; + this.bounds = rectangle; this.enabled = true; this.visible = true; - this.x = x; - this.y = y; - this.width = width; - this.height = height; this.text = text; - this.bounds = new Rectangle(x, this.y, this.width, this.height); + } + + public ButtonWidget(int x, int y, int width, int height, String text) { + this(new Rectangle(x, y, width, height), text); } public Rectangle getBounds() { @@ -66,8 +56,8 @@ public abstract class ButtonWidget extends Drawable implements IWidget { @Override public void draw(int mouseX, int mouseY, float partialTicks) { - if (this.visible) { + int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; MinecraftClient minecraftClient_1 = MinecraftClient.getInstance(); FontRenderer fontRenderer_1 = minecraftClient_1.fontRenderer; minecraftClient_1.getTextureManager().bindTexture(WIDGET_TEX); @@ -78,18 +68,18 @@ public abstract class ButtonWidget extends Drawable implements IWidget { GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); //Four Corners - this.drawTexturedRect(this.x, this.y, 0, 46 + textureOffset * 20, 4, 4); - this.drawTexturedRect(this.x + this.width - 4, this.y, 196, 46 + textureOffset * 20, 4, 4); - this.drawTexturedRect(this.x, this.y + this.height - 4, 0, 62 + textureOffset * 20, 4, 4); - this.drawTexturedRect(this.x + this.width - 4, this.y + this.height - 4, 196, 62 + textureOffset * 20, 4, 4); + this.drawTexturedRect(x, y, 0, 46 + textureOffset * 20, 4, 4); + this.drawTexturedRect(x + width - 4, y, 196, 46 + textureOffset * 20, 4, 4); + this.drawTexturedRect(x, y + height - 4, 0, 62 + textureOffset * 20, 4, 4); + this.drawTexturedRect(x + width - 4, y + height - 4, 196, 62 + textureOffset * 20, 4, 4); //Sides - this.drawTexturedRect(this.x + 4, this.y, 4, 46 + textureOffset * 20, this.width - 8, 4); - this.drawTexturedRect(this.x + 4, this.y + this.height - 4, 4, 62 + textureOffset * 20, this.width - 8, 4); + this.drawTexturedRect(x + 4, y, 4, 46 + textureOffset * 20, width - 8, 4); + this.drawTexturedRect(x + 4, y + height - 4, 4, 62 + textureOffset * 20, width - 8, 4); - for(int i = this.y + 4; i < this.y + this.height - 4; i += 4) { - this.drawTexturedRect(this.x, i, 0, 50 + textureOffset * 20, this.width / 2, MathHelper.clamp(this.y + this.height - 4 - i, 0, 4)); - this.drawTexturedRect(this.x + this.width / 2, i, 200 - this.width / 2, 50 + textureOffset * 20, this.width / 2, MathHelper.clamp(this.y + this.height - 4 - i, 0, 4)); + for(int i = y + 4; i < y + height - 4; i += 4) { + this.drawTexturedRect(x, i, 0, 50 + textureOffset * 20, width / 2, MathHelper.clamp(y + height - 4 - i, 0, 4)); + this.drawTexturedRect(x + width / 2, i, 200 - width / 2, 50 + textureOffset * 20, width / 2, MathHelper.clamp(y + height - 4 - i, 0, 4)); } int colour = 14737632; @@ -99,7 +89,7 @@ public abstract class ButtonWidget extends Drawable implements IWidget { colour = 16777120; } - this.drawStringCentered(fontRenderer_1, this.text, this.x + this.width / 2, this.y + (this.height - 8) / 2, colour); + this.drawStringCentered(fontRenderer_1, this.text, x + width / 2, y + (height - 8) / 2, colour); } } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java deleted file mode 100644 index c43d4c12e..000000000 --- a/src/main/java/me/shedaniel/rei/gui/widget/ConfigWidget.java +++ /dev/null @@ -1,177 +0,0 @@ -package me.shedaniel.rei.gui.widget; - -import com.google.common.collect.Lists; -import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.client.REIItemListOrdering; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.GuiEventListener; -import net.minecraft.client.gui.Screen; -import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.Window; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -public class ConfigWidget extends Screen { - - private List widgets; - private Screen parent; - - public ConfigWidget(Screen parent) { - this.parent = parent; - this.widgets = Lists.newArrayList(); - } - - @Override - public boolean keyPressed(int int_1, int int_2, int int_3) { - if (int_1 == 256 && this.doesEscapeKeyClose()) { - MinecraftClient.getInstance().openScreen(parent); - return true; - } else { - return super.keyPressed(int_1, int_2, int_3); - } - } - - @Override - protected void onInitialized() { - super.onInitialized(); - widgets.clear(); - Window window = MinecraftClient.getInstance().window; - widgets.add(new ButtonWidget(window.getScaledWidth() / 2 - 20, 30, 40, 20, "") { - @Override - public void onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigHelper().setSideSearchField(!RoughlyEnoughItemsCore.getConfigHelper().sideSearchField()); - try { - RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void draw(int mouseX, int mouseY, float partialTicks) { - text = getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().sideSearchField()); - String t = I18n.translate("text.rei.side_searchbox"); - int width = fontRenderer.getStringWidth(t); - fontRenderer.drawWithShadow(t, this.x - width - 10, this.y + (this.height - 8) / 2, -1); - super.draw(mouseX, mouseY, partialTicks); - } - }); - widgets.add(new ButtonWidget(window.getScaledWidth() / 2 - 20, 60, 40, 20, "") { - @Override - public void onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigHelper().setShowCraftableOnlyButton(!RoughlyEnoughItemsCore.getConfigHelper().showCraftableOnlyButton()); - try { - RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void draw(int mouseX, int mouseY, float partialTicks) { - text = getTrueFalseText(RoughlyEnoughItemsCore.getConfigHelper().showCraftableOnlyButton()); - String t = I18n.translate("text.rei.enable_craftable_only"); - int width = fontRenderer.getStringWidth(t); - fontRenderer.drawWithShadow(t, this.x - width - 10, this.y + (this.height - 8) / 2, -1); - super.draw(mouseX, mouseY, partialTicks); - } - }); - widgets.add(new ButtonWidget(window.getScaledWidth() / 2 - 90, 90, 150, 20, "") { - @Override - public void onPressed(int button, double mouseX, double mouseY) { - int index = Arrays.asList(REIItemListOrdering.values()).indexOf(RoughlyEnoughItemsCore.getConfigHelper().getItemListOrdering()) + 1; - if (index >= REIItemListOrdering.values().length) { - index = 0; - RoughlyEnoughItemsCore.getConfigHelper().setAscending(!RoughlyEnoughItemsCore.getConfigHelper().isAscending()); - } - RoughlyEnoughItemsCore.getConfigHelper().setItemListOrdering(REIItemListOrdering.values()[index]); - try { - RoughlyEnoughItemsCore.getConfigHelper().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.list_ordering_button", I18n.translate(RoughlyEnoughItemsCore.getConfigHelper().getItemListOrdering().getNameTranslationKey()), I18n.translate(RoughlyEnoughItemsCore.getConfigHelper().isAscending() ? "ordering.rei.ascending" : "ordering.rei.descending")); - String t = I18n.translate("text.rei.list_ordering") + ": "; - drawString(MinecraftClient.getInstance().fontRenderer, t, parent.width / 2 - 95 - MinecraftClient.getInstance().fontRenderer.getStringWidth(t), 90 + 6, -1); - super.draw(int_1, int_2, float_1); - } - }); - widgets.add(new ButtonWidget(window.getScaledWidth() / 2 - 20, 120, 40, 20, "") { - @Override - public void onPressed(int button, double mouseX, double mouseY) { - if (button == 0) - RoughlyEnoughItemsCore.getConfigHelper().setMirrorItemPanel(!RoughlyEnoughItemsCore.getConfigHelper().isMirrorItemPanel()); - try { - RoughlyEnoughItemsCore.getConfigHelper().saveConfig(); - } catch (IOException e) { - e.