refactoring/SLC-1.8.9
1
0
Fork 0
mirror of https://github.com/refactorinqq/SLC-1.8.9.git synced 2024-11-10 10:01:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better Scroll

Browse Source
This commit is contained in:
kirillsaint 2023-11-06 15:02:05 +06:00
parent 441d373bb4
commit b539f0715c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java
View File

@ -21,6 +21,7 @@ import net.silentclient.client.gui.util.RenderUtil;
import net.silentclient.client.utils.*; import net.silentclient.client.utils.*;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.input.Mouse;
import java.awt.*; import java.awt.*;
import java.io.File; import java.io.File;
@ -102,11 +103,13 @@ public class SilentResourcePacksGui extends SilentScreen {
RenderUtils.drawRect(blockX, blockY, blockWidth, blockHeight, Theme.backgroundColor().getRGB()); RenderUtils.drawRect(blockX, blockY, blockWidth, blockHeight, Theme.backgroundColor().getRGB());
Client.getInstance().getSilentFontRenderer().drawString("Resource Packs", blockX + 5, blockY + 5, 14, SilentFontRenderer.FontType.TITLE); Client.getInstance().getSilentFontRenderer().drawString("Resource Packs", blockX + 5, blockY + 5, 14, SilentFontRenderer.FontType.TITLE);
MouseCursorHandler.CursorType cursorType1 = this.drawAvailableResourcePacks(blockX + 5, blockY + 14 + 5 + 2, mouseX, mouseY); int wheel = Mouse.getDWheel();
MouseCursorHandler.CursorType cursorType1 = this.drawAvailableResourcePacks(blockX + 5, blockY + 14 + 5 + 2, mouseX, mouseY, wheel);
if(cursorType1 != null) { if(cursorType1 != null) {
cursorType = cursorType1; cursorType = cursorType1;
} }
MouseCursorHandler.CursorType cursorType2 = this.drawActiveResourcePacks(blockX + blockWidth - 193 - 5, blockY + 14 + 5 + 2, mouseX, mouseY); MouseCursorHandler.CursorType cursorType2 = this.drawActiveResourcePacks(blockX + blockWidth - 193 - 5, blockY + 14 + 5 + 2, mouseX, mouseY, wheel);
if(cursorType2 != null) { if(cursorType2 != null) {
cursorType = cursorType2; cursorType = cursorType2;
} }
@ -116,7 +119,7 @@ public class SilentResourcePacksGui extends SilentScreen {
Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); Client.getInstance().getMouseCursorHandler().enableCursor(cursorType);
} }
private MouseCursorHandler.CursorType drawAvailableResourcePacks(float x, float y, int mouseX, int mouseY) { private MouseCursorHandler.CursorType drawAvailableResourcePacks(float x, float y, int mouseX, int mouseY, int wheel) {
MouseCursorHandler.CursorType cursorType = null; MouseCursorHandler.CursorType cursorType = null;
RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB()); RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB());
scrollHelper.setStep(5); scrollHelper.setStep(5);
@ -130,7 +133,7 @@ public class SilentResourcePacksGui extends SilentScreen {
scrollHelper.setFlag(false); scrollHelper.setFlag(false);
} }
float scrollY = scrollHelper.getScroll(); float scrollY = scrollHelper.getScroll(wheel);
float itemY = y + 19 + scrollY; float itemY = y + 19 + scrollY;
@ -195,7 +198,7 @@ public class SilentResourcePacksGui extends SilentScreen {
} }
} }
private MouseCursorHandler.CursorType drawActiveResourcePacks(float x, float y, int mouseX, int mouseY) { private MouseCursorHandler.CursorType drawActiveResourcePacks(float x, float y, int mouseX, int mouseY, int wheel) {
MouseCursorHandler.CursorType cursorType = null; MouseCursorHandler.CursorType cursorType = null;
RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB()); RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB());
scrollHelper2.setStep(5); scrollHelper2.setStep(5);
@ -207,7 +210,7 @@ public class SilentResourcePacksGui extends SilentScreen {
} else { } else {
scrollHelper2.setFlag(false); scrollHelper2.setFlag(false);
} }
float scrollY = scrollHelper2.getScroll(); float scrollY = scrollHelper2.getScroll(wheel);
Scissor.start((int) x, (int) y, 193, blockHeight - 45); Scissor.start((int) x, (int) y, 193, blockHeight - 45);
Client.getInstance().getSilentFontRenderer().drawString("Active", x + 3, y + 3 + scrollY, 14, SilentFontRenderer.FontType.TITLE); Client.getInstance().getSilentFontRenderer().drawString("Active", x + 3, y + 3 + scrollY, 14, SilentFontRenderer.FontType.TITLE);

10
src/main/java/net/silentclient/client/utils/ScrollHelper.java
View File

@ -8,14 +8,14 @@ public class ScrollHelper {
private float step = 0,real = 0,scroll = 0,elementsHeight = 0,maxScroll = 0,speed = 300F; private float step = 0,real = 0,scroll = 0,elementsHeight = 0,maxScroll = 0,speed = 300F;
private boolean flag = true; private boolean flag = true;
public float getScroll() {
return getScroll(Mouse.getDWheel());
}
/** /**
Returns the smoothed scroll value, only call this once after you set all the setters Returns the smoothed scroll value, only call this once after you set all the setters
*/ */
public float getScroll() { public float getScroll(int wheel) {
if(!flag) {
return -scroll;
}
int wheel = Mouse.getDWheel();
float delta = 1f / Minecraft.getDebugFPS(); float delta = 1f / Minecraft.getDebugFPS();
if(flag) if(flag)
real -= wheel / 120f * step; real -= wheel / 120f * step;