|
@@ -44,7 +44,7 @@ import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
public class ContainerScreenOverlay extends AbstractParentElement implements Drawable {
|
|
public class ContainerScreenOverlay extends AbstractParentElement implements Drawable {
|
|
-
|
|
|
|
|
|
+
|
|
private static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
|
|
private static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
|
|
private static final List<QueuedTooltip> QUEUED_TOOLTIPS = Lists.newArrayList();
|
|
private static final List<QueuedTooltip> QUEUED_TOOLTIPS = Lists.newArrayList();
|
|
public static String searchTerm = "";
|
|
public static String searchTerm = "";
|
|
@@ -56,15 +56,15 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
private Window window;
|
|
private Window window;
|
|
private CraftableToggleButtonWidget toggleButtonWidget;
|
|
private CraftableToggleButtonWidget toggleButtonWidget;
|
|
private ButtonWidget buttonLeft, buttonRight;
|
|
private ButtonWidget buttonLeft, buttonRight;
|
|
-
|
|
|
|
|
|
+
|
|
public static ItemListOverlay getItemListOverlay() {
|
|
public static ItemListOverlay getItemListOverlay() {
|
|
return itemListOverlay;
|
|
return itemListOverlay;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void init() {
|
|
public void init() {
|
|
init(false);
|
|
init(false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void init(boolean setPage) {
|
|
public void init(boolean setPage) {
|
|
this.shouldReInit = false;
|
|
this.shouldReInit = false;
|
|
//Update Variables
|
|
//Update Variables
|
|
@@ -74,7 +74,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
this.rectangle = RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? boundsHandler.getLeftBounds(MinecraftClient.getInstance().currentScreen) : boundsHandler.getRightBounds(MinecraftClient.getInstance().currentScreen);
|
|
this.rectangle = RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? boundsHandler.getLeftBounds(MinecraftClient.getInstance().currentScreen) : boundsHandler.getRightBounds(MinecraftClient.getInstance().currentScreen);
|
|
widgets.add(itemListOverlay = new ItemListOverlay(page));
|
|
widgets.add(itemListOverlay = new ItemListOverlay(page));
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
-
|
|
|
|
|
|
+
|
|
widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TranslatableText("text.rei.left_arrow")) {
|
|
widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TranslatableText("text.rei.left_arrow")) {
|
|
@Override
|
|
@Override
|
|
public void onPressed() {
|
|
public void onPressed() {
|
|
@@ -83,12 +83,12 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
page = getTotalPage();
|
|
page = getTotalPage();
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
return Optional.ofNullable(I18n.translate("text.rei.previous_page"));
|
|
return Optional.ofNullable(I18n.translate("text.rei.previous_page"));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
@@ -102,21 +102,21 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
page = 0;
|
|
page = 0;
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
return Optional.ofNullable(I18n.translate("text.rei.next_page"));
|
|
return Optional.ofNullable(I18n.translate("text.rei.next_page"));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
if (setPage)
|
|
if (setPage)
|
|
page = MathHelper.clamp(page, 0, getTotalPage());
|
|
page = MathHelper.clamp(page, 0, getTotalPage());
|
|
-
|
|
|
|
|
|
+
|
|
widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 30 : 10, 10, 20, 20, "") {
|
|
widgets.add(new ButtonWidget(RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 30 : 10, 10, 20, 20, "") {
|
|
@Override
|
|
@Override
|
|
public void onPressed() {
|
|
public void onPressed() {
|
|
@@ -126,7 +126,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
}
|
|
}
|
|
RoughlyEnoughItemsCore.getConfigManager().openConfigScreen(ScreenHelper.getLastContainerScreen());
|
|
RoughlyEnoughItemsCore.getConfigManager().openConfigScreen(ScreenHelper.getLastContainerScreen());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
super.render(mouseX, mouseY, delta);
|
|
super.render(mouseX, mouseY, delta);
|
|
@@ -141,7 +141,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
blit(getBounds().x + 3, getBounds().y + 3, 0, 0, 14, 14);
|
|
blit(getBounds().x + 3, getBounds().y + 3, 0, 0, 14, 14);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
String tooltips = I18n.translate("text.rei.config_tooltip");
|
|
String tooltips = I18n.translate("text.rei.config_tooltip");
|
|
@@ -156,7 +156,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
tooltips += "\n" + I18n.translate("text.rei.cheating_limited_enabled");
|
|
tooltips += "\n" + I18n.translate("text.rei.cheating_limited_enabled");
|
|
return Optional.ofNullable(tooltips);
|
|
return Optional.ofNullable(tooltips);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
@@ -168,31 +168,31 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
public void onPressed() {
|
|
public void onPressed() {
|
|
MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().gamemodeCommand.replaceAll("\\{gamemode}", getNextGameMode(Screen.hasShiftDown()).getName()));
|
|
MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().gamemodeCommand.replaceAll("\\{gamemode}", getNextGameMode(Screen.hasShiftDown()).getName()));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
text = getGameModeShortText(getCurrentGameMode());
|
|
text = getGameModeShortText(getCurrentGameMode());
|
|
super.render(mouseX, mouseY, delta);
|
|
super.render(mouseX, mouseY, delta);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
return Optional.ofNullable(I18n.translate("text.rei.gamemode_button.tooltip", getGameModeText(getNextGameMode(Screen.hasShiftDown()))));
|
|
return Optional.ofNullable(I18n.translate("text.rei.gamemode_button.tooltip", getGameModeText(getNextGameMode(Screen.hasShiftDown()))));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
int xxx = RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 30 : 10;
|
|
int xxx = RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel ? window.getScaledWidth() - 30 : 10;
|
|
- for(Weather weather : Weather.values()) {
|
|
|
|
|
|
+ for (Weather weather : Weather.values()) {
|
|
widgets.add(new ButtonWidget(xxx, 35, 20, 20, "") {
|
|
widgets.add(new ButtonWidget(xxx, 35, 20, 20, "") {
|
|
@Override
|
|
@Override
|
|
public void onPressed() {
|
|
public void onPressed() {
|
|
MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().weatherCommand.replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT)));
|
|
MinecraftClient.getInstance().player.sendChatMessage(RoughlyEnoughItemsCore.getConfigManager().getConfig().weatherCommand.replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT)));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
super.render(mouseX, mouseY, delta);
|
|
super.render(mouseX, mouseY, delta);
|
|
@@ -201,12 +201,12 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
blit(getBounds().x + 3, getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
|
|
blit(getBounds().x + 3, getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
return Optional.ofNullable(I18n.translate("text.rei.weather_button.tooltip", I18n.translate(weather.getTranslateKey())));
|
|
return Optional.ofNullable(I18n.translate("text.rei.weather_button.tooltip", I18n.translate(weather.getTranslateKey())));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
@@ -222,19 +222,19 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
this.text = String.format("%s/%s", page + 1, getTotalPage() + 1);
|
|
this.text = String.format("%s/%s", page + 1, getTotalPage() + 1);
|
|
super.render(mouseX, mouseY, delta);
|
|
super.render(mouseX, mouseY, delta);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Optional<String> getTooltips() {
|
|
public Optional<String> getTooltips() {
|
|
return Optional.ofNullable(I18n.translate("text.rei.go_back_first_page"));
|
|
return Optional.ofNullable(I18n.translate("text.rei.go_back_first_page"));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void onLabelClicked() {
|
|
public void onLabelClicked() {
|
|
MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
|
|
MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
|
|
page = 0;
|
|
page = 0;
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
public boolean changeFocus(boolean boolean_1) {
|
|
return false;
|
|
return false;
|
|
@@ -257,7 +257,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
RoughlyEnoughItemsCore.getConfigManager().toggleCraftableOnly();
|
|
RoughlyEnoughItemsCore.getConfigManager().toggleCraftableOnly();
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, true);
|
|
itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, true);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void lateRender(int mouseX, int mouseY, float delta) {
|
|
public void lateRender(int mouseX, int mouseY, float delta) {
|
|
blitOffset = 300;
|
|
blitOffset = 300;
|
|
@@ -268,7 +268,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
toggleButtonWidget = null;
|
|
toggleButtonWidget = null;
|
|
this.itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
this.itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private Weather getNextWeather() {
|
|
private Weather getNextWeather() {
|
|
try {
|
|
try {
|
|
Weather current = getCurrentWeather();
|
|
Weather current = getCurrentWeather();
|
|
@@ -280,7 +280,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
return Weather.CLEAR;
|
|
return Weather.CLEAR;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private Weather getCurrentWeather() {
|
|
private Weather getCurrentWeather() {
|
|
ClientWorld world = MinecraftClient.getInstance().world;
|
|
ClientWorld world = MinecraftClient.getInstance().world;
|
|
if (world.isThundering())
|
|
if (world.isThundering())
|
|
@@ -289,15 +289,15 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
return Weather.RAIN;
|
|
return Weather.RAIN;
|
|
return Weather.CLEAR;
|
|
return Weather.CLEAR;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private String getGameModeShortText(GameMode gameMode) {
|
|
private String getGameModeShortText(GameMode gameMode) {
|
|
return I18n.translate("text.rei.short_gamemode." + gameMode.getName());
|
|
return I18n.translate("text.rei.short_gamemode." + gameMode.getName());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private String getGameModeText(GameMode gameMode) {
|
|
private String getGameModeText(GameMode gameMode) {
|
|
return I18n.translate("selectWorld.gameMode." + gameMode.getName());
|
|
return I18n.translate("selectWorld.gameMode." + gameMode.getName());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private GameMode getNextGameMode(boolean reverse) {
|
|
private GameMode getNextGameMode(boolean reverse) {
|
|
try {
|
|
try {
|
|
GameMode current = getCurrentGameMode();
|
|
GameMode current = getCurrentGameMode();
|
|
@@ -313,11 +313,11 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
return GameMode.NOT_SET;
|
|
return GameMode.NOT_SET;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private GameMode getCurrentGameMode() {
|
|
private GameMode getCurrentGameMode() {
|
|
return MinecraftClient.getInstance().getNetworkHandler().getPlayerListEntry(MinecraftClient.getInstance().player.getGameProfile().getId()).getGameMode();
|
|
return MinecraftClient.getInstance().getNetworkHandler().getPlayerListEntry(MinecraftClient.getInstance().player.getGameProfile().getId()).getGameMode();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private Rectangle getTextFieldArea() {
|
|
private Rectangle getTextFieldArea() {
|
|
int widthRemoved = RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton ? 22 : 2;
|
|
int widthRemoved = RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton ? 22 : 2;
|
|
if (RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField)
|
|
if (RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField)
|
|
@@ -332,22 +332,22 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
}
|
|
}
|
|
return new Rectangle(ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft(), window.getScaledHeight() - 22, ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth() - widthRemoved, 18);
|
|
return new Rectangle(ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft(), window.getScaledHeight() - 22, ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth() - widthRemoved, 18);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private Rectangle getCraftableToggleArea() {
|
|
private Rectangle getCraftableToggleArea() {
|
|
Rectangle searchBoxArea = getTextFieldArea();
|
|
Rectangle searchBoxArea = getTextFieldArea();
|
|
searchBoxArea.setLocation(searchBoxArea.x + searchBoxArea.width + 4, searchBoxArea.y - 1);
|
|
searchBoxArea.setLocation(searchBoxArea.x + searchBoxArea.width + 4, searchBoxArea.y - 1);
|
|
searchBoxArea.setSize(20, 20);
|
|
searchBoxArea.setSize(20, 20);
|
|
return searchBoxArea;
|
|
return searchBoxArea;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private String getCheatModeText() {
|
|
private String getCheatModeText() {
|
|
return I18n.translate(String.format("%s%s", "text.rei.", ClientHelper.getInstance().isCheating() ? "cheat" : "nocheat"));
|
|
return I18n.translate(String.format("%s%s", "text.rei.", ClientHelper.getInstance().isCheating() ? "cheat" : "nocheat"));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public Rectangle getRectangle() {
|
|
public Rectangle getRectangle() {
|
|
return rectangle;
|
|
return rectangle;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
public void render(int mouseX, int mouseY, float delta) {
|
|
List<ItemStack> currentStacks = ClientHelper.getInstance().getInventoryItemsTypes();
|
|
List<ItemStack> currentStacks = ClientHelper.getInstance().getInventoryItemsTypes();
|
|
@@ -365,7 +365,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
blitOffset = 200;
|
|
blitOffset = 200;
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
int left = hooks.rei_getContainerLeft(), top = hooks.rei_getContainerTop();
|
|
int left = hooks.rei_getContainerLeft(), top = hooks.rei_getContainerTop();
|
|
- for(Slot slot : ((AbstractContainerScreen<?>) MinecraftClient.getInstance().currentScreen).getContainer().slotList)
|
|
|
|
|
|
+ for (Slot slot : ((AbstractContainerScreen<?>) MinecraftClient.getInstance().currentScreen).getContainer().slotList)
|
|
if (!slot.hasStack() || !itemListOverlay.filterItem(slot.getStack(), itemListOverlay.getLastSearchArgument()))
|
|
if (!slot.hasStack() || !itemListOverlay.filterItem(slot.getStack(), itemListOverlay.getLastSearchArgument()))
|
|
fillGradient(left + slot.xPosition, top + slot.yPosition, left + slot.xPosition + 16, top + slot.yPosition + 16, -601874400, -601874400);
|
|
fillGradient(left + slot.xPosition, top + slot.yPosition, left + slot.xPosition + 16, top + slot.yPosition + 16, -601874400, -601874400);
|
|
blitOffset = 0;
|
|
blitOffset = 0;
|
|
@@ -375,7 +375,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
this.renderWidgets(mouseX, mouseY, delta);
|
|
this.renderWidgets(mouseX, mouseY, delta);
|
|
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) {
|
|
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) {
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
- for(RecipeHelperImpl.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
|
|
|
|
|
|
+ for (RecipeHelperImpl.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
|
|
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
|
|
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
|
|
if (area.getRectangle().contains(mouseX - hooks.rei_getContainerLeft(), mouseY - hooks.rei_getContainerTop())) {
|
|
if (area.getRectangle().contains(mouseX - hooks.rei_getContainerLeft(), mouseY - hooks.rei_getContainerTop())) {
|
|
String collect = Arrays.asList(area.getCategories()).stream().map(identifier -> RecipeHelper.getInstance().getCategory(identifier).getCategoryName()).collect(Collectors.joining(", "));
|
|
String collect = Arrays.asList(area.getCategories()).stream().map(identifier -> RecipeHelper.getInstance().getCategory(identifier).getCategoryName()).collect(Collectors.joining(", "));
|
|
@@ -384,17 +384,19 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void lateRender(int mouseX, int mouseY, float delta) {
|
|
public void lateRender(int mouseX, int mouseY, float delta) {
|
|
- ScreenHelper.searchField.laterRender(mouseX, mouseY, delta);
|
|
|
|
- if (toggleButtonWidget != null)
|
|
|
|
- toggleButtonWidget.lateRender(mouseX, mouseY, delta);
|
|
|
|
- Screen currentScreen = MinecraftClient.getInstance().currentScreen;
|
|
|
|
- if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
|
|
|
|
- QUEUED_TOOLTIPS.stream().filter(Objects::nonNull).forEach(this::renderTooltip);
|
|
|
|
|
|
+ if (ScreenHelper.isOverlayVisible()) {
|
|
|
|
+ ScreenHelper.searchField.laterRender(mouseX, mouseY, delta);
|
|
|
|
+ if (toggleButtonWidget != null)
|
|
|
|
+ toggleButtonWidget.lateRender(mouseX, mouseY, delta);
|
|
|
|
+ Screen currentScreen = MinecraftClient.getInstance().currentScreen;
|
|
|
|
+ if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
|
|
|
|
+ QUEUED_TOOLTIPS.stream().filter(Objects::nonNull).forEach(this::renderTooltip);
|
|
|
|
+ }
|
|
QUEUED_TOOLTIPS.clear();
|
|
QUEUED_TOOLTIPS.clear();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@SuppressWarnings("deprecation")
|
|
@SuppressWarnings("deprecation")
|
|
public void renderTooltip(QueuedTooltip tooltip) {
|
|
public void renderTooltip(QueuedTooltip tooltip) {
|
|
if (tooltip.getConsumer() == null)
|
|
if (tooltip.getConsumer() == null)
|
|
@@ -402,7 +404,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
else
|
|
else
|
|
tooltip.getConsumer().accept(tooltip);
|
|
tooltip.getConsumer().accept(tooltip);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void renderTooltip(List<String> lines, int mouseX, int mouseY) {
|
|
public void renderTooltip(List<String> lines, int mouseX, int mouseY) {
|
|
if (lines.isEmpty())
|
|
if (lines.isEmpty())
|
|
return;
|
|
return;
|
|
@@ -424,7 +426,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415);
|
|
this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415);
|
|
this.fillGradient(x - 3, y + height + 2, x + width + 3, y + height + 3, 1344798847, 1344798847);
|
|
this.fillGradient(x - 3, y + height + 2, x + width + 3, y + height + 3, 1344798847, 1344798847);
|
|
int currentY = y;
|
|
int currentY = y;
|
|
- for(int lineIndex = 0; lineIndex < lines.size(); lineIndex++) {
|
|
|
|
|
|
+ for (int lineIndex = 0; lineIndex < lines.size(); lineIndex++) {
|
|
GlStateManager.disableDepthTest();
|
|
GlStateManager.disableDepthTest();
|
|
font.drawWithShadow(lines.get(lineIndex), x, currentY, -1);
|
|
font.drawWithShadow(lines.get(lineIndex), x, currentY, -1);
|
|
GlStateManager.enableDepthTest();
|
|
GlStateManager.enableDepthTest();
|
|
@@ -436,18 +438,18 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
GlStateManager.enableRescaleNormal();
|
|
GlStateManager.enableRescaleNormal();
|
|
}, width, height, 0);
|
|
}, width, height, 0);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private boolean hasSameListContent(List<ItemStack> list1, List<ItemStack> list2) {
|
|
private boolean hasSameListContent(List<ItemStack> list1, List<ItemStack> list2) {
|
|
list1.sort((itemStack, t1) -> ItemListOverlay.tryGetItemStackName(itemStack).compareToIgnoreCase(ItemListOverlay.tryGetItemStackName(t1)));
|
|
list1.sort((itemStack, t1) -> ItemListOverlay.tryGetItemStackName(itemStack).compareToIgnoreCase(ItemListOverlay.tryGetItemStackName(t1)));
|
|
list2.sort((itemStack, t1) -> ItemListOverlay.tryGetItemStackName(itemStack).compareToIgnoreCase(ItemListOverlay.tryGetItemStackName(t1)));
|
|
list2.sort((itemStack, t1) -> ItemListOverlay.tryGetItemStackName(itemStack).compareToIgnoreCase(ItemListOverlay.tryGetItemStackName(t1)));
|
|
-
|
|
|
|
|
|
+
|
|
return list1.stream().map(ItemListOverlay::tryGetItemStackName).collect(Collectors.joining("")).equals(list2.stream().map(ItemListOverlay::tryGetItemStackName).collect(Collectors.joining("")));
|
|
return list1.stream().map(ItemListOverlay::tryGetItemStackName).collect(Collectors.joining("")).equals(list2.stream().map(ItemListOverlay::tryGetItemStackName).collect(Collectors.joining("")));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void addTooltip(QueuedTooltip queuedTooltip) {
|
|
public void addTooltip(QueuedTooltip queuedTooltip) {
|
|
QUEUED_TOOLTIPS.add(queuedTooltip);
|
|
QUEUED_TOOLTIPS.add(queuedTooltip);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void renderWidgets(int int_1, int int_2, float float_1) {
|
|
public void renderWidgets(int int_1, int int_2, float float_1) {
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
return;
|
|
return;
|
|
@@ -458,11 +460,11 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
});
|
|
});
|
|
GuiLighting.disable();
|
|
GuiLighting.disable();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private int getTotalPage() {
|
|
private int getTotalPage() {
|
|
return itemListOverlay.getTotalPage();
|
|
return itemListOverlay.getTotalPage();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean mouseScrolled(double i, double j, double amount) {
|
|
public boolean mouseScrolled(double i, double j, double amount) {
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
@@ -476,16 +478,16 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
return false;
|
|
return false;
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
- for(Widget widget : widgets)
|
|
|
|
|
|
+ for (Widget widget : widgets)
|
|
if (widget.mouseScrolled(i, j, amount))
|
|
if (widget.mouseScrolled(i, j, amount))
|
|
return true;
|
|
return true;
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean keyPressed(int int_1, int int_2, int int_3) {
|
|
public boolean keyPressed(int int_1, int int_2, int int_3) {
|
|
if (ScreenHelper.isOverlayVisible())
|
|
if (ScreenHelper.isOverlayVisible())
|
|
- for(Element listener : widgets)
|
|
|
|
|
|
+ for (Element listener : widgets)
|
|
if (listener.keyPressed(int_1, int_2, int_3))
|
|
if (listener.keyPressed(int_1, int_2, int_3))
|
|
return true;
|
|
return true;
|
|
if (ClientHelper.getInstance().getHideKeyBinding().matchesKey(int_1, int_2)) {
|
|
if (ClientHelper.getInstance().getHideKeyBinding().matchesKey(int_1, int_2)) {
|
|
@@ -511,29 +513,29 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean charTyped(char char_1, int int_1) {
|
|
public boolean charTyped(char char_1, int int_1) {
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
return false;
|
|
return false;
|
|
- for(Element listener : widgets)
|
|
|
|
|
|
+ for (Element listener : widgets)
|
|
if (listener.charTyped(char_1, int_1))
|
|
if (listener.charTyped(char_1, int_1))
|
|
return true;
|
|
return true;
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<? extends Element> children() {
|
|
public List<? extends Element> children() {
|
|
return widgets;
|
|
return widgets;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean mouseClicked(double double_1, double double_2, int int_1) {
|
|
public boolean mouseClicked(double double_1, double double_2, int int_1) {
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
if (!ScreenHelper.isOverlayVisible())
|
|
return false;
|
|
return false;
|
|
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) {
|
|
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) {
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
|
|
- for(RecipeHelperImpl.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
|
|
|
|
|
|
+ for (RecipeHelperImpl.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
|
|
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
|
|
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
|
|
if (area.getRectangle().contains(double_1 - hooks.rei_getContainerLeft(), double_2 - hooks.rei_getContainerTop())) {
|
|
if (area.getRectangle().contains(double_1 - hooks.rei_getContainerLeft(), double_2 - hooks.rei_getContainerTop())) {
|
|
ClientHelper.getInstance().executeViewAllRecipesFromCategories(Arrays.asList(area.getCategories()));
|
|
ClientHelper.getInstance().executeViewAllRecipesFromCategories(Arrays.asList(area.getCategories()));
|
|
@@ -541,7 +543,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- for(Element element : widgets)
|
|
|
|
|
|
+ for (Element element : widgets)
|
|
if (element.mouseClicked(double_1, double_2, int_1)) {
|
|
if (element.mouseClicked(double_1, double_2, int_1)) {
|
|
this.setFocused(element);
|
|
this.setFocused(element);
|
|
if (int_1 == 0)
|
|
if (int_1 == 0)
|
|
@@ -550,20 +552,20 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public boolean isInside(double mouseX, double mouseY) {
|
|
public boolean isInside(double mouseX, double mouseY) {
|
|
if (!rectangle.contains(mouseX, mouseY))
|
|
if (!rectangle.contains(mouseX, mouseY))
|
|
return false;
|
|
return false;
|
|
- for(DisplayHelper.DisplayBoundsHandler handler : RoughlyEnoughItemsCore.getDisplayHelper().getSortedBoundsHandlers(MinecraftClient.getInstance().currentScreen.getClass())) {
|
|
|
|
|
|
+ for (DisplayHelper.DisplayBoundsHandler handler : RoughlyEnoughItemsCore.getDisplayHelper().getSortedBoundsHandlers(MinecraftClient.getInstance().currentScreen.getClass())) {
|
|
ActionResult in = handler.isInZone(!RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel, mouseX, mouseY);
|
|
ActionResult in = handler.isInZone(!RoughlyEnoughItemsCore.getConfigManager().getConfig().mirrorItemPanel, mouseX, mouseY);
|
|
if (in != ActionResult.PASS)
|
|
if (in != ActionResult.PASS)
|
|
return in == ActionResult.SUCCESS;
|
|
return in == ActionResult.SUCCESS;
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public boolean isInside(Point point) {
|
|
public boolean isInside(Point point) {
|
|
return isInside(point.getX(), point.getY());
|
|
return isInside(point.getX(), point.getY());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|