diff options
Diffstat (limited to 'src/main/java')
7 files changed, 67 insertions, 14 deletions
diff --git a/src/main/java/me/shedaniel/config/REIConfig.java b/src/main/java/me/shedaniel/config/REIConfig.java index 4acaa102a..9e6b3d36f 100644 --- a/src/main/java/me/shedaniel/config/REIConfig.java +++ b/src/main/java/me/shedaniel/config/REIConfig.java @@ -12,5 +12,6 @@ public class REIConfig { public int recipeKeyBind = KeyEvent.VK_R; public int usageKeyBind = KeyEvent.VK_U; public int hideKeyBind = KeyEvent.VK_O; + public boolean centreSearchBox = false; } diff --git a/src/main/java/me/shedaniel/gui/ConfigGui.java b/src/main/java/me/shedaniel/gui/ConfigGui.java index 6d67488f8..c7dfad3ab 100644 --- a/src/main/java/me/shedaniel/gui/ConfigGui.java +++ b/src/main/java/me/shedaniel/gui/ConfigGui.java @@ -5,9 +5,11 @@ import me.shedaniel.Core; 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.resource.language.I18n; import java.io.IOException; +import java.util.Arrays; public class ConfigGui extends Gui { @@ -28,7 +30,7 @@ public class ConfigGui extends Gui { e.printStackTrace(); } })); - addButton(new KeyBindButton(997, parent.width / 2 - 20, 60, 80, 20, Core.config.usageKeyBind, key -> { + addButton(new KeyBindButton(998, parent.width / 2 - 20, 60, 80, 20, Core.config.usageKeyBind, key -> { Core.config.usageKeyBind = key; ClientListener.usageKeyBind.setKey(key); try { @@ -37,7 +39,7 @@ public class ConfigGui extends Gui { e.printStackTrace(); } })); - addButton(new KeyBindButton(997, parent.width / 2 - 20, 90, 80, 20, Core.config.hideKeyBind, key -> { + addButton(new KeyBindButton(999, parent.width / 2 - 20, 90, 80, 20, Core.config.hideKeyBind, key -> { Core.config.hideKeyBind = key; ClientListener.hideKeyBind.setKey(key); try { @@ -46,6 +48,29 @@ public class ConfigGui extends Gui { 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); + } + }); } @Override diff --git a/src/main/java/me/shedaniel/gui/GuiItemList.java b/src/main/java/me/shedaniel/gui/GuiItemList.java index 14ec8c5b3..accd02f61 100755 --- a/src/main/java/me/shedaniel/gui/GuiItemList.java +++ b/src/main/java/me/shedaniel/gui/GuiItemList.java @@ -99,7 +99,7 @@ public class GuiItemList extends Drawable { if (searchBox != null) { savedText = searchBox.getText(); } - searchBox = new TextBox(rect.x, rect.height - 31, rect.width - 4, 18); + searchBox = new TextBox(getSearchBoxArea()); searchBox.setText(savedText); controls.add(searchBox); buttonCheating = new Button(5, 5, 45, 20, getCheatModeText()); @@ -117,6 +117,16 @@ public class GuiItemList extends Drawable { controls.addAll(displaySlots); } + private Rectangle getSearchBoxArea() { + int ch = ((IMixinContainerGui) overlayedGui).getContainerHeight(), cw = ((IMixinContainerGui) overlayedGui).getContainerWidth(); + if (Core.config.centreSearchBox) { + if (ch + 4 + 18 > rect.height) //Will be out of bounds + return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height + 100, cw, 18); + return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height - 31, cw, 18); + } + return new Rectangle(rect.x, rect.height - 31, rect.width - 4, 18); + } + private void fillSlots() { page = MathHelper.clamp(page, 0, (int) Math.floor(view.size() / displaySlots.size())); int firstSlot = page * displaySlots.size(); diff --git a/src/main/java/me/shedaniel/gui/widget/TextBox.java b/src/main/java/me/shedaniel/gui/widget/TextBox.java index 6a33031a9..849e52c8c 100755 --- a/src/main/java/me/shedaniel/gui/widget/TextBox.java +++ b/src/main/java/me/shedaniel/gui/widget/TextBox.java @@ -20,6 +20,14 @@ public class TextBox extends Control implements IFocusable { this.charPressed = this::charTyped; } + public TextBox(Rectangle rectangle) { + super(rectangle); + textField = new TextFieldWidget(-1, REIRenderHelper.getFontRenderer(), rectangle.x, rectangle.y, rectangle.width, rectangle.height); + this.onClick = this::doMouseClick; + this.onKeyDown = this::onKeyPressed; + this.charPressed = this::charTyped; + } + @Override public void draw() { textField.render(0, 0, 0); diff --git a/src/main/java/me/shedaniel/listenerdefinitions/IMixinContainerGui.java b/src/main/java/me/shedaniel/listenerdefinitions/IMixinContainerGui.java index 7d794a7b5..a4b2f2004 100755 --- a/src/main/java/me/shedaniel/listenerdefinitions/IMixinContainerGui.java +++ b/src/main/java/me/shedaniel/listenerdefinitions/IMixinContainerGui.java @@ -8,6 +8,10 @@ public interface IMixinContainerGui { public int getGuiLeft(); + public int getContainerHeight(); + + public int getContainerWidth(); + public int getXSize(); public Slot getHoveredSlot(); diff --git a/src/main/java/me/shedaniel/mixins/MixinContainerGui.java b/src/main/java/me/shedaniel/mixins/MixinContainerGui.java index a645bdd2d..b9bf0545b 100755 --- a/src/main/java/me/shedaniel/mixins/MixinContainerGui.java +++ b/src/main/java/me/shedaniel/mixins/MixinContainerGui.java @@ -90,4 +90,14 @@ public abstract class MixinContainerGui extends Gui implements IMixinContainerGu public Slot getHoveredSlot() { return focusedSlot; } + + @Override + public int getContainerHeight() { + return containerHeight; + } + + @Override + public int getContainerWidth() { + return containerWidth; + } } diff --git a/src/main/java/me/shedaniel/mixins/MixinCreativePlayerInventoryGui.java b/src/main/java/me/shedaniel/mixins/MixinCreativePlayerInventoryGui.java index d9cfddfdd..1385e374f 100644 --- a/src/main/java/me/shedaniel/mixins/MixinCreativePlayerInventoryGui.java +++ b/src/main/java/me/shedaniel/mixins/MixinCreativePlayerInventoryGui.java @@ -4,9 +4,7 @@ import me.shedaniel.Core; import me.shedaniel.listenerdefinitions.GuiKeyDown; import net.minecraft.client.gui.ingame.AbstractPlayerInventoryGui; import net.minecraft.client.gui.ingame.CreativePlayerInventoryGui; -import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.container.Container; -import net.minecraft.container.Slot; import net.minecraft.item.ItemGroup; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -30,15 +28,12 @@ public abstract class MixinCreativePlayerInventoryGui extends AbstractPlayerInve @Inject(method = "keyPressed(III)Z", at = @At("HEAD"), cancellable = true) public void keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_, CallbackInfoReturnable<Boolean> ci) { boolean handled = false; - if (method_2469() != ItemGroup.SEARCH.getId()) { - if (method_2469() == ItemGroup.INVENTORY.getId()) { - for(GuiKeyDown listener : Core.getListeners(GuiKeyDown.class)) - if (listener.keyDown(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) { - ci.setReturnValue(true); - handled = true; - } - } - } + if (method_2469() == ItemGroup.INVENTORY.getId()) + for(GuiKeyDown listener : Core.getListeners(GuiKeyDown.class)) + if (listener.keyDown(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) { + ci.setReturnValue(true); + handled = true; + } if (handled) ci.cancel(); } |