aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/cc/polyfrost/oneconfig/gui/pages
diff options
context:
space:
mode:
authorDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-06-30 16:01:02 +0200
committerDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-06-30 16:01:02 +0200
commit68a2dfb5a22137fb433531542e8660bae023595f (patch)
treed9b8808db52e1c196e37cd3d3b41bf491cf341d0 /src/main/java/cc/polyfrost/oneconfig/gui/pages
parentdcee46d4d0039993466fc7c0e2d0be7b31af3d4b (diff)
downloadOneConfig-68a2dfb5a22137fb433531542e8660bae023595f.tar.gz
OneConfig-68a2dfb5a22137fb433531542e8660bae023595f.tar.bz2
OneConfig-68a2dfb5a22137fb433531542e8660bae023595f.zip
lots of stuff
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/gui/pages')
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java5
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java3
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java
index 75a9f8e..5f454f2 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java
@@ -13,7 +13,6 @@ import cc.polyfrost.oneconfig.renderer.font.Fonts;
import cc.polyfrost.oneconfig.utils.color.ColorPalette;
import java.util.ArrayList;
-import java.util.Iterator;
public class ModsPage extends Page {
@@ -46,7 +45,7 @@ public class ModsPage extends Page {
ArrayList<ModCard> finalModCards = new ArrayList<>(modCards);
for (ModCard modCard : finalModCards) {
if (inSelection(modCard) && (filter.equals("") || modCard.getModData().name.toLowerCase().contains(filter))) {
- modCard.draw(vg, iX, iY);
+ if (iY + 135 >= y - scroll && iY <= y + 728 - scroll) modCard.draw(vg, iX, iY);
iX += 260;
if (iX > x + 796) {
iX = x + 16;
@@ -86,7 +85,7 @@ public class ModsPage extends Page {
public void reloadMods() {
modCards.clear();
- for (Mod modData : ConfigCore.oneConfigMods) {
+ for (Mod modData : ConfigCore.mods) {
modCards.add(new ModCard(modData, modData.config == null || modData.config.enabled, false, OneConfigConfig.favoriteMods.contains(modData.name), this));
}
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java
index 9a4b1eb..b55f851 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java
@@ -24,6 +24,7 @@ public abstract class Page {
private long scrollTime;
private boolean mouseWasDown, dragging;
private float yStart;
+ protected float scroll;
public final ArrayList<Page> parents = new ArrayList<>();
public Page(String title) {
@@ -47,7 +48,7 @@ public abstract class Page {
public void scrollWithDraw(long vg, int x, int y) {
int maxScroll = getMaxScrollHeight();
int scissorOffset = drawStatic(vg, x, y);
- float scroll = scrollAnimation == null ? scrollTarget : scrollAnimation.get();
+ scroll = scrollAnimation == null ? scrollTarget : scrollAnimation.get();
final float scrollBarLength = (728f / maxScroll) * 728f;
Scissor scissor = ScissorManager.scissor(vg, x, y + scissorOffset, x + 1056, y + 728 - scissorOffset);
Scissor inputScissor = InputUtils.blockInputArea(x, y,1056, scissorOffset);