Skip to content

1.19.2 Scroll Fix #115

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

Open
TheGMYeti wants to merge 4 commits into
base: 1.19.2
Choose a base branch
from
Open

1.19.2 Scroll Fix #115

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4f76f5
Modified client.gui.RunProgramScreen, adding a privated function to a…
Jul 26, 2024
48c6618
Oops, Syntax. Too much CC got me wrong.
Jul 26, 2024
7a775f9
Had some trouble trying to get the mod to compile into the modpack I …
TheGMYeti Jul 26, 2024
e577609
Somehow this didn't crash me in the test environment.
TheGMYeti Jul 27, 2024
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
58 changes: 22 additions & 36 deletions common/src/main/java/me/codexadrian/tempad/client/gui/RunProgramScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,28 @@ public RunProgramScreen(int color, InteractionHand hand) {
@Override
public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
int wiggleRoom = listSize > 12 ? listSize - 12 : 0;
mouseMovement = Math.min(wiggleRoom, Math.max(mouseMovement + (int) (delta * 10), 0));
mouseMovement = Math.min(wiggleRoom, Math.max(mouseMovement - (int) (delta), 0));
if(listSize > 12) listNeedsReload = true;
return super.mouseScrolled(mouseX, mouseY, delta);
}

private void addRenderableLocationList(){
int x = (width - WIDTH) / 2 + 3 + 16 * 15;
int y = (height - HEIGHT) / 2 + 3 + 16 * 2;
if(displayedLocations != null)
for(TextButton button : displayedLocations)
removeWidget(button);
displayedLocations = new ArrayList<>();
int offset = Math.max(0,Math.min(mouseMovement, listSize - 12));
for(int i = offset; i < Math.min(listSize,12 + offset); i++) {
LocationData data = allLocations.get(i);
displayedLocations.add(new TextButton(x, y, 12, Component.literal(data.getName()), color, (button -> locationButtonOnPress(data))));
y+=16;
}
displayedLocations.forEach(this::addRenderableWidget);
this.listNeedsReload = false;
}

@Override
protected void init() {
super.init();
Expand All @@ -71,25 +88,9 @@ protected void init() {
ItemStack stack = minecraft.player.getItemInHand(this.hand);
if(stack.hasTag()) {
allLocations = new ArrayList<>(TempadComponent.fromStack(stack).getLocations());
Collections.sort(allLocations);
listSize = allLocations.size();
List<LocationData> shownLocationData = new ArrayList<>();
if(listSize > 12) {
for(int i = 0; i < 12; i++) {
shownLocationData.add(allLocations.get(i));
}
} else {
shownLocationData = allLocations;
}

int x = (width - WIDTH) / 2 + offset + 16 * 15;
int y = (height - HEIGHT) / 2 + offset + 16 * 2;
Collections.sort(shownLocationData);
for(LocationData data : shownLocationData) {
var locationButton = new TextButton(x, y, 12, Component.literal(data.getName()), color, (button) -> locationButtonOnPress(data));
this.displayedLocations.add(locationButton);
addRenderableWidget(locationButton);
y+=16;
}
addRenderableLocationList();
}

TextButton addLocation = new TextButton((width - WIDTH) / 2 + offset + 16 * 15, (height - HEIGHT) / 2 + offset + 16 * 14, 12, Component.translatable("gui." + Constants.MODID + ".new_location"), color, (button)->{
Expand Down Expand Up @@ -147,23 +148,8 @@ public void tick() {
addRenderableWidget(timedoorSprite);
this.interfaceNeedsReload = false;
}
int x = (width - WIDTH) / 2 + 3 + 16 * 15;
int y = (height - HEIGHT) / 2 + 3 + 16 * 2;
if(this.listNeedsReload) {

for(TextButton button : displayedLocations) {
removeWidget(button);
}
displayedLocations = new ArrayList<>();
int offset = Math.min(mouseMovement, listSize - 12);
for(int i = offset; i < 12 + offset; i++) {
LocationData data = allLocations.get(i);
displayedLocations.add(new TextButton(x, y, 12, Component.literal(data.getName()), color, (button -> locationButtonOnPress(data))));
y+=16;
}
displayedLocations.forEach(this::addRenderableWidget);
this.listNeedsReload = false;
}
if(this.listNeedsReload)
addRenderableLocationList();
}

private void renderOutline(PoseStack poseStack) {
Expand Down