Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplified HUDConfigScreen.java #3

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Simplified HUDConfigScreen.java #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2105489
Update HUDConfigScreen.java
thasave14 Oct 17, 2022
1ec7186
Update README.md
thasave14 Oct 17, 2022
e8c72d0
Update README.md
thasave14 Oct 17, 2022
63625ac
Update README.md
thasave14 Oct 17, 2022
977f7cc
Update HUDConfigScreen.java
thasave14 Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 37 additions & 115 deletions HUDConfigScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,129 +29,85 @@

public class HUDConfigScreen extends GuiScreen {

int i = 0;

// ADDED FOR SMOOTH DRAGGING

private int smX, smY;

private boolean dragged = false;

protected boolean hovered;


private final HashMap<IRenderer, ScreenPosition> renderers = new HashMap<IRenderer, ScreenPosition>();

private Optional<IRenderer> selectedRenderer = Optional.empty();

private int prevX, prevY;

private boolean dragged;
protected boolean hovered;

@Override
public void initGui() {

// modified to add your own buttons <3

super.initGui();
}

@Override
protected void actionPerformed(GuiButton button) throws IOException {
super.actionPerformed(button);
switch(button.id) {
case /*id of the button*/:
//do something
break;
}
}

public HUDConfigScreen(HUDManager api) {

Collection<IRenderer> registeredRenderers = api.getRegisteredRenderers();

for (IRenderer ren : registeredRenderers) {
if (!ren.isEnabled()) {
continue;
}
for (IRenderer ren : api.getRegisteredRenderers()) {
if (!ren.isEnabled()) continue;

ScreenPosition pos = ren.load();
if (pos == null) {
pos = ScreenPosition.fromRelativePosition(0.5, 0.5);
}
if (pos == null) pos = ScreenPosition.fromRelativePosition(0.5, 0.5);

adjustBounds(ren, pos);
this.renderers.put(ren, pos);
}

}

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {

super.drawDefaultBackground();

final float zBackup = this.zLevel;
this.zLevel = 200;


for (IRenderer renderer : renderers.keySet()) {

ScreenPosition pos = renderers.get(renderer);

Gui.drawRect(pos.getAbsoluteX(), pos.getAbsoluteY(), pos.getAbsoluteX() + renderer.getWidth(), pos.getAbsoluteY() + renderer.getHeight(), 0x33FFFFFF);
this.drawHollowRect(pos.getAbsoluteX(), pos.getAbsoluteY(), renderer.getWidth(), renderer.getHeight(), 0x88FFFFFF);



renderer.renderDummy(pos);

int x = pos.getAbsoluteX();
int y = pos.getAbsoluteY();

// START OF SMOOTH DRAGGING

// Thanks ESS_Si1kn#0481 for pointing out that I forgot to add these back.
int absoluteX = pos.getAbsoluteX();
int absoluteY = pos.getAbsoluteY();

this.hovered = mouseX >= absoluteX && mouseX <= absoluteX + renderer.getWidth() && mouseY >= absoluteY && mouseY <= absoluteY + renderer.getHeight();

this.hovered = mouseX >= x && mouseX <= x + renderer.getWidth() && mouseY >= y && mouseY <= y + renderer.getHeight();
if (this.hovered) {
if (dragged) {
Gui.drawRect(pos.getAbsoluteX(), pos.getAbsoluteY(), ren.getWidth() + pos.getAbsoluteX(), ren.getHeight() + pos.getAbsoluteY(), 0x43000000);
if (selectedRenderer.isPresent() && selectedRenderer.get() == ren && renderers.get(selectedRenderer.get()) == pos) {
pos.setAbsolute(pos.getAbsoluteX() + mouseX - this.prevX, pos.getAbsoluteY() + mouseY - this.prevY);

adjustBounds(renderer, pos);

adjustBounds(ren, pos);

this.drawHollowRect(x, y, ren.getWidth(), ren.getHeight(), new Color(70, 0, 70, 230).getRGB());

this.prevX = mouseX;
this.prevY = mouseY;
}
}

// END OF SMOOTH DRAGGING

}

this.smX = mouseX;
this.smY = mouseY;

this.zLevel = zBackup;

super.drawScreen(mouseX, mouseY, partialTicks);
}

private void drawHollowRect(int x, int y, int w, int h, int color) {

this.drawHorizontalLine(x, x + w, y, color);
this.drawHorizontalLine(x, x + w, y + h, color);

this.drawVerticalLine(x, y + h, y, color);
this.drawVerticalLine(x + w, y + h, y, color);

}

@Override
protected void keyTyped(char typedChar, int keyCode) throws IOException {
if (keyCode == Keyboard.KEY_ESCAPE) {
renderers.entrySet().forEach((entry) -> {
entry.getKey().save(entry.getValue());
});
this.mc.displayGuiScreen(null);
}
}

@Override
protected void mouseClickMove(int x, int y, int button, long time) {
if (selectedRenderer.isPresent()) {
moveSelectedRenderBy(x - prevX, y - prevY);
}
if (selectedRenderer.isPresent()) moveSelectedRenderBy(x - prevX, y - prevY);

this.prevX = x;
this.prevY = y;
Expand All @@ -163,60 +119,38 @@ private void moveSelectedRenderBy(int offsetX, int offsetY) {

pos.setAbsolute(pos.getAbsoluteX() + offsetX, pos.getAbsoluteY() + offsetY);

if (pos.getAbsoluteX() == 0 << 1) {
pos.setAbsolute(1, pos.getAbsoluteY());
}

if (pos.getAbsoluteY() == 0 << 1) {
pos.setAbsolute(pos.getAbsoluteX(), 1);
}

adjustBounds(renderer, pos);
}

@Override
public void onGuiClosed() {

for (IRenderer renderer : renderers.keySet()) {
/*for (IRenderer renderer : renderers.keySet()) {
renderer.save(renderers.get(renderer));
}
}

@Override
public boolean doesGuiPauseGame() {
return true;
}*/
renderers.forEach(IRendererConfig::save); //Lambda is avaible from Java 8 and up, if you use older versions of Java 8 you won't be able to use it, so you have to use the normal for loop
}

private void adjustBounds(IRenderer renderer, ScreenPosition pos) {
ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());

ScaledResolution res = new ScaledResolution(Minecraft.getMinecraft());

int screenWidth = res.getScaledWidth();
int screenHeight = res.getScaledHeight();

int absoluteX = Math.max(0, Math.min(pos.getAbsoluteX(), Math.max(screenWidth - renderer.getWidth(), 0)));
int absoluteY = Math.max(0, Math.min(pos.getAbsoluteY(), Math.max(screenHeight - renderer.getHeight(), 0)));
int x = Math.max(0, Math.min(pos.getAbsoluteX(), Math.max(sr.getScaledWidth() - renderer.getWidth(), 0)));
int y = Math.max(0, Math.min(pos.getAbsoluteY(), Math.max(sr.getScaledHeight() - renderer.getHeight(), 0)));

pos.setAbsolute(absoluteX, absoluteY);
pos.setAbsolute(x, y);
}

@Override
protected void mouseClicked(int x, int y, int button) throws IOException {
this.prevX = x;
this.prevY = y;

// NEEDED FOR SMOOTH DRAGGING
dragged = true;

loadMouseOver(x, y);
super.mouseClicked(x, y, button);
}

@Override
protected void mouseReleased(int mouseX, int mouseY, int state) {

// NEEDED FOR SMOOTH DRAGGING
dragged = false;
this.selectedRenderer = Optional.empty();

super.mouseReleased(mouseX, mouseY, state);
}
Expand All @@ -226,7 +160,6 @@ private void loadMouseOver(int x, int y) {
}

private class MouseOverFinder implements Predicate<IRenderer> {

private int mouseX, mouseY;

public MouseOverFinder(int x, int y) {
Expand All @@ -236,23 +169,12 @@ public MouseOverFinder(int x, int y) {

@Override
public boolean test(IRenderer renderer) {

ScreenPosition pos = renderers.get(renderer);

int absoluteX = pos.getAbsoluteX();
int absoluteY = pos.getAbsoluteY();

if (mouseX >= absoluteX && mouseX <= absoluteX + renderer.getWidth()) {

if (mouseY >= absoluteY && mouseY <= absoluteY + renderer.getHeight()) {

return true;

}

}
int x = pos.getAbsoluteX();
int y = pos.getAbsoluteY();

return false;
return (mouseX >= x && mouseX <= x + renderer.getWidth()) && (mouseY >= y && mouseY <= y + renderer.getHeight());
}

}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Smooth dragging for Eric Golde's drag system.

Original drag system created by OrangeMarshall.
Modified by Eric Golde to properly work in a client.
Edited by Mason#8979 and UghItsIsaac#6037 to smoothen out the dragging.
Edited by Mason#8979 and UghItsIsaac#6037 to smoothen out the dragging. Save14_#7156 Made some changes to simplify the code

How did we manage this?

Expand Down