diff options
20 files changed, 693 insertions, 12 deletions
diff --git a/GuiTest/LICENSE b/GuiTest/LICENSE new file mode 100644 index 0000000..458c24e --- /dev/null +++ b/GuiTest/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 The Cotton Project + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
\ No newline at end of file diff --git a/GuiTest/build.gradle b/GuiTest/build.gradle new file mode 100644 index 0000000..c45af5e --- /dev/null +++ b/GuiTest/build.gradle @@ -0,0 +1,75 @@ +buildscript { + repositories { + jcenter() + } +} + +plugins { + id 'fabric-loom' version '0.2.4-SNAPSHOT' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +if(rootProject.file('private.gradle').exists()) { //Publishing details + apply from: 'private.gradle' +} + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + mavenLocal(); + maven { url "http://server.bbkr.space:8081/artifactory/libs-release" } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}" + modApi "net.fabricmc:fabric-loader:${project.loader_version}" + modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modApi "io.github.cottonmc:Jankson:${project.jankson_version}" + include "io.github.cottonmc:Jankson:${project.jankson_version}" + + compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false } + + + modApi "io.github.prospector:modmenu:1.7.9+build.118" + modApi "io.github.cottonmc:LibGui:1.3.1-SNAPSHOT" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +}
\ No newline at end of file diff --git a/GuiTest/gradle.properties b/GuiTest/gradle.properties new file mode 100644 index 0000000..a8080fa --- /dev/null +++ b/GuiTest/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.14.4 + yarn_mappings=1.14.4+build.3 + loader_version=0.4.8+build.158 + +# Mod Properties + mod_version = 1.3.1 + maven_group = io.github.cottonmc + archives_base_name = LibGui + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric + fabric_version=0.3.0+build.206 + jankson_version=1.0.0+j1.1.2 diff --git a/GuiTest/gradlew b/GuiTest/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/GuiTest/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/GuiTest/gradlew.bat b/GuiTest/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/GuiTest/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/GuiTest/settings.gradle b/GuiTest/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/GuiTest/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java b/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java new file mode 100644 index 0000000..906ad82 --- /dev/null +++ b/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java @@ -0,0 +1,30 @@ +package io.github.cottonmc.test; + +import io.github.cottonmc.cotton.gui.client.ClientCottonScreen; +import io.github.cottonmc.test.client.TestClientGui; +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.Rarity; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; + +public class GuiItem extends Item { + + public GuiItem() { + super(new Item.Settings().group(ItemGroup.TOOLS).rarity(Rarity.EPIC)); + } + + @Override + public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) { + if (world.isClient) { + MinecraftClient.getInstance().openScreen(new ClientCottonScreen(new TestClientGui())); + } + + return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, (hand==Hand.MAIN_HAND) ? player.getMainHandStack() : player.getOffHandStack()); + } +} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java b/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java new file mode 100644 index 0000000..e2431c8 --- /dev/null +++ b/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java @@ -0,0 +1,17 @@ +package io.github.cottonmc.test; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class LibGuiTest implements ModInitializer { + public static final String MODID = "libgui-test"; + + @Override + public void onInitialize() { + //TODO: Register an item that spawns a clientside gui, and a block that spawns a serverside one + + Registry.register(Registry.ITEM, new Identifier(MODID, "client_gui"), new GuiItem()); + } + +} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java new file mode 100644 index 0000000..42b4b42 --- /dev/null +++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java @@ -0,0 +1,12 @@ +package io.github.cottonmc.test.client; + +import net.fabricmc.api.ClientModInitializer; + +public class LibGuiTestClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + + } + +} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/TestClientGui.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/TestClientGui.java new file mode 100644 index 0000000..73f23b4 --- /dev/null +++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/TestClientGui.java @@ -0,0 +1,42 @@ +package io.github.cottonmc.test.client; + +import java.util.ArrayList; +import java.util.function.BiConsumer; + +import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; +import io.github.cottonmc.cotton.gui.widget.WGridPanel; +import io.github.cottonmc.cotton.gui.widget.WLabel; +import io.github.cottonmc.cotton.gui.widget.WListPanel; +import io.github.cottonmc.cotton.gui.widget.WTextField; +import net.minecraft.text.LiteralText; + +public class TestClientGui extends LightweightGuiDescription { + + public TestClientGui() { + WGridPanel root = new WGridPanel(); + this.setRootPanel(root); + + WTextField text = new WTextField(); + text.setSuggestion("Test Suggestion"); + root.add(text, 0, 1, 8, 1); + + ArrayList<String> data = new ArrayList<>(); + data.add("This"); + data.add("is"); + data.add("a"); + data.add("test"); + data.add("of the"); + data.add("new"); + data.add("recycler-style"); + data.add("list"); + data.add("widget"); + BiConsumer<String, WLabel> configurator = (String s, WLabel label) -> { + label.setText(new LiteralText(s)); + }; + WListPanel<String, WLabel> list = new WListPanel<String, WLabel>(data, WLabel.class, ()->new WLabel(""), configurator); + root.add(list, 0, 2, 8, 8); + + root.validate(this); + } + +} diff --git a/GuiTest/src/main/resources/assets/libgui-test/icon.png b/GuiTest/src/main/resources/assets/libgui-test/icon.png Binary files differnew file mode 100644 index 0000000..4286522 --- /dev/null +++ b/GuiTest/src/main/resources/assets/libgui-test/icon.png diff --git a/GuiTest/src/main/resources/fabric.mod.json b/GuiTest/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..df68f07 --- /dev/null +++ b/GuiTest/src/main/resources/fabric.mod.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "id": "libgui-test", + "version": "${version}", + + "name": "LibGui Test", + "description": "Some example Guis to shake out errors", + "authors": [ + "Falkreon" + ], + "contact": { + "sources": "https://github.com/CottonMC/LibGUI" + }, + + "license": "MIT", + "icon": "assets/libgui-test/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ "io.github.cottonmc.test.LibGuiTest"], + "client": [ "io.github.cottonmc.test.client.LibGuiTestClient" ] + }, + "depends": { + "fabricloader": ">=0.4.0", + "libgui": "*", + "jankson": "1.0.x", + "fabric": "*" + } +} diff --git a/Notes.md b/Notes.md deleted file mode 100644 index 247589b..0000000 --- a/Notes.md +++ /dev/null @@ -1,5 +0,0 @@ -Changes for `WToggleButton` PR ------------------------------- -+ Added @Environment tag to fix `class_1113` not found error from Sound Instance running on server side. -+ Added default values for images and sizes -+ Added `setOnToggle(Runnable r)`, and supporting handler methods.
\ No newline at end of file @@ -7,4 +7,9 @@ Instead, LibGui takes a logical description of your GUI, and draws it on-the-fly GUI system. Controls can be hung on an itemslot grid or offset from it. Panel styles, colors, and opacity can be customized, and everything can be extended. -> See the [Cotton wiki](https://cottonmc.github.io/Wiki/getting_started/SetupDeveloper.html) for getting started with LibGui. + +See the [Cotton wiki](https://cottonmc.github.io/Wiki/getting_started/SetupDeveloper.html) for setup + +And for code examples: +* [Client-Only Guis](https://github.com/CottonMC/LibGui/wiki/Client-Sided-Guis) +* [Inventory Guis](https://github.com/CottonMC/LibGui/wiki/Getting-Started-with-GUIs)
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a8080fa..45585f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.4.8+build.158 # Mod Properties - mod_version = 1.3.1 + mod_version = 1.3.1-SNAPSHOT maven_group = io.github.cottonmc archives_base_name = LibGui diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ClientCottonScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ClientCottonScreen.java index f19cce7..16c0484 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/ClientCottonScreen.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ClientCottonScreen.java @@ -167,8 +167,8 @@ public class ClientCottonScreen extends Screen { return true; } - @Override - public Element getFocused() { - return this; - } + //@Override + //public Element getFocused() { + //return this; + //} } diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/Axis.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/Axis.java new file mode 100644 index 0000000..fd97f20 --- /dev/null +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/Axis.java @@ -0,0 +1,6 @@ +package io.github.cottonmc.cotton.gui.widget; + +public enum Axis { + HORIZONTAL, + VERTICAL; +} diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java new file mode 100644 index 0000000..a98857e --- /dev/null +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java @@ -0,0 +1,118 @@ +package io.github.cottonmc.cotton.gui.widget; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.Supplier; + +import io.github.cottonmc.cotton.gui.GuiDescription; +import io.github.cottonmc.cotton.gui.client.BackgroundPainter; +import io.github.cottonmc.cotton.gui.client.ScreenDrawing; + +/** + * Similar to the RecyclerView in Android, this widget represents a scrollable list of items. + * + * <p> D is the type of data represented. The data must reside in some ordered backing {@code List<D>}. + * D's *must* have working equals and hashCode methods to distinguish them from each other! + * <p> W is the WWidget class that will represent a single D of data. + */ +public class WListPanel<D, W extends WWidget> extends WPanel { + protected List<D> data; + protected Class<W> listItemClass; + protected Supplier<W> supplier; + protected BiConsumer<D, W> configurator; + + protected HashMap<D, W> configured = new HashMap<>(); + protected List<W> unconfigured = new ArrayList<>(); + protected int cellHeight = 20; + protected boolean fixedHeight = false; + + protected int margin = 4; + + protected int scrollOffset; + + public WListPanel(List<D> data, Class<W> listItemClass, Supplier<W> supplier, BiConsumer<D, W> configurator) { + this.data = data; + this.listItemClass = listItemClass; + this.supplier = supplier; + this.configurator = configurator; + } + + @Override + public void paintBackground(int x, int y) { + if (getBackgroundPainter()!=null) { + getBackgroundPainter().paintBackground(x, y, this); + } else { + ScreenDrawing.drawBeveledPanel(x, y, width, height); + } + + for(WWidget child : children) { + child.paintBackground(x + child.getX(), y + child.getY()); + } + } + + @Override + public void layout() { + super.layout(); + + System.out.println("Validating"); + + //Recompute cellHeight if needed + if (!fixedHeight) { + if (unconfigured.isEmpty()) { + if (configured.isEmpty()) { + W exemplar = supplier.get(); + unconfigured.add(exemplar); + if (!exemplar.canResize()) cellHeight = exemplar.getHeight(); + } else { + W exemplar = configured.values().iterator().next(); + if (!exemplar.canResize()) cellHeight = exemplar.getHeight(); + } + } else { + W exemplar = unconfigured.get(0); + if (!exemplar.canResize()) cellHeight = exemplar.getHeight(); + } + } + if (cellHeight<4) cellHeight=4; + + int layoutHeight = this.getHeight()-(margin*2); + int cellsHigh = layoutHeight / cellHeight; + int presentCells = Math.min(data.size()-scrollOffset, cellsHigh); + + System.out.println("Adding children..."); + + this.children.clear(); + if (presentCells>0) { + for(int i=0; i<presentCells; i++) { + int index = i+scrollOffset; + D d = data.get(index); + W w = configured.get(d); + if (w==null) { + if (unconfigured.isEmpty()) { + w = supplier.get(); + } else { + w = unconfigured.remove(0); + } + configurator.accept(d, w); + } + + //At this point, w is nonnull and configured by d + if (w.canResize()) { + w.setSize(this.width-(margin*2), cellHeight); + } + w.x = margin; + w.y = margin + (cellHeight * i); + this.children.add(w); + } + } + + System.out.println("Children: "+children.size()); + } + + public WListPanel<D, W> setListItemHeight(int height) { + cellHeight = height; + fixedHeight = true; + return this; + } +} diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java index 630494f..055e188 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WPanel.java @@ -9,7 +9,7 @@ import io.github.cottonmc.cotton.gui.client.BackgroundPainter; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -public class WPanel extends WWidget { +public abstract class WPanel extends WWidget { protected final List<WWidget> children = Lists.newArrayList(); @Environment(EnvType.CLIENT) private BackgroundPainter backgroundPainter = null; @@ -37,6 +37,11 @@ public class WPanel extends WWidget { return this; } + @Environment(EnvType.CLIENT) + public BackgroundPainter getBackgroundPainter() { + return this.backgroundPainter; + } + /** * Uses this Panel's layout rules to reposition and resize components to fit nicely in the panel. */ diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java new file mode 100644 index 0000000..289a2cd --- /dev/null +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java @@ -0,0 +1,42 @@ +package io.github.cottonmc.cotton.gui.widget; + +import io.github.cottonmc.cotton.gui.client.ScreenDrawing; + +public class WScrollBar extends WWidget { + protected Axis axis = Axis.HORIZONTAL; + protected int value; + protected int maxValue = 100; + protected int window = 16; + + public WScrollBar() { + } + + public WScrollBar(Axis axis) { + this.axis = axis; + } + + @Override + public void paintBackground(int x, int y) { + ScreenDrawing.drawBeveledPanel(x, y, width, height, 0xFFFFFFFF, 0xFF8b8b8b, 0xFF373737); + + float barHeight = (window>maxValue) ? 1f : window / maxValue; + int scrollDistance = maxValue - window; + + + super.paintBackground(x, y); + } + + @Override + public void setSize(int x, int y) { + switch(axis) { + case HORIZONTAL: + this.width = x; + this.height = 8; + break; + case VERTICAL: + this.width = 8; + this.height = y; + break; + } + } +} |
