MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Offer Mod Info Screen

Browse source
This commit is contained in:
Frank 2021-08-25 14:11:48 +02:00
parent 9d7fa9f925
commit b959e17c18
7 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/bclib/gui/gridlayout/GridLayout.java
View file

@ -134,7 +134,7 @@ public class GridLayout extends GridColumn {
GridElement el = this.buildElement((int)this.width, 0, 1, 0,0, elements);
this.height = el.height;
if (centerVertically && el.height + initialTopPadding < screenHeight) {
topPadding = (screenHeight - el.height - initialTopPadding) >> 1;
topPadding = (screenHeight - el.height) >> 1;
} else {
topPadding = initialTopPadding;
}

7
src/main/java/ru/bclib/gui/gridlayout/GridScreen.java
View file

@ -144,12 +144,11 @@ public abstract class GridScreen extends Screen {
}
public int getMaxScrollPos() {
return height-getScrollHeight();
return height - (getScrollHeight() + topPadding);
}
public boolean isScrollable() {
if (grid==null) return false;
return height<grid.getHeight();
return height<getScrollHeight();
}
public boolean isMouseOverScroller(double x, double y) {
@ -166,7 +165,7 @@ public abstract class GridScreen extends Screen {
final int y1 = height;
final int y0 = 0;
final int yd = y1 - y0;
final int maxPosition = getScrollHeight();
final int maxPosition = getScrollHeight() + topPadding;
final int x0 = width-SCROLLER_WIDTH;
final int x1 = width;

6
src/main/java/ru/bclib/gui/screens/ModListScreen.java
View file

@ -159,7 +159,7 @@ public class ModListScreen extends BCLibScreen {
if (description != null) {
grid.addSpacerRow();
grid.addRow().addMessage(description, font, GridLayout.Alignment.CENTER);
grid.addSpacerRow(20);
grid.addSpacerRow(8);
}
GridRow row = grid.addRow();
@ -167,7 +167,7 @@ public class ModListScreen extends BCLibScreen {
GridColumn col = row.addColumn(200, GridLayout.GridValueType.CONSTANT);
addModDesc(col, mods, serverInfo, this);
grid.addSpacerRow(10);
grid.addSpacerRow(8);
row = grid.addRow();
row.addFiller();
row.addButton(CommonComponents.GUI_BACK, 20, font, (n)-> {
@ -175,8 +175,6 @@ public class ModListScreen extends BCLibScreen {
System.out.println("Closing");
});
row.addFiller();
grid.addSpacerRow(topPadding);
}
}

23
src/main/java/ru/bclib/gui/screens/SyncFilesScreen.java
View file

@ -2,12 +2,15 @@ package ru.bclib.gui.screens;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import ru.bclib.api.dataexchange.handler.autosync.HelloClient;
import ru.bclib.gui.gridlayout.GridCheckboxCell;
import ru.bclib.gui.gridlayout.GridLayout.Alignment;
import ru.bclib.gui.gridlayout.GridRow;
import ru.bclib.util.ModUtil;
@Environment(EnvType.CLIENT)
public class SyncFilesScreen extends BCLibScreen {
@ -17,10 +20,11 @@ public class SyncFilesScreen extends BCLibScreen {
private final boolean hasFiles;
private final boolean hasMods;
private final boolean shouldDelete;
public SyncFilesScreen(int modFiles, int configFiles, int singleFiles, int folderFiles, int deleteFiles, Listener listener) {
private final HelloClient.IServerModMap serverInfo;
public SyncFilesScreen(int modFiles, int configFiles, int singleFiles, int folderFiles, int deleteFiles, HelloClient.IServerModMap serverInfo, Listener listener) {
super(new TranslatableComponent("title.bclib.syncfiles"));
this.serverInfo = serverInfo;
this.description = new TranslatableComponent("message.bclib.syncfiles");
this.listener = listener;
@ -45,6 +49,19 @@ public class SyncFilesScreen extends BCLibScreen {
row = grid.addRow();
mods = row.addCheckbox(new TranslatableComponent("message.bclib.syncfiles.mods"), hasMods, BUTTON_HEIGHT, this.font);
mods.setEnabled(hasMods);
if (hasMods) {
row.addSpacer();
row.addButton(new TranslatableComponent("title.bclib.more"), 20, font, (button)->{
ModListScreen scr = new ModListScreen(
this,
new TranslatableComponent("title.bclib.syncfiles.modlist"),
new TranslatableComponent("message.bclib.syncfiles.modlist"),
ModUtil.getMods(),
serverInfo
);
Minecraft.getInstance().setScreen(scr);
});
}
grid.addSpacerRow();