From bc29ef36df139961ad9ede987273cbf1ed8e0e81 Mon Sep 17 00:00:00 2001 From: Diliard <43886528+Diliard@users.noreply.github.com> Date: Tue, 18 Oct 2022 22:26:15 +0200 Subject: [PATCH 01/11] added 1.19 compatible version --- panelstudio-mc19/build.gradle | 83 +++++ panelstudio-mc19/gradle.properties | 12 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + panelstudio-mc19/gradlew | 183 +++++++++ panelstudio-mc19/gradlew.bat | 103 ++++++ panelstudio-mc19/settings.gradle | 0 .../lukflug/panelstudio/mc17/GLInterface.java | 346 ++++++++++++++++++ .../panelstudio/mc17/MinecraftGUI.java | 223 +++++++++++ .../panelstudio/mc17/MinecraftHUDGUI.java | 73 ++++ .../panelstudio/mc17/package-info.java | 6 + .../src/main/resources/fabric.mod.json | 17 + 12 files changed, 1051 insertions(+) create mode 100644 panelstudio-mc19/build.gradle create mode 100644 panelstudio-mc19/gradle.properties create mode 100644 panelstudio-mc19/gradle/wrapper/gradle-wrapper.jar create mode 100644 panelstudio-mc19/gradle/wrapper/gradle-wrapper.properties create mode 100644 panelstudio-mc19/gradlew create mode 100644 panelstudio-mc19/gradlew.bat create mode 100644 panelstudio-mc19/settings.gradle create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java create mode 100644 panelstudio-mc19/src/main/resources/fabric.mod.json diff --git a/panelstudio-mc19/build.gradle b/panelstudio-mc19/build.gradle new file mode 100644 index 0000000..2387e9c --- /dev/null +++ b/panelstudio-mc19/build.gradle @@ -0,0 +1,83 @@ + +buildscript { + repositories { + jcenter() + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" + } + } + dependencies { + classpath "net.fabricmc:fabric-loom:${loom19Version}" + } +} + +apply plugin: "fabric-loom" +apply plugin: "maven-publish" + +repositories { + maven { + name = "lukflug" + url = "https://lukflug.github.io/maven/" + } +} + +loom { + //remapArchives=false +} + +dependencies { + minecraft "com.mojang:minecraft:${minecraft19}" + mappings "net.fabricmc:yarn:${mappings19}:v2" + annotationProcessor "org.ow2.asm:asm:9.0" + annotationProcessor "org.ow2.asm:asm-analysis:9.0" + annotationProcessor "org.ow2.asm:asm-commons:9.0" + annotationProcessor "org.ow2.asm:asm-tree:9.0" + annotationProcessor "org.ow2.asm:asm-util:9.0" + implementation "com.lukflug:panelstudio:${coreVersion}" +} + +processResources { + inputs.property "version", project.version + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + classifier = "sources" +} + +publishing { + publications { + mavenJava(MavenPublication) { + groupId "com.lukflug" + artifact jar { + classifier "" + } + artifact sourcesJar + pom { + name = "PanelStudio-MC19" + description = "A supplement to PanelStudio designed for FabricMC 1.19.x" + url = "https://github.com/lukflug/PanelStudio" + licenses { + license { + name = "MIT License" + url = "https://raw.githubusercontent.com/lukflug/PanelStudio/main/LICENSE" + } + } + developers { + developer { + id = "lukflug" + } + } + } + } + } + repositories { + maven { + url = "${projectDir}/../../lukflug.github.io/maven" + } + } +} diff --git a/panelstudio-mc19/gradle.properties b/panelstudio-mc19/gradle.properties new file mode 100644 index 0000000..286c29c --- /dev/null +++ b/panelstudio-mc19/gradle.properties @@ -0,0 +1,12 @@ +org.gradle.jvmargs = -Xmx2500m +version = 0.2.2 +coreVersion = 0.2.1 + +loom17Version = 0.12.1 +loom19Version = 1.0-SNAPSHOT + +minecraft17 = 1.17.1 +minecraft19 = 1.19.2 + +mappings17 = 1.17.1+build.65 +mappings19 = 1.19.2+build.25 \ No newline at end of file diff --git a/panelstudio-mc19/gradle/wrapper/gradle-wrapper.jar b/panelstudio-mc19/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/panelstudio-mc19/gradle/wrapper/gradle-wrapper.properties b/panelstudio-mc19/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/panelstudio-mc19/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/panelstudio-mc19/gradlew b/panelstudio-mc19/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/panelstudio-mc19/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## 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='"-Xmx64m" "-Xms64m"' + +# 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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/panelstudio-mc19/gradlew.bat b/panelstudio-mc19/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/panelstudio-mc19/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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/panelstudio-mc19/settings.gradle b/panelstudio-mc19/settings.gradle new file mode 100644 index 0000000..e69de29 diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java new file mode 100644 index 0000000..2082148 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java @@ -0,0 +1,346 @@ +package com.lukflug.panelstudio.mc17; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.util.Stack; + +import javax.imageio.ImageIO; + +import org.lwjgl.opengl.GL11; + +import com.lukflug.panelstudio.base.IInterface; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.platform.TextureUtil; +import com.mojang.blaze3d.systems.RenderSystem; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormat.DrawMode; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Matrix4f; + +/** + * Implementation of {@link IInterface} for OpenGL in Minecraft. + * @author lukflug + */ +public abstract class GLInterface implements IInterface { + /** + * Clipping rectangle stack. + */ + private final Stack clipRect=new Stack(); + /** + * Stored projection matrix. + */ + private Matrix4f projection=null; + /** + * Boolean indicating whether to clip in the horizontal direction. + */ + protected boolean clipX; + + /** + * Constructor. + * @param clipX whether to clip in the horizontal direction + */ + public GLInterface (boolean clipX) { + this.clipX=clipX; + } + + @Override + public Dimension getWindowSize() { + return new Dimension((int)Math.ceil(getScreenWidth()),(int)Math.ceil(getScreenHeight())); + } + + @SuppressWarnings("resource") + @Override + public void drawString (Point pos, int height, String s, Color c) { + MatrixStack modelview=RenderSystem.getModelViewStack(); + modelview.push(); + modelview.translate(pos.x,pos.y,0); + float scale=height/(float)MinecraftClient.getInstance().textRenderer.fontHeight; + modelview.scale(scale,scale,1); + RenderSystem.applyModelViewMatrix(); + end(false); + MinecraftClient.getInstance().textRenderer.drawWithShadow(getMatrixStack(),s,0,0,c.getRGB()); + begin(false); + modelview.pop(); + RenderSystem.applyModelViewMatrix(); + } + + @SuppressWarnings("resource") + @Override + public int getFontWidth (int height, String s) { + double scale=height/(double)MinecraftClient.getInstance().textRenderer.fontHeight; + return (int)Math.round(MinecraftClient.getInstance().textRenderer.getWidth(s)*scale); + } + + @Override + public void fillTriangle (Point pos1, Point pos2, Point pos3, Color c1, Color c2, Color c3) { + RenderSystem.setShader(GameRenderer::getPositionColorShader); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.TRIANGLES,VertexFormats.POSITION_COLOR); + bufferbuilder.vertex(pos1.x,pos1.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); + bufferbuilder.vertex(pos2.x,pos2.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); + bufferbuilder.vertex(pos3.x,pos3.y,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); + tessellator.draw(); + } + + @Override + public void drawLine (Point a, Point b, Color c1, Color c2) { + RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader); + float normalx=b.x-a.x,normaly=b.y-a.y; + float scale=(float)Math.sqrt(normalx*normalx+normaly*normaly); + normalx/=scale; + normaly/=scale; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.LINES,VertexFormats.LINES); + bufferbuilder.vertex(a.x*256/255f,a.y*256/255f,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).normal(normalx,normaly,0).next(); + bufferbuilder.vertex(b.x*256/255f,b.y*256/255f,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).normal(normalx,normaly,0).next(); + tessellator.draw(); + } + + @Override + public void fillRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { + RenderSystem.setShader(GameRenderer::getPositionColorShader); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.QUADS, VertexFormats.POSITION_COLOR); + bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); + tessellator.draw(); + } + + @Override + public void drawRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { + drawLine(new Point(r.x,r.y+r.height),new Point(r.x+r.width,r.y+r.height),c4,c3); + drawLine(new Point(r.x+r.width,r.y+r.height),new Point(r.x+r.width,r.y),c3,c2); + drawLine(new Point(r.x+r.width,r.y),new Point(r.x,r.y),c2,c1); + drawLine(new Point(r.x,r.y),new Point(r.x,r.y+r.height),c1,c4); + } + + @Override + public synchronized int loadImage (String name) { + try { + Identifier rl=new Identifier(getResourcePrefix()+name); + //InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).getInputStream(); + InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).get().getInputStream(); + BufferedImage image=ImageIO.read(stream); + int texture=TextureUtil.generateTextureId(); + RenderSystem.bindTextureForSetup(texture); + int width=image.getWidth(),height=image.getHeight(); + IntBuffer buffer=ByteBuffer.allocateDirect(4*width*height).order(ByteOrder.nativeOrder()).asIntBuffer(); + buffer.put(image.getRGB(0,0,width,height,null,0,width)); + buffer.flip(); + TextureUtil.initTexture(buffer,width,height); + return texture; + } catch (IOException e) { + e.printStackTrace(); + return 0; + } + } + + @Override + public void drawImage (Rectangle r, int rotation, boolean parity, int image, Color color) { + if (image==0) return; + int texCoords[][]={{0,1},{1,1},{1,0},{0,0}}; + for (int i=0;ix1 && y2>y1) { + Rectangle rect=new Rectangle(x1,y1,x2-x1,y2-y1); + scissor(rect); + clipRect.push(rect); + } else { + scissor(null); + clipRect.push(null); + } + } + } + } + + @Override + public void restore() { + if (!clipRect.isEmpty()) { + clipRect.pop(); + if (clipRect.isEmpty()) GL11.glDisable(GL11.GL_SCISSOR_TEST); + else scissor(clipRect.peek()); + } + } + + /** + * Utility function to convert screen pixel coordinates to PanelStudio GUI coordinates. + * @param p the screen coordinates + * @return the corresponding GUI coordinates + */ + public Point screenToGui (Point p) { + int resX=getWindowSize().width; + int resY=getWindowSize().height; + return new Point(p.x*resX/MinecraftClient.getInstance().getWindow().getWidth(),resY-p.y*resY/MinecraftClient.getInstance().getWindow().getHeight()-1); + } + + /** + * Utility function to convert PanelStudio GUI coordinates to screen pixel coordinates. + * @param p the GUI coordinates + * @return the corresponding screen coordinates + */ + public Point guiToScreen (Point p) { + double resX=getScreenWidth(); + double resY=getScreenHeight(); + return new Point((int)Math.round(p.x*MinecraftClient.getInstance().getWindow().getWidth()/resX),(int)Math.round((resY-p.y)*MinecraftClient.getInstance().getWindow().getHeight()/resY)); + } + + /** + * Get the current screen width. + * @return the screen width + */ + protected double getScreenWidth() { + return MinecraftClient.getInstance().getWindow().getScaledWidth(); + } + + /** + * Get the current screen height. + * @return the screen height + */ + protected double getScreenHeight() { + return MinecraftClient.getInstance().getWindow().getScaledHeight(); + } + + /** + * Set OpenGL to the state used by the rendering methods. + * Should be called before rendering. + * @param matrix whether to set up the modelview matrix + */ + public void begin (boolean matrix) { + if (matrix) { + projection=RenderSystem.getProjectionMatrix().copy(); + float array[]={2/(float)getScreenWidth(),0,0,-1, 0,-2/(float)getScreenHeight(),0,1, 0,0,-1/3000f,0, 0,0,0,1}; + FloatBuffer buffer=FloatBuffer.allocate(16).put(array).flip(); + RenderSystem.getProjectionMatrix().readRowMajor(buffer); + MatrixStack modelview=RenderSystem.getModelViewStack(); + modelview.push(); + modelview.loadIdentity(); + RenderSystem.applyModelViewMatrix(); + } + RenderSystem.enableBlend(); + RenderSystem.disableTexture(); + RenderSystem.disableCull(); + RenderSystem.lineWidth(2); + RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA,GL11.GL_ONE,GL11.GL_ZERO); + } + + /** + * Restore OpenGL to the state expected by Minecraft. + * Should be called after rendering. + * @param matrix whether to restore the modelview matrix + */ + public void end (boolean matrix) { + RenderSystem.enableCull(); + RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + if (matrix) { + RenderSystem.getModelViewStack().pop(); + RenderSystem.applyModelViewMatrix(); + RenderSystem.getProjectionMatrix().load(projection); + projection=null; + } + } + + /** + * Get the z-coordinate to render everything. + * @return the z-level + */ + protected abstract float getZLevel(); + + /** + * Get the matrix stack to be used. + * @return the current matrix stack + */ + protected abstract MatrixStack getMatrixStack(); + + /** + * Get the Minecraft resource location string. + * @return the resource prefix + */ + protected abstract String getResourcePrefix(); +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java new file mode 100644 index 0000000..05b9757 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java @@ -0,0 +1,223 @@ +package com.lukflug.panelstudio.mc17; + +import java.awt.Point; + +import net.minecraft.text.Text; +import org.lwjgl.glfw.GLFW; + +import com.lukflug.panelstudio.base.IInterface; +import com.lukflug.panelstudio.container.GUI; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.MatrixStack; + +/** + * Implementation of Minecraft's {@link Screen} that renders a PanelStudio GUI. + * @author lukflug + */ +public abstract class MinecraftGUI extends Screen { + /** + * The current mouse position. + */ + private Point mouse=new Point(); + /** + * Current left mouse button state. + */ + private boolean lButton=false; + /** + * Current right mouse button state. + */ + private boolean rButton=false; + /** + * Current GLFW modifier bits. + */ + private int modifiers=0; + /** + * Last rendering time. + */ + private long lastTime; + /** + * Saved matrix stack; + */ + protected MatrixStack matrixStack=null; + + /** + * Constructor. + */ + public MinecraftGUI() { + super(Text.literal("PanelStudio GUI")); + } + + /** + * Displays the GUI. + */ + public void enterGUI() { + MinecraftClient.getInstance().setScreen(this); + } + + /** + * Closes the GUI. + */ + public void exitGUI() { + MinecraftClient.getInstance().setScreen(null); + } + + /** + * Renders the GUI. + */ + protected void renderGUI() { + lastTime=System.currentTimeMillis(); + getInterface().begin(true); + getGUI().render(); + getInterface().end(true); + } + + @Override + public void init() { + getGUI().enter(); + } + + @Override + public void removed() { + getGUI().exit(); + } + + @Override + public void render (MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { + matrixStack=matrices; + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + renderGUI(); + } + + @Override + public boolean mouseScrolled (double mouseX, double mouseY, double scroll) { + if (!super.mouseScrolled(mouseX,mouseY,scroll)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + if (scroll!=0) { + if (scroll>0) getGUI().handleScroll(-getScrollSpeed()); + else getGUI().handleScroll(getScrollSpeed()); + } + } + return true; + } + + @Override + public boolean mouseClicked (double mouseX, double mouseY, int clickedButton) { + if (!super.mouseReleased(mouseX,mouseY,clickedButton)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + switch (clickedButton) { + case IInterface.LBUTTON -> lButton = true; + case IInterface.RBUTTON -> rButton = true; + } + getGUI().handleButton(clickedButton); + } + return true; + } + + @Override + public boolean mouseReleased (double mouseX, double mouseY, int releaseButton) { + if (!super.mouseReleased(mouseX,mouseY,releaseButton)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + switch (releaseButton) { + case IInterface.LBUTTON -> lButton = false; + case IInterface.RBUTTON -> rButton = false; + } + getGUI().handleButton(releaseButton); + } + return true; + } + + @Override + public boolean keyPressed (int keyCode, int scanCode, int modifiers) { + this.modifiers=modifiers; + if (keyCode==GLFW.GLFW_KEY_ESCAPE) exitGUI(); + else getGUI().handleKey(keyCode); + return true; + } + + @Override + public boolean charTyped (char chr, int modifiers) { + this.modifiers=modifiers; + getGUI().handleChar(chr); + return true; + } + + @Override + public boolean shouldPause() { + return false; + } + + /** + * Get the {@link GUI} to be rendered. + * @return current GUI + */ + protected abstract GUI getGUI(); + + /** + * Get current {@link GUIInterface}. + * @return the current interface + */ + protected abstract GUIInterface getInterface(); + + /** + * Get current scroll speed. + * @return the scroll speed + */ + protected abstract int getScrollSpeed(); + + + /** + * Implementation of {@link GLInterface} to be used with {@link MinecraftGUI} + * @author lukflug + */ + public abstract class GUIInterface extends GLInterface { + /** + * Constructor. + * @param clipX whether to clip in the horizontal direction + */ + public GUIInterface (boolean clipX) { + super(clipX); + } + + @Override + public boolean getModifier (int modifier) { + return switch (modifier) { + case SHIFT -> (modifiers & GLFW.GLFW_MOD_SHIFT) != 0; + case CTRL -> (modifiers & GLFW.GLFW_MOD_CONTROL) != 0; + case ALT -> (modifiers & GLFW.GLFW_MOD_ALT) != 0; + case SUPER -> (modifiers & GLFW.GLFW_MOD_SUPER) != 0; + default -> false; + }; + } + + @Override + public long getTime() { + return lastTime; + } + + @Override + public boolean getButton (int button) { + return switch (button) { + case IInterface.LBUTTON -> lButton; + case IInterface.RBUTTON -> rButton; + default -> false; + }; + } + + @Override + public Point getMouse() { + return new Point(mouse); + } + + @Override + protected float getZLevel() { + return getZOffset(); + } + + @Override + protected MatrixStack getMatrixStack() { + return matrixStack; + } + } +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java new file mode 100644 index 0000000..acc0545 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java @@ -0,0 +1,73 @@ +package com.lukflug.panelstudio.mc17; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.panelstudio.container.GUI; +import com.lukflug.panelstudio.hud.HUDGUI; + +/** + * An extension of {@link MinecraftGUI} for HUD editors. + * @author lukflug + */ +public abstract class MinecraftHUDGUI extends MinecraftGUI { + /** + * Whether {@link GUI#enter()} has been called. + */ + private boolean guiOpened=false; + + @Override + public void enterGUI() { + if (!getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.enterGUI(); + } + + @Override + public void exitGUI() { + if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.exitGUI(); + } + + /** + * Open the HUD editor. + */ + public void enterHUDEditor() { + if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.enterGUI(); + } + + @Override + public void init() { + } + + @Override + public void removed() { + } + + @Override + protected void renderGUI() { + if (!guiOpened) getGUI().enter(); + guiOpened=true; + super.renderGUI(); + } + + /** + * Render function to be called even when the GUI is closed. + */ + public void render() { + if (!getGUI().getGUIVisibility().isOn() && !getGUI().getHUDVisibility().isOn()) renderGUI(); + } + + /** + * Key event function to be called when the GUI is closed. + * @param scancode the key scancode + */ + public void handleKeyEvent (int scancode) { + if (scancode!=GLFW.GLFW_KEY_ESCAPE && !getGUI().getGUIVisibility().isOn() && !getGUI().getGUIVisibility().isOn()) getGUI().handleKey(scancode); + } + + @Override + protected abstract HUDGUI getGUI(); +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java new file mode 100644 index 0000000..4d9adef --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java @@ -0,0 +1,6 @@ +/** + * PanelStudio-MC utility functions designed for FabricMC 1.17.x and 1.18.x. + * This library only depends on the Fabric Yarn mappings and not on the Fabric Mod Loader or the Fabric API. + * @author lukflug + */ +package com.lukflug.panelstudio.mc17; diff --git a/panelstudio-mc19/src/main/resources/fabric.mod.json b/panelstudio-mc19/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e706d0f --- /dev/null +++ b/panelstudio-mc19/src/main/resources/fabric.mod.json @@ -0,0 +1,17 @@ +{ + "schemaVersion": 1, + "id": "panelstudio", + "version": "${version}", + "name": "PanelStudio-MC19", + "description": "A supplement to PanelStudio designed for FabricMC 1.19.x.", + "authors": ["lukflug, Marc"], + "contact": { + "homepage": "https://lukflug.github.io", + "sources": "https://github.com/lukflug/PanelStudio" + }, + "license": "MIT", + "environment": "*", + "depends": { + "minecraft": ["1.19.x"] + } +} From 9be0c29dd609dc60c7fde89786cf825b39922aca Mon Sep 17 00:00:00 2001 From: Diliard <43886528+Diliard@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:57:57 +0200 Subject: [PATCH 02/11] Added example mod for 1.19 --- example-mod19/build.gradle | 63 +++ example-mod19/gradle.properties | 9 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + example-mod19/gradlew | 183 +++++++ example-mod19/gradlew.bat | 103 ++++ example-mod19/settings.gradle | 0 .../com/lukflug/examplemod19/ClickGUI.java | 495 ++++++++++++++++++ .../com/lukflug/examplemod19/ExampleMod.java | 49 ++ .../lukflug/examplemod19/module/Category.java | 107 ++++ .../examplemod19/module/ClickGUIModule.java | 40 ++ .../examplemod19/module/HUDEditorModule.java | 17 + .../examplemod19/module/LogoModule.java | 49 ++ .../lukflug/examplemod19/module/Module.java | 62 +++ .../examplemod19/module/TabGUIModule.java | 49 ++ .../examplemod19/module/WatermarkModule.java | 68 +++ .../examplemod19/setting/BooleanSetting.java | 20 + .../examplemod19/setting/ColorSetting.java | 60 +++ .../examplemod19/setting/DoubleSetting.java | 39 ++ .../examplemod19/setting/EnumSetting.java | 61 +++ .../examplemod19/setting/IntegerSetting.java | 39 ++ .../examplemod19/setting/KeybindSetting.java | 31 ++ .../lukflug/examplemod19/setting/Setting.java | 52 ++ .../examplemod19/setting/StringSetting.java | 10 + .../assets/examplemod/panelstudio.png | Bin 0 -> 21570 bytes .../src/main/resources/fabric.mod.json | 23 + 26 files changed, 1634 insertions(+) create mode 100644 example-mod19/build.gradle create mode 100644 example-mod19/gradle.properties create mode 100644 example-mod19/gradle/wrapper/gradle-wrapper.jar create mode 100644 example-mod19/gradle/wrapper/gradle-wrapper.properties create mode 100644 example-mod19/gradlew create mode 100644 example-mod19/gradlew.bat create mode 100644 example-mod19/settings.gradle create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/ClickGUI.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/ExampleMod.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/Category.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/ClickGUIModule.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/HUDEditorModule.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/LogoModule.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/Module.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/TabGUIModule.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/module/WatermarkModule.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/BooleanSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/ColorSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/DoubleSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/EnumSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/IntegerSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/KeybindSetting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/Setting.java create mode 100644 example-mod19/src/main/java/com/lukflug/examplemod19/setting/StringSetting.java create mode 100644 example-mod19/src/main/resources/assets/examplemod/panelstudio.png create mode 100644 example-mod19/src/main/resources/fabric.mod.json diff --git a/example-mod19/build.gradle b/example-mod19/build.gradle new file mode 100644 index 0000000..d68a39c --- /dev/null +++ b/example-mod19/build.gradle @@ -0,0 +1,63 @@ + +buildscript { + repositories { + gradlePluginPortal() + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" + } + flatDir { + dirs 'libs' + } + } + dependencies { + classpath "net.fabricmc:fabric-loom:${loomVersion}" + classpath "gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0" + } +} + +apply plugin: "fabric-loom" +apply plugin: "com.github.johnrengelman.shadow" + +configurations { + shadow + modImplementation.extendsFrom shadow +} + +repositories { + maven { + name = "lukflug" + url = "https://lukflug.github.io/maven/" + } +} + + +loom { +} + +dependencies { + minecraft "com.mojang:minecraft:${minecraft19}" + mappings "net.fabricmc:yarn:${mappings19}:v2" + modImplementation "net.fabricmc:fabric-loader:${loader19}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${api19}" + shadow "com.lukflug:panelstudio:${version}" + shadow "com.lukflug:panelstudio-mc19:${versionmc}" +} + +processResources { + inputs.property "version", project.version + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +shadowJar { + classifier = "dev" + configurations = [project.configurations.shadow] + relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2" +} + +remapJar { + dependsOn shadowJar + inputFile = shadowJar.archiveFile +} diff --git a/example-mod19/gradle.properties b/example-mod19/gradle.properties new file mode 100644 index 0000000..7d1a969 --- /dev/null +++ b/example-mod19/gradle.properties @@ -0,0 +1,9 @@ +org.gradle.jvmargs = -Xmx2500m +version = 0.2.1 +versionmc = 0.2.2 + +loomVersion = 1.0-SNAPSHOT +minecraft19 = 1.19.2 +mappings19 = 1.19.2+build.25 +loader19 = 0.14.9 +api19 = 0.64.0+1.19.2 diff --git a/example-mod19/gradle/wrapper/gradle-wrapper.jar b/example-mod19/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/example-mod19/gradle/wrapper/gradle-wrapper.properties b/example-mod19/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/example-mod19/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/example-mod19/gradlew b/example-mod19/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/example-mod19/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## 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='"-Xmx64m" "-Xms64m"' + +# 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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/example-mod19/gradlew.bat b/example-mod19/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/example-mod19/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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/example-mod19/settings.gradle b/example-mod19/settings.gradle new file mode 100644 index 0000000..e69de29 diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/ClickGUI.java b/example-mod19/src/main/java/com/lukflug/examplemod19/ClickGUI.java new file mode 100644 index 0000000..a08846c --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/ClickGUI.java @@ -0,0 +1,495 @@ +package com.lukflug.examplemod19; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Rectangle; +import java.util.EnumMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.IntFunction; +import java.util.function.IntPredicate; +import java.util.function.Supplier; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.examplemod19.module.Category; +import com.lukflug.examplemod19.module.ClickGUIModule; +import com.lukflug.examplemod19.module.ClickGUIModule.Theme; +import com.lukflug.examplemod19.module.HUDEditorModule; +import com.lukflug.examplemod19.module.LogoModule; +import com.lukflug.examplemod19.module.TabGUIModule; +import com.lukflug.examplemod19.module.WatermarkModule; +import com.lukflug.examplemod19.setting.BooleanSetting; +import com.lukflug.examplemod19.setting.ColorSetting; +import com.lukflug.examplemod19.setting.IntegerSetting; +import com.lukflug.panelstudio.base.Animation; +import com.lukflug.panelstudio.base.Context; +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.base.IInterface; +import com.lukflug.panelstudio.base.IToggleable; +import com.lukflug.panelstudio.base.SettingsAnimation; +import com.lukflug.panelstudio.base.SimpleToggleable; +import com.lukflug.panelstudio.component.IComponent; +import com.lukflug.panelstudio.component.IFixedComponent; +import com.lukflug.panelstudio.component.IResizable; +import com.lukflug.panelstudio.component.IScrollSize; +import com.lukflug.panelstudio.container.IContainer; +import com.lukflug.panelstudio.hud.HUDGUI; +import com.lukflug.panelstudio.layout.CSGOLayout; +import com.lukflug.panelstudio.layout.ChildUtil.ChildMode; +import com.lukflug.panelstudio.layout.ComponentGenerator; +import com.lukflug.panelstudio.layout.IComponentAdder; +import com.lukflug.panelstudio.layout.IComponentGenerator; +import com.lukflug.panelstudio.layout.ILayout; +import com.lukflug.panelstudio.layout.PanelAdder; +import com.lukflug.panelstudio.layout.PanelLayout; +import com.lukflug.panelstudio.layout.SearchableLayout; +import com.lukflug.panelstudio.layout.SinglePanelAdder; +import com.lukflug.panelstudio.layout.StackedPanelAdder; +import com.lukflug.panelstudio.mc19.MinecraftHUDGUI; +import com.lukflug.panelstudio.popup.CenteredPositioner; +import com.lukflug.panelstudio.popup.IPopupPositioner; +import com.lukflug.panelstudio.popup.MousePositioner; +import com.lukflug.panelstudio.popup.PanelPositioner; +import com.lukflug.panelstudio.popup.PopupTuple; +import com.lukflug.panelstudio.setting.IBooleanSetting; +import com.lukflug.panelstudio.setting.IClient; +import com.lukflug.panelstudio.setting.IColorSetting; +import com.lukflug.panelstudio.setting.IEnumSetting; +import com.lukflug.panelstudio.setting.INumberSetting; +import com.lukflug.panelstudio.setting.Labeled; +import com.lukflug.panelstudio.theme.ClearTheme; +import com.lukflug.panelstudio.theme.GameSenseTheme; +import com.lukflug.panelstudio.theme.IColorScheme; +import com.lukflug.panelstudio.theme.ITheme; +import com.lukflug.panelstudio.theme.IThemeMultiplexer; +import com.lukflug.panelstudio.theme.ImpactTheme; +import com.lukflug.panelstudio.theme.OptimizedTheme; +import com.lukflug.panelstudio.theme.RainbowTheme; +import com.lukflug.panelstudio.theme.ThemeTuple; +import com.lukflug.panelstudio.theme.Windows31Theme; +import com.lukflug.panelstudio.widget.ColorPickerComponent; +import com.lukflug.panelstudio.widget.CycleSwitch; +import com.lukflug.panelstudio.widget.DropDownList; +import com.lukflug.panelstudio.widget.ITextFieldKeys; +import com.lukflug.panelstudio.widget.Spinner; +import com.lukflug.panelstudio.widget.ToggleSwitch; + +import net.minecraft.util.Formatting; + +public class ClickGUI extends MinecraftHUDGUI { + private final GUIInterface inter; + private final HUDGUI gui; + public static final int WIDTH=120,HEIGHT=12,DISTANCE=6,BORDER=2; + + public ClickGUI() { + // Getting client structure ... + IClient client=Category.getClient(); + /* Set to false to disable horizontal clipping, this may cause graphical glitches, + * but will let you see long text, even if it is too long to fit in the panel. */ + inter=new GUIInterface(true) { + @Override + protected String getResourcePrefix() { + return "examplemod:"; + } + }; + // Instantiating theme ... + ITheme theme=new OptimizedTheme(new ThemeSelector(inter)); + // Instantiating GUI ... + IToggleable guiToggle=new SimpleToggleable(false); + IToggleable hudToggle=new SimpleToggleable(false) { + @Override + public boolean isOn() { + return guiToggle.isOn()?HUDEditorModule.showHUD.isOn():super.isOn(); + } + }; + gui=new HUDGUI(inter,theme.getDescriptionRenderer(),(IPopupPositioner)new MousePositioner(new Point(10,10)),guiToggle,hudToggle); + // Creating animation ... + Supplier animation=()->new SettingsAnimation(()->ClickGUIModule.animationSpeed.getValue(),()->inter.getTime()); + // Populating HUD ... + gui.addHUDComponent(TabGUIModule.getComponent(client,new IContainer() { + @Override + public boolean addComponent (IFixedComponent component) { + return gui.addHUDComponent(component,()->true); + } + + @Override + public boolean addComponent (IFixedComponent component, IBoolean visible) { + return gui.addHUDComponent(component,visible); + } + + @Override + public boolean removeComponent (IFixedComponent component) { + return gui.removeComponent(component); + } + },animation),TabGUIModule.getToggle(),animation.get(),theme,BORDER); + gui.addHUDComponent(WatermarkModule.getComponent(),WatermarkModule.getToggle(),animation.get(),theme,BORDER); + gui.addHUDComponent(LogoModule.getComponent(inter),LogoModule.getToggle(),animation.get(),theme,BORDER); + + // Creating popup types ... + BiFunction scrollHeight=(context,componentHeight)->Math.min(componentHeight,Math.max(HEIGHT*4,ClickGUI.this.height-context.getPos().y-HEIGHT)); + PopupTuple popupType=new PopupTuple(new PanelPositioner(new Point(0,0)),false,new IScrollSize() { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return scrollHeight.apply(context,componentHeight); + } + }); + PopupTuple colorPopup=new PopupTuple(new CenteredPositioner(()->new Rectangle(new Point(0,0),inter.getWindowSize())),true,new IScrollSize() { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return scrollHeight.apply(context,componentHeight); + } + }); + // Defining resize behavior ... + IntFunction resizable=width->new IResizable() { + Dimension size=new Dimension(width,320); + + @Override + public Dimension getSize() { + return new Dimension(size); + } + + @Override + public void setSize (Dimension size) { + this.size.width=size.width; + this.size.height=size.height; + if (size.width<75) this.size.width=75; + if (size.height<50) this.size.height=50; + } + }; + // Defining scroll behavior ... + Function resizableHeight=size->new IScrollSize() { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return size.getSize().height; + } + }; + // Defining function keys ... + IntPredicate keybindKey=scancode->scancode==GLFW.GLFW_KEY_DELETE; + IntPredicate charFilter=character->{ + return character>=' '; + }; + ITextFieldKeys keys=new ITextFieldKeys() { + @Override + public boolean isBackspaceKey (int scancode) { + return scancode==GLFW.GLFW_KEY_BACKSPACE; + } + + @Override + public boolean isDeleteKey (int scancode) { + return scancode==GLFW.GLFW_KEY_DELETE; + } + + @Override + public boolean isInsertKey (int scancode) { + return scancode==GLFW.GLFW_KEY_INSERT; + } + + @Override + public boolean isLeftKey (int scancode) { + return scancode==GLFW.GLFW_KEY_LEFT; + } + + @Override + public boolean isRightKey (int scancode) { + return scancode==GLFW.GLFW_KEY_RIGHT; + } + + @Override + public boolean isHomeKey (int scancode) { + return scancode==GLFW.GLFW_KEY_HOME; + } + + @Override + public boolean isEndKey (int scancode) { + return scancode==GLFW.GLFW_KEY_END; + } + + @Override + public boolean isCopyKey (int scancode) { + return scancode==GLFW.GLFW_KEY_C; + } + + @Override + public boolean isPasteKey (int scancode) { + return scancode==GLFW.GLFW_KEY_V; + } + + @Override + public boolean isCutKey (int scancode) { + return scancode==GLFW.GLFW_KEY_X; + } + + @Override + public boolean isAllKey (int scancode) { + return scancode==GLFW.GLFW_KEY_A; + } + }; + + // Normal generator + IComponentGenerator generator=new ComponentGenerator(keybindKey,charFilter,keys); + // Use cycle switches instead of buttons + IComponentGenerator cycleGenerator=new ComponentGenerator(keybindKey,charFilter,keys) { + @Override + public IComponent getEnumComponent (IEnumSetting setting, Supplier animation, IComponentAdder adder, ThemeTuple theme, int colorLevel, boolean isContainer) { + return new CycleSwitch(setting,theme.getCycleSwitchRenderer(isContainer)); + } + }; + // Use all the fancy widgets with text boxes + IComponentGenerator csgoGenerator=new ComponentGenerator(keybindKey,charFilter,keys) { + @Override + public IComponent getBooleanComponent (IBooleanSetting setting, Supplier animation, IComponentAdder adder, ThemeTuple theme, int colorLevel, boolean isContainer) { + return new ToggleSwitch(setting,theme.getToggleSwitchRenderer(isContainer)); + } + + @Override + public IComponent getEnumComponent (IEnumSetting setting, Supplier animation, IComponentAdder adder, ThemeTuple theme, int colorLevel, boolean isContainer) { + return new DropDownList(setting,theme,isContainer,false,keys,new IScrollSize(){},adder::addPopup) { + @Override + protected Animation getAnimation() { + return animation.get(); + } + + @Override + public boolean allowCharacter (char character) { + return charFilter.test(character); + } + + @Override + protected boolean isUpKey (int key) { + return key==GLFW.GLFW_KEY_UP; + } + + @Override + protected boolean isDownKey (int key) { + return key==GLFW.GLFW_KEY_DOWN; + } + + @Override + protected boolean isEnterKey (int key) { + return key==GLFW.GLFW_KEY_ENTER; + } + }; + } + + @Override + public IComponent getNumberComponent (INumberSetting setting, Supplier animation, IComponentAdder adder, ThemeTuple theme, int colorLevel, boolean isContainer) { + return new Spinner(setting,theme,isContainer,true,keys); + } + + @Override + public IComponent getColorComponent (IColorSetting setting, Supplier animation, IComponentAdder adder, ThemeTuple theme, int colorLevel, boolean isContainer) { + return new ColorPickerComponent(setting,new ThemeTuple(theme.theme,theme.logicalLevel,colorLevel)); + } + }; + + // Classic Panel + IComponentAdder classicPanelAdder=new PanelAdder(gui,false,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.ClassicPanel,title->"classicPanel_"+title) { + @Override + protected IResizable getResizable (int width) { + return resizable.apply(width); + } + + @Override + protected IScrollSize getScrollSize (IResizable size) { + return resizableHeight.apply(size); + } + }; + ILayout classicPanelLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->ChildMode.DOWN,level->ChildMode.DOWN,popupType); + classicPanelLayout.populateGUI(classicPanelAdder,generator,client,theme); + // Pop-up Panel + IComponentAdder popupPanelAdder=new PanelAdder(gui,false,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.PopupPanel,title->"popupPanel_"+title) { + @Override + protected IResizable getResizable (int width) { + return resizable.apply(width); + } + + @Override + protected IScrollSize getScrollSize (IResizable size) { + return resizableHeight.apply(size); + } + }; + ILayout popupPanelLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->ChildMode.POPUP,level->ChildMode.DOWN,popupType); + popupPanelLayout.populateGUI(popupPanelAdder,generator,client,theme); + // Draggable Panel + IComponentAdder draggablePanelAdder=new PanelAdder(gui,false,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.DraggablePanel,title->"draggablePanel_"+title) { + @Override + protected IResizable getResizable (int width) { + return resizable.apply(width); + } + + @Override + protected IScrollSize getScrollSize (IResizable size) { + return resizableHeight.apply(size); + } + }; + ILayout draggablePanelLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->level==0?ChildMode.DRAG_POPUP:ChildMode.DOWN,level->ChildMode.DOWN,popupType); + draggablePanelLayout.populateGUI(draggablePanelAdder,generator,client,theme); + // Single Panel + IComponentAdder singlePanelAdder=new SinglePanelAdder(gui,new Labeled("Example Menu",null,()->true),theme,new Point(10,10),WIDTH*Category.values().length,animation,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.SinglePanel,"singlePanel") { + @Override + protected IResizable getResizable (int width) { + return resizable.apply(width); + } + + @Override + protected IScrollSize getScrollSize (IResizable size) { + return resizableHeight.apply(size); + } + }; + ILayout singlePanelLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->ChildMode.DOWN,level->ChildMode.DOWN,popupType); + singlePanelLayout.populateGUI(singlePanelAdder,generator,client,theme); + // Panel Menu + IComponentAdder panelMenuAdder=new StackedPanelAdder(gui,new Labeled("Example Menu",null,()->true),theme,new Point(10,10),WIDTH,animation,ChildMode.POPUP,new PanelPositioner(new Point(0,0)),()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.PanelMenu,"panelMenu"); + ILayout panelMenuLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->ChildMode.POPUP,level->ChildMode.POPUP,popupType); + panelMenuLayout.populateGUI(panelMenuAdder,generator,client,theme); + // Color Panel + IComponentAdder colorPanelAdder=new PanelAdder(gui,false,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.ColorPanel,title->"colorPanel_"+title) { + @Override + protected IResizable getResizable (int width) { + return resizable.apply(width); + } + + @Override + protected IScrollSize getScrollSize (IResizable size) { + return resizableHeight.apply(size); + } + }; + ILayout colorPanelLayout=new PanelLayout(WIDTH,new Point(DISTANCE,DISTANCE),(WIDTH+DISTANCE)/2,HEIGHT+DISTANCE,animation,level->ChildMode.DOWN,level->ChildMode.POPUP,colorPopup); + colorPanelLayout.populateGUI(colorPanelAdder,cycleGenerator,client,theme); + // Horizontal CSGO + AtomicReference horizontalResizable=new AtomicReference(null); + IComponentAdder horizontalCSGOAdder=new PanelAdder(gui,true,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.CSGOHorizontal,title->"horizontalCSGO_"+title) { + @Override + protected IResizable getResizable (int width) { + horizontalResizable.set(resizable.apply(width)); + return horizontalResizable.get(); + } + }; + ILayout horizontalCSGOLayout=new CSGOLayout(new Labeled("Example",null,()->true),new Point(100,100),480,WIDTH,animation,"Enabled",true,true,2,ChildMode.POPUP,colorPopup) { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return resizableHeight.apply(horizontalResizable.get()).getScrollHeight(null,height); + } + }; + horizontalCSGOLayout.populateGUI(horizontalCSGOAdder,csgoGenerator,client,theme); + // Vertical CSGO + AtomicReference verticalResizable=new AtomicReference(null); + IComponentAdder verticalCSGOAdder=new PanelAdder(gui,true,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.CSGOVertical,title->"verticalCSGO_"+title) { + @Override + protected IResizable getResizable (int width) { + verticalResizable.set(resizable.apply(width)); + return verticalResizable.get(); + } + }; + ILayout verticalCSGOLayout=new CSGOLayout(new Labeled("Example",null,()->true),new Point(100,100),480,WIDTH,animation,"Enabled",false,true,2,ChildMode.POPUP,colorPopup) { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return resizableHeight.apply(verticalResizable.get()).getScrollHeight(null,height); + } + }; + verticalCSGOLayout.populateGUI(verticalCSGOAdder,csgoGenerator,client,theme); + // Category CSGO + AtomicReference categoryResizable=new AtomicReference(null); + IComponentAdder categoryCSGOAdder=new PanelAdder(gui,true,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.CSGOCategory,title->"categoryCSGO_"+title) { + @Override + protected IResizable getResizable (int width) { + categoryResizable.set(resizable.apply(width)); + return categoryResizable.get(); + } + }; + ILayout categoryCSGOLayout=new CSGOLayout(new Labeled("Example",null,()->true),new Point(100,100),480,WIDTH,animation,"Enabled",false,false,2,ChildMode.POPUP,colorPopup) { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return resizableHeight.apply(categoryResizable.get()).getScrollHeight(null,height); + } + }; + categoryCSGOLayout.populateGUI(categoryCSGOAdder,csgoGenerator,client,theme); + // Searchable CSGO + AtomicReference searchableResizable=new AtomicReference(null); + IComponentAdder searchableCSGOAdder=new PanelAdder(gui,true,()->ClickGUIModule.layout.getValue()==ClickGUIModule.Layout.SearchableCSGO,title->"searchableCSGO_"+title) { + @Override + protected IResizable getResizable (int width) { + searchableResizable.set(resizable.apply(width)); + return searchableResizable.get(); + } + }; + ILayout searchableCSGOLayout=new SearchableLayout(new Labeled("Example",null,()->true),new Labeled("Search",null,()->true),new Point(100,100),480,WIDTH,animation,"Enabled",2,ChildMode.POPUP,colorPopup,(a,b)->a.getDisplayName().compareTo(b.getDisplayName()),charFilter,keys) { + @Override + public int getScrollHeight (Context context, int componentHeight) { + return resizableHeight.apply(searchableResizable.get()).getScrollHeight(null,height); + } + }; + searchableCSGOLayout.populateGUI(searchableCSGOAdder,csgoGenerator,client,theme); + } + + @Override + protected HUDGUI getGUI() { + return gui; + } + + @Override + protected GUIInterface getInterface() { + return inter; + } + + @Override + protected int getScrollSpeed() { + return ClickGUIModule.scrollSpeed.getValue(); + } + + + private class ThemeSelector implements IThemeMultiplexer { + protected Map themes=new EnumMap(ClickGUIModule.Theme.class); + + public ThemeSelector (IInterface inter) { + BooleanSetting clearGradient=new BooleanSetting("Gradient","gradient","Whether the title bars should have a gradient.",()->ClickGUIModule.theme.getValue()==Theme.Clear,true); + BooleanSetting ignoreDisabled=new BooleanSetting("Ignore Disabled","ignoreDisabled","Have the rainbow drawn for disabled containers.",()->ClickGUIModule.theme.getValue()==Theme.Rainbow,false); + BooleanSetting buttonRainbow=new BooleanSetting("Button Rainbow","buttonRainbow","Have a separate rainbow for each component.",()->ClickGUIModule.theme.getValue()==Theme.Rainbow,false); + IntegerSetting rainbowGradient=new IntegerSetting("Rainbow Gradient","rainbowGradient","How fast the rainbow should repeat.",()->ClickGUIModule.theme.getValue()==Theme.Rainbow,150,50,300); + ClickGUIModule.theme.subSettings.add(clearGradient); + ClickGUIModule.theme.subSettings.add(ignoreDisabled); + ClickGUIModule.theme.subSettings.add(buttonRainbow); + ClickGUIModule.theme.subSettings.add(rainbowGradient); + addTheme(Theme.Clear,new ClearTheme(new ThemeScheme(Theme.Clear),()->clearGradient.getValue(),9,3,1,": "+Formatting.GRAY)); + addTheme(Theme.GameSense,new GameSenseTheme(new ThemeScheme(Theme.GameSense),9,4,5,": "+Formatting.GRAY)); + addTheme(Theme.Rainbow,new RainbowTheme(new ThemeScheme(Theme.Rainbow),()->ignoreDisabled.getValue(),()->buttonRainbow.getValue(),()->rainbowGradient.getValue(),9,3,": "+Formatting.GRAY)); + addTheme(Theme.Windows31,new Windows31Theme(new ThemeScheme(Theme.Windows31),9,2,9,": "+Formatting.DARK_GRAY)); + addTheme(Theme.Impact,new ImpactTheme(new ThemeScheme(Theme.Impact),9,4)); + } + + @Override + public ITheme getTheme() { + return themes.getOrDefault(ClickGUIModule.theme.getValue(),themes.get(Theme.GameSense)); + } + + private void addTheme (Theme key, ITheme value) { + themes.put(key,new OptimizedTheme(value)); + value.loadAssets(inter); + } + + + private class ThemeScheme implements IColorScheme { + private final Theme themeValue; + private final String themeName; + + public ThemeScheme (Theme themeValue) { + this.themeValue=themeValue; + this.themeName=themeValue.toString().toLowerCase(); + } + + @Override + public void createSetting (ITheme theme, String name, String description, boolean hasAlpha, boolean allowsRainbow, Color color, boolean rainbow) { + ClickGUIModule.theme.subSettings.add(new ColorSetting(name,themeName+"-"+name,description,()->ClickGUIModule.theme.getValue()==themeValue,hasAlpha,allowsRainbow,color,rainbow)); + } + + @Override + public Color getColor (String name) { + return ((ColorSetting)ClickGUIModule.theme.subSettings.stream().filter(setting->setting.configName.equals(themeName+"-"+name)).findFirst().orElse(null)).getValue(); + } + } + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/ExampleMod.java b/example-mod19/src/main/java/com/lukflug/examplemod19/ExampleMod.java new file mode 100644 index 0000000..664f721 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/ExampleMod.java @@ -0,0 +1,49 @@ +package com.lukflug.examplemod19; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.examplemod19.module.Category; +import com.lukflug.examplemod19.module.ClickGUIModule; +import com.lukflug.examplemod19.module.HUDEditorModule; +import com.lukflug.examplemod19.module.LogoModule; +import com.lukflug.examplemod19.module.TabGUIModule; +import com.lukflug.examplemod19.module.WatermarkModule; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; +import net.minecraft.client.MinecraftClient; + +public class ExampleMod implements ModInitializer { + private static ClickGUI gui; + private boolean inited=false; + private final boolean keys[]=new boolean[266]; + + @Override + public void onInitialize() { + Category.init(); + Category.OTHER.modules.add(new ClickGUIModule()); + Category.OTHER.modules.add(new HUDEditorModule()); + Category.HUD.modules.add(new TabGUIModule()); + Category.HUD.modules.add(new WatermarkModule()); + Category.HUD.modules.add(new LogoModule()); + ClientTickEvents.END_CLIENT_TICK.register(client -> { + if (!inited) { + for (int i=32;igui.render()); + inited=true; + } + for (int i=32;i modules=new ArrayList(); + public static Random random=new Random(); + + private Category (String displayName) { + this.displayName=displayName; + } + + public static void init() { + for (Category category: Category.values()) { + int count=random.nextInt(6)+5; + for (int i=0;i getModules() { + return modules.stream().map(module->module); + } + + public static IClient getClient() { + return new IClient() { + @Override + public Stream getCategories() { + return Arrays.stream(Category.values()); + } + }; + } + + public static Module generateRandomModule() { + Module module=new Module(generateRandomName(5,10),generateRandomName(10,20),()->true,random.nextInt(2)==0); + int count=random.nextInt(6)+5; + for (int i=0;i generateRandomSetting() { + String displayName=generateRandomName(5,10); + String description=generateRandomName(10,20); + int type=random.nextInt(6); + int min=random.nextInt(50),max=random.nextInt(50)+50; + boolean alpha=random.nextInt(2)==0; + boolean rainbow=random.nextInt(2)==0; + Color color=new Color(random.nextInt(256),random.nextInt(256),random.nextInt(256),alpha?random.nextInt(256):255); + switch (type) { + case 0: + return new BooleanSetting(displayName,displayName,description,()->true,random.nextInt(2)==0); + case 1: + return new ColorSetting(displayName,displayName,description,()->true,alpha,rainbow,color,rainbow?random.nextInt(2)==0:false); + case 2: + return new DoubleSetting(displayName,displayName,description,()->true,min,max,random.nextDouble()*(max-min)+min); + case 4: + return new IntegerSetting(displayName,displayName,description,()->true,min,max,random.nextInt(max-min+1)+min); + default: + return new StringSetting(displayName,displayName,description,()->true,generateRandomName(5,10)); + } + }; + + public static String generateRandomName (int min, int max) { + int length=random.nextInt(max-min+1)+min; + String s=""; + for (int i=0;i colorModel=new EnumSetting("Color Model","colorModel","Whether to use RGB or HSB.",()->true,ColorModel.RGB,ColorModel.class); + public static final IntegerSetting rainbowSpeed=new IntegerSetting("Rainbow Speed","rainbowSpeed","The speed of the color hue cycling.",()->true,1,100,32); + public static final IntegerSetting scrollSpeed=new IntegerSetting("Scroll Speed","scrollSpeed","The speed of scrolling.",()->true,0,20,10); + public static final IntegerSetting animationSpeed=new IntegerSetting("Animation Speed","animationSpeed","The speed of GUI animations.",()->true,0,1000,200); + public static final EnumSetting theme=new EnumSetting("Theme","theme","What theme to use.",()->true,Theme.GameSense,Theme.class); + public static final EnumSetting layout=new EnumSetting("Layout","layout","What layout to use.",()->true,Layout.ClassicPanel,Layout.class); + public static final KeybindSetting keybind=new KeybindSetting("Keybind","keybind","The key to toggle the module.",()->true,GLFW.GLFW_KEY_O); + + public ClickGUIModule() { + super("ClickGUI","Module containing ClickGUI settings.",()->true,false); + settings.add(colorModel); + settings.add(rainbowSpeed); + settings.add(scrollSpeed); + settings.add(animationSpeed); + settings.add(theme); + settings.add(layout); + settings.add(keybind); + } + + public enum ColorModel { + RGB,HSB; + } + + public enum Theme { + Clear,GameSense,Rainbow,Windows31,Impact; + } + + public enum Layout { + ClassicPanel,PopupPanel,DraggablePanel,SinglePanel,PanelMenu,ColorPanel,CSGOHorizontal,CSGOVertical,CSGOCategory,SearchableCSGO; + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/module/HUDEditorModule.java b/example-mod19/src/main/java/com/lukflug/examplemod19/module/HUDEditorModule.java new file mode 100644 index 0000000..ee9fca0 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/module/HUDEditorModule.java @@ -0,0 +1,17 @@ +package com.lukflug.examplemod19.module; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.examplemod19.setting.BooleanSetting; +import com.lukflug.examplemod19.setting.KeybindSetting; + +public class HUDEditorModule extends Module { + public static final BooleanSetting showHUD=new BooleanSetting("Show HUD Panels","showHUD","Whether to show the HUD panels in the ClickGUI.",()->true,true); + public static final KeybindSetting keybind=new KeybindSetting("Keybind","keybind","The key to toggle the module.",()->true,GLFW.GLFW_KEY_P); + + public HUDEditorModule() { + super("HUDEditor","Module containing HUDEditor settings.",()->true,false); + settings.add(showHUD); + settings.add(keybind); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/module/LogoModule.java b/example-mod19/src/main/java/com/lukflug/examplemod19/module/LogoModule.java new file mode 100644 index 0000000..bfc1dac --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/module/LogoModule.java @@ -0,0 +1,49 @@ +package com.lukflug.examplemod19.module; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; + +import com.lukflug.examplemod19.setting.BooleanSetting; +import com.lukflug.examplemod19.setting.ColorSetting; +import com.lukflug.examplemod19.setting.IntegerSetting; +import com.lukflug.panelstudio.base.Context; +import com.lukflug.panelstudio.base.IInterface; +import com.lukflug.panelstudio.base.IToggleable; +import com.lukflug.panelstudio.component.IFixedComponent; +import com.lukflug.panelstudio.hud.HUDComponent; + +public class LogoModule extends Module { + private static LogoModule instance; + private static final IntegerSetting rotation=new IntegerSetting("Image Rotation","rotation","How to rotate the image.",()->true,0,3,0); + private static final BooleanSetting parity=new BooleanSetting("Flip Image","parity","Whether to flip the image or not.",()->true,false); + private static final ColorSetting color=new ColorSetting("Logo Color","color","The color to modulate the logo with.",()->true,true,true,new Color(255,255,255,128),true); + + public LogoModule() { + super("Logo","Module that displays the PanelStudio icon on HUD.",()->true,true); + instance=this; + settings.add(rotation); + settings.add(parity); + settings.add(color); + } + + public static IFixedComponent getComponent (IInterface inter) { + int image=inter.loadImage("panelstudio.png"); + return new HUDComponent(()->"Logo",new Point(300,300),"logo") { + @Override + public void render (Context context) { + super.render(context); + context.getInterface().drawImage(context.getRect(),rotation.getValue(),parity.getValue(),image,color.getValue()); + } + + @Override + public Dimension getSize (IInterface inter) { + return new Dimension(141,61); + } + }; + } + + public static IToggleable getToggle() { + return instance.isEnabled(); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/module/Module.java b/example-mod19/src/main/java/com/lukflug/examplemod19/module/Module.java new file mode 100644 index 0000000..c4c7d28 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/module/Module.java @@ -0,0 +1,62 @@ +package com.lukflug.examplemod19.module; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +import com.lukflug.examplemod19.setting.Setting; +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.base.IToggleable; +import com.lukflug.panelstudio.setting.IModule; +import com.lukflug.panelstudio.setting.ISetting; + +public class Module implements IModule { + public final String displayName,description; + public final IBoolean visible; + public final List> settings=new ArrayList>(); + public final boolean toggleable; + private boolean enabled=false; + + public Module (String displayName, String description, IBoolean visible, boolean toggleable) { + this.displayName=displayName; + this.description=description; + this.visible=visible; + this.toggleable=toggleable; + } + + @Override + public String getDisplayName() { + return displayName; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public IBoolean isVisible() { + return visible; + } + + @Override + public IToggleable isEnabled() { + if (!toggleable) return null; + return new IToggleable() { + @Override + public boolean isOn() { + return enabled; + } + + @Override + public void toggle() { + enabled=!enabled; + } + }; + } + + @Override + public Stream> getSettings() { + return settings.stream().filter(setting->setting instanceof ISetting).sorted((a,b)->a.displayName.compareTo(b.displayName)).map(setting->(ISetting)setting); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/module/TabGUIModule.java b/example-mod19/src/main/java/com/lukflug/examplemod19/module/TabGUIModule.java new file mode 100644 index 0000000..cc5bb8e --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/module/TabGUIModule.java @@ -0,0 +1,49 @@ +package com.lukflug.examplemod19.module; + +import java.awt.Color; +import java.awt.Point; +import java.util.function.Supplier; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.examplemod19.setting.ColorSetting; +import com.lukflug.panelstudio.base.Animation; +import com.lukflug.panelstudio.base.IToggleable; +import com.lukflug.panelstudio.component.IFixedComponent; +import com.lukflug.panelstudio.container.IContainer; +import com.lukflug.panelstudio.setting.IClient; +import com.lukflug.panelstudio.tabgui.ITabGUITheme; +import com.lukflug.panelstudio.tabgui.StandardTheme; +import com.lukflug.panelstudio.tabgui.TabGUI; +import com.lukflug.panelstudio.theme.IColorScheme; +import com.lukflug.panelstudio.theme.ITheme; + +public class TabGUIModule extends Module { + private static TabGUIModule instance; + private static ITabGUITheme theme; + + public TabGUIModule() { + super("TabGUI","HUD module that lets toggle modules.",()->true,true); + instance=this; + theme=new StandardTheme(new IColorScheme() { + @Override + public void createSetting(ITheme theme, String name, String description, boolean hasAlpha, boolean allowsRainbow, Color color, boolean rainbow) { + ColorSetting setting=new ColorSetting(name,name,description,()->true,allowsRainbow,hasAlpha,color,rainbow); + instance.settings.add(setting); + } + + @Override + public Color getColor (String name) { + return (Color)instance.settings.stream().filter(setting->setting.configName.equals(name)).findFirst().orElse(null).getValue(); + } + },75,9,2,5); + } + + public static IFixedComponent getComponent (IClient client, IContainer container, Supplier animation) { + return new TabGUI(()->"TabGUI",client,theme,container,animation,key->key==GLFW.GLFW_KEY_UP,key->key==GLFW.GLFW_KEY_DOWN,key->key==GLFW.GLFW_KEY_ENTER||key==GLFW.GLFW_KEY_RIGHT,key->key==GLFW.GLFW_KEY_LEFT,new Point(10,10),"tabGUI").getWrappedComponent(); + } + + public static IToggleable getToggle() { + return instance.isEnabled(); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/module/WatermarkModule.java b/example-mod19/src/main/java/com/lukflug/examplemod19/module/WatermarkModule.java new file mode 100644 index 0000000..233a605 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/module/WatermarkModule.java @@ -0,0 +1,68 @@ +package com.lukflug.examplemod19.module; + +import java.awt.Color; +import java.awt.Point; + +import com.lukflug.examplemod19.setting.BooleanSetting; +import com.lukflug.examplemod19.setting.ColorSetting; +import com.lukflug.examplemod19.setting.StringSetting; +import com.lukflug.panelstudio.base.IToggleable; +import com.lukflug.panelstudio.component.IFixedComponent; +import com.lukflug.panelstudio.hud.HUDList; +import com.lukflug.panelstudio.hud.ListComponent; + +public class WatermarkModule extends Module { + private static WatermarkModule instance; + private static final ColorSetting color=new ColorSetting("Text Color","color","The color of the displayed text.",()->true,false,true,new Color(0,0,255),false); + private static final BooleanSetting sortUp=new BooleanSetting("Sort Up","sortUp","Whether to align the text from the bottom up.",()->true,false); + private static final BooleanSetting sortRight=new BooleanSetting("Sort Right","sortRight","Whether to align the text from right to left.",()->true,false); + private static final StringSetting line1=new StringSetting("First Line","line1","The first line of text.",()->true,"PanelStudio"); + private static final StringSetting line2=new StringSetting("Second Line","line2","The second line of text.",()->true,"Example Mod"); + private static final StringSetting line3=new StringSetting("Third Line","line3","The third line of text.",()->true,"made by lukflug"); + + public WatermarkModule() { + super("Watermark","Module that displays text on HUD.",()->true,true); + instance=this; + settings.add(color); + settings.add(sortUp); + settings.add(sortRight); + settings.add(line1); + settings.add(line2); + settings.add(line3); + } + + public static IFixedComponent getComponent() { + return new ListComponent(()->"Watermark",new Point(300,10),"watermark",new HUDList() { + @Override + public int getSize() { + return 3; + } + + @Override + public String getItem(int index) { + if (index==0) return line1.getValue(); + else if (index==1) return line2.getValue(); + else return line3.getValue(); + } + + @Override + public Color getItemColor(int index) { + return color.getValue(); + } + + @Override + public boolean sortUp() { + return sortUp.getValue(); + } + + @Override + public boolean sortRight() { + return sortRight.getValue(); + } + },9,2); + } + + public static IToggleable getToggle() { + return instance.isEnabled(); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/BooleanSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/BooleanSetting.java new file mode 100644 index 0000000..5566261 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/BooleanSetting.java @@ -0,0 +1,20 @@ +package com.lukflug.examplemod19.setting; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.IBooleanSetting; + +public class BooleanSetting extends Setting implements IBooleanSetting { + public BooleanSetting (String displayName, String configName, String description, IBoolean visible, Boolean value) { + super(displayName,configName,description,visible,value); + } + + @Override + public void toggle() { + setValue(!getValue()); + } + + @Override + public boolean isOn() { + return getValue(); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/ColorSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/ColorSetting.java new file mode 100644 index 0000000..6d0934a --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/ColorSetting.java @@ -0,0 +1,60 @@ +package com.lukflug.examplemod19.setting; + +import java.awt.Color; + +import com.lukflug.examplemod19.module.ClickGUIModule; +import com.lukflug.examplemod19.module.ClickGUIModule.ColorModel; +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.IColorSetting; +import com.lukflug.panelstudio.theme.ITheme; + +public class ColorSetting extends Setting implements IColorSetting { + public final boolean hasAlpha,allowsRainbow; + private boolean rainbow; + + public ColorSetting (String displayName, String configName, String description, IBoolean visible, boolean hasAlpha, boolean allowsRainbow, Color value, boolean rainbow) { + super(displayName,configName,description,visible,value); + this.hasAlpha=hasAlpha; + this.allowsRainbow=allowsRainbow; + this.rainbow=rainbow; + } + + @Override + public Color getValue() { + if (rainbow) { + int speed=ClickGUIModule.rainbowSpeed.getValue(); + return ITheme.combineColors(Color.getHSBColor((System.currentTimeMillis()%(360*speed))/(float)(360*speed),1,1),super.getValue()); + } + else return super.getValue(); + } + + @Override + public Color getColor() { + return super.getValue(); + } + + @Override + public boolean getRainbow() { + return rainbow; + } + + @Override + public void setRainbow (boolean rainbow) { + this.rainbow=rainbow; + } + + @Override + public boolean hasAlpha() { + return hasAlpha; + } + + @Override + public boolean allowsRainbow() { + return allowsRainbow; + } + + @Override + public boolean hasHSBModel() { + return ClickGUIModule.colorModel.getValue()==ColorModel.HSB; + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/DoubleSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/DoubleSetting.java new file mode 100644 index 0000000..afda057 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/DoubleSetting.java @@ -0,0 +1,39 @@ +package com.lukflug.examplemod19.setting; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.INumberSetting; + +public class DoubleSetting extends Setting implements INumberSetting { + public final double min,max; + + public DoubleSetting (String displayName, String configName, String description, IBoolean visible, double min, double max, double value) { + super(displayName,configName,description,visible,value); + this.min=min; + this.max=max; + } + + @Override + public double getNumber() { + return getValue(); + } + + @Override + public void setNumber (double value) { + setValue(value); + } + + @Override + public double getMaximumValue() { + return max; + } + + @Override + public double getMinimumValue() { + return min; + } + + @Override + public int getPrecision() { + return 2; + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/EnumSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/EnumSetting.java new file mode 100644 index 0000000..bebe4d5 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/EnumSetting.java @@ -0,0 +1,61 @@ +package com.lukflug.examplemod19.setting; + +import java.util.Arrays; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.IEnumSetting; +import com.lukflug.panelstudio.setting.ILabeled; + +public class EnumSetting> extends Setting implements IEnumSetting { + private final Class settingClass; + private final ILabeled[] array; + + public EnumSetting (String displayName, String configName, String description, IBoolean visible, E value, Class settingClass) { + super(displayName,configName,description,visible,value); + this.settingClass=settingClass; + array=Arrays.stream(settingClass.getEnumConstants()).map(v->{ + return new ILabeled() { + @Override + public String getDisplayName() { + return v.toString(); + } + }; + }).toArray(ILabeled[]::new); + } + + @Override + public void increment() { + E[] array=settingClass.getEnumConstants(); + int index=getValue().ordinal()+1; + if (index>=array.length) index=0; + setValue(array[index]); + } + + @Override + public void decrement() { + E[] array=settingClass.getEnumConstants(); + int index=getValue().ordinal()-1; + if (index<0) index=array.length-1; + setValue(array[index]); + } + + @Override + public String getValueName() { + return getValue().toString(); + } + + @Override + public int getValueIndex() { + return getValue().ordinal(); + } + + @Override + public void setValueIndex(int index) { + setValue(settingClass.getEnumConstants()[index]); + } + + @Override + public ILabeled[] getAllowedValues() { + return array; + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/IntegerSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/IntegerSetting.java new file mode 100644 index 0000000..822e260 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/IntegerSetting.java @@ -0,0 +1,39 @@ +package com.lukflug.examplemod19.setting; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.INumberSetting; + +public class IntegerSetting extends Setting implements INumberSetting { + public final int min,max; + + public IntegerSetting (String displayName, String configName, String description, IBoolean visible, int min, int max, int value) { + super(displayName,configName,description,visible,value); + this.min=min; + this.max=max; + } + + @Override + public double getNumber() { + return getValue(); + } + + @Override + public void setNumber (double value) { + setValue((int)Math.round(value)); + } + + @Override + public double getMaximumValue() { + return max; + } + + @Override + public double getMinimumValue() { + return min; + } + + @Override + public int getPrecision() { + return 0; + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/KeybindSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/KeybindSetting.java new file mode 100644 index 0000000..8dcdb78 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/KeybindSetting.java @@ -0,0 +1,31 @@ +package com.lukflug.examplemod19.setting; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.IKeybindSetting; + +import net.minecraft.client.util.InputUtil; +import net.minecraft.text.TranslatableTextContent; + +public class KeybindSetting extends Setting implements IKeybindSetting { + public KeybindSetting (String displayName, String configName, String description, IBoolean visible, Integer value) { + super(displayName,configName,description,visible,value); + } + + @Override + public int getKey() { + return getValue(); + } + + @Override + public void setKey (int key) { + setValue(key); + } + + @Override + public String getKeyName() { + String translationKey=InputUtil.Type.KEYSYM.createFromCode(getKey()).getTranslationKey(); + String translation=new TranslatableTextContent(translationKey).toString(); + if (!translation.equals(translationKey)) return translation; + return InputUtil.Type.KEYSYM.createFromCode(getKey()).getLocalizedText().getString(); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/Setting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/Setting.java new file mode 100644 index 0000000..e3ffacd --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/Setting.java @@ -0,0 +1,52 @@ +package com.lukflug.examplemod19.setting; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.ILabeled; +import com.lukflug.panelstudio.setting.ISetting; + +public abstract class Setting implements ILabeled { + public final String displayName,configName,description; + public final IBoolean visible; + public final List> subSettings=new ArrayList>(); + private T value; + + public Setting (String displayName, String configName, String description, IBoolean visible, T value) { + this.displayName=displayName; + this.configName=configName; + this.description=description; + this.visible=visible; + this.value=value; + } + + public T getValue() { + return value; + } + + public void setValue (T value) { + this.value=value; + } + + @Override + public String getDisplayName() { + return displayName; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public IBoolean isVisible() { + return visible; + } + + public Stream> getSubSettings() { + if (subSettings.size()==0) return null; + return subSettings.stream().filter(setting->setting instanceof ISetting).sorted((a,b)->a.displayName.compareTo(b.displayName)).map(setting->(ISetting)setting); + } +} diff --git a/example-mod19/src/main/java/com/lukflug/examplemod19/setting/StringSetting.java b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/StringSetting.java new file mode 100644 index 0000000..3a75342 --- /dev/null +++ b/example-mod19/src/main/java/com/lukflug/examplemod19/setting/StringSetting.java @@ -0,0 +1,10 @@ +package com.lukflug.examplemod19.setting; + +import com.lukflug.panelstudio.base.IBoolean; +import com.lukflug.panelstudio.setting.IStringSetting; + +public class StringSetting extends Setting implements IStringSetting { + public StringSetting (String displayName, String configName, String description, IBoolean visible, String value) { + super(displayName,configName,description,visible,value); + } +} diff --git a/example-mod19/src/main/resources/assets/examplemod/panelstudio.png b/example-mod19/src/main/resources/assets/examplemod/panelstudio.png new file mode 100644 index 0000000000000000000000000000000000000000..5cf536a4eb2a420db3f8fd7b97c78bb1328546ce GIT binary patch literal 21570 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 literal 0 HcmV?d00001 diff --git a/example-mod19/src/main/resources/fabric.mod.json b/example-mod19/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..79ee2ff --- /dev/null +++ b/example-mod19/src/main/resources/fabric.mod.json @@ -0,0 +1,23 @@ +{ + "schemaVersion": 1, + "id": "example-mod18", + "version": "${version}", + "name": "PanelStudio-MC19 Example Mod", + "description": "An example mod for PanelStudio-MC19.", + "authors": ["lukflug"], + "contact": { + "homepage": "https://lukflug.github.io", + "sources": "https://github.com/lukflug/PanelStudio" + }, + "license": "MIT", + "icon": "assets/examplemod/panelstudio.png", + "environment": "*", + "entrypoints": { + "main": ["com.lukflug.examplemod19.ExampleMod"] + }, + "depends": { + "fabric": "*", + "fabricloader": ">=0.7.4", + "minecraft": "1.19.x" + } +} From f3ef7a6a211583a4583e8532c6ff31dfaf64763a Mon Sep 17 00:00:00 2001 From: Diliard <43886528+Diliard@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:51:45 +0200 Subject: [PATCH 03/11] Updated package, description and switch cases --- panelstudio-mc19/gradle.properties | 3 - .../lukflug/panelstudio/mc19/GLInterface.java | 346 ++++++++++++++++++ .../panelstudio/mc19/MinecraftGUI.java | 229 ++++++++++++ .../panelstudio/mc19/MinecraftHUDGUI.java | 73 ++++ .../panelstudio/mc19/package-info.java | 6 + .../src/main/resources/fabric.mod.json | 2 +- 6 files changed, 655 insertions(+), 4 deletions(-) create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/GLInterface.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftGUI.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftHUDGUI.java create mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java diff --git a/panelstudio-mc19/gradle.properties b/panelstudio-mc19/gradle.properties index 286c29c..5ddf578 100644 --- a/panelstudio-mc19/gradle.properties +++ b/panelstudio-mc19/gradle.properties @@ -2,11 +2,8 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.2 coreVersion = 0.2.1 -loom17Version = 0.12.1 loom19Version = 1.0-SNAPSHOT -minecraft17 = 1.17.1 minecraft19 = 1.19.2 -mappings17 = 1.17.1+build.65 mappings19 = 1.19.2+build.25 \ No newline at end of file diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/GLInterface.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/GLInterface.java new file mode 100644 index 0000000..ff9e70b --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/GLInterface.java @@ -0,0 +1,346 @@ +package com.lukflug.panelstudio.mc19; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.util.Stack; + +import javax.imageio.ImageIO; + +import org.lwjgl.opengl.GL11; + +import com.lukflug.panelstudio.base.IInterface; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.platform.TextureUtil; +import com.mojang.blaze3d.systems.RenderSystem; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormat.DrawMode; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Matrix4f; + +/** + * Implementation of {@link IInterface} for OpenGL in Minecraft. + * @author lukflug, Diliard + */ +public abstract class GLInterface implements IInterface { + /** + * Clipping rectangle stack. + */ + private final Stack clipRect=new Stack(); + /** + * Stored projection matrix. + */ + private Matrix4f projection=null; + /** + * Boolean indicating whether to clip in the horizontal direction. + */ + protected boolean clipX; + + /** + * Constructor. + * @param clipX whether to clip in the horizontal direction + */ + public GLInterface (boolean clipX) { + this.clipX=clipX; + } + + @Override + public Dimension getWindowSize() { + return new Dimension((int)Math.ceil(getScreenWidth()),(int)Math.ceil(getScreenHeight())); + } + + @SuppressWarnings("resource") + @Override + public void drawString (Point pos, int height, String s, Color c) { + MatrixStack modelview=RenderSystem.getModelViewStack(); + modelview.push(); + modelview.translate(pos.x,pos.y,0); + float scale=height/(float)MinecraftClient.getInstance().textRenderer.fontHeight; + modelview.scale(scale,scale,1); + RenderSystem.applyModelViewMatrix(); + end(false); + MinecraftClient.getInstance().textRenderer.drawWithShadow(getMatrixStack(),s,0,0,c.getRGB()); + begin(false); + modelview.pop(); + RenderSystem.applyModelViewMatrix(); + } + + @SuppressWarnings("resource") + @Override + public int getFontWidth (int height, String s) { + double scale=height/(double)MinecraftClient.getInstance().textRenderer.fontHeight; + return (int)Math.round(MinecraftClient.getInstance().textRenderer.getWidth(s)*scale); + } + + @Override + public void fillTriangle (Point pos1, Point pos2, Point pos3, Color c1, Color c2, Color c3) { + RenderSystem.setShader(GameRenderer::getPositionColorShader); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.TRIANGLES,VertexFormats.POSITION_COLOR); + bufferbuilder.vertex(pos1.x,pos1.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); + bufferbuilder.vertex(pos2.x,pos2.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); + bufferbuilder.vertex(pos3.x,pos3.y,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); + tessellator.draw(); + } + + @Override + public void drawLine (Point a, Point b, Color c1, Color c2) { + RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader); + float normalx=b.x-a.x,normaly=b.y-a.y; + float scale=(float)Math.sqrt(normalx*normalx+normaly*normaly); + normalx/=scale; + normaly/=scale; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.LINES,VertexFormats.LINES); + bufferbuilder.vertex(a.x*256/255f,a.y*256/255f,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).normal(normalx,normaly,0).next(); + bufferbuilder.vertex(b.x*256/255f,b.y*256/255f,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).normal(normalx,normaly,0).next(); + tessellator.draw(); + } + + @Override + public void fillRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { + RenderSystem.setShader(GameRenderer::getPositionColorShader); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder bufferbuilder = tessellator.getBuffer(); + bufferbuilder.begin(DrawMode.QUADS, VertexFormats.POSITION_COLOR); + bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); + bufferbuilder.vertex(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); + tessellator.draw(); + } + + @Override + public void drawRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { + drawLine(new Point(r.x,r.y+r.height),new Point(r.x+r.width,r.y+r.height),c4,c3); + drawLine(new Point(r.x+r.width,r.y+r.height),new Point(r.x+r.width,r.y),c3,c2); + drawLine(new Point(r.x+r.width,r.y),new Point(r.x,r.y),c2,c1); + drawLine(new Point(r.x,r.y),new Point(r.x,r.y+r.height),c1,c4); + } + + @Override + public synchronized int loadImage (String name) { + try { + Identifier rl=new Identifier(getResourcePrefix()+name); + //InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).getInputStream(); + InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).get().getInputStream(); + BufferedImage image=ImageIO.read(stream); + int texture=TextureUtil.generateTextureId(); + RenderSystem.bindTextureForSetup(texture); + int width=image.getWidth(),height=image.getHeight(); + IntBuffer buffer=ByteBuffer.allocateDirect(4*width*height).order(ByteOrder.nativeOrder()).asIntBuffer(); + buffer.put(image.getRGB(0,0,width,height,null,0,width)); + buffer.flip(); + TextureUtil.initTexture(buffer,width,height); + return texture; + } catch (IOException e) { + e.printStackTrace(); + return 0; + } + } + + @Override + public void drawImage (Rectangle r, int rotation, boolean parity, int image, Color color) { + if (image==0) return; + int texCoords[][]={{0,1},{1,1},{1,0},{0,0}}; + for (int i=0;ix1 && y2>y1) { + Rectangle rect=new Rectangle(x1,y1,x2-x1,y2-y1); + scissor(rect); + clipRect.push(rect); + } else { + scissor(null); + clipRect.push(null); + } + } + } + } + + @Override + public void restore() { + if (!clipRect.isEmpty()) { + clipRect.pop(); + if (clipRect.isEmpty()) GL11.glDisable(GL11.GL_SCISSOR_TEST); + else scissor(clipRect.peek()); + } + } + + /** + * Utility function to convert screen pixel coordinates to PanelStudio GUI coordinates. + * @param p the screen coordinates + * @return the corresponding GUI coordinates + */ + public Point screenToGui (Point p) { + int resX=getWindowSize().width; + int resY=getWindowSize().height; + return new Point(p.x*resX/MinecraftClient.getInstance().getWindow().getWidth(),resY-p.y*resY/MinecraftClient.getInstance().getWindow().getHeight()-1); + } + + /** + * Utility function to convert PanelStudio GUI coordinates to screen pixel coordinates. + * @param p the GUI coordinates + * @return the corresponding screen coordinates + */ + public Point guiToScreen (Point p) { + double resX=getScreenWidth(); + double resY=getScreenHeight(); + return new Point((int)Math.round(p.x*MinecraftClient.getInstance().getWindow().getWidth()/resX),(int)Math.round((resY-p.y)*MinecraftClient.getInstance().getWindow().getHeight()/resY)); + } + + /** + * Get the current screen width. + * @return the screen width + */ + protected double getScreenWidth() { + return MinecraftClient.getInstance().getWindow().getScaledWidth(); + } + + /** + * Get the current screen height. + * @return the screen height + */ + protected double getScreenHeight() { + return MinecraftClient.getInstance().getWindow().getScaledHeight(); + } + + /** + * Set OpenGL to the state used by the rendering methods. + * Should be called before rendering. + * @param matrix whether to set up the modelview matrix + */ + public void begin (boolean matrix) { + if (matrix) { + projection=RenderSystem.getProjectionMatrix().copy(); + float array[]={2/(float)getScreenWidth(),0,0,-1, 0,-2/(float)getScreenHeight(),0,1, 0,0,-1/3000f,0, 0,0,0,1}; + FloatBuffer buffer=FloatBuffer.allocate(16).put(array).flip(); + RenderSystem.getProjectionMatrix().readRowMajor(buffer); + MatrixStack modelview=RenderSystem.getModelViewStack(); + modelview.push(); + modelview.loadIdentity(); + RenderSystem.applyModelViewMatrix(); + } + RenderSystem.enableBlend(); + RenderSystem.disableTexture(); + RenderSystem.disableCull(); + RenderSystem.lineWidth(2); + RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA,GL11.GL_ONE,GL11.GL_ZERO); + } + + /** + * Restore OpenGL to the state expected by Minecraft. + * Should be called after rendering. + * @param matrix whether to restore the modelview matrix + */ + public void end (boolean matrix) { + RenderSystem.enableCull(); + RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + if (matrix) { + RenderSystem.getModelViewStack().pop(); + RenderSystem.applyModelViewMatrix(); + RenderSystem.getProjectionMatrix().load(projection); + projection=null; + } + } + + /** + * Get the z-coordinate to render everything. + * @return the z-level + */ + protected abstract float getZLevel(); + + /** + * Get the matrix stack to be used. + * @return the current matrix stack + */ + protected abstract MatrixStack getMatrixStack(); + + /** + * Get the Minecraft resource location string. + * @return the resource prefix + */ + protected abstract String getResourcePrefix(); +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftGUI.java new file mode 100644 index 0000000..a051793 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftGUI.java @@ -0,0 +1,229 @@ +package com.lukflug.panelstudio.mc19; + +import java.awt.Point; + +import net.minecraft.text.Text; +import org.lwjgl.glfw.GLFW; + +import com.lukflug.panelstudio.base.IInterface; +import com.lukflug.panelstudio.container.GUI; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.MatrixStack; + +/** + * Implementation of Minecraft's {@link Screen} that renders a PanelStudio GUI. + * @author lukflug, Diliard + */ +public abstract class MinecraftGUI extends Screen { + /** + * The current mouse position. + */ + private Point mouse=new Point(); + /** + * Current left mouse button state. + */ + private boolean lButton=false; + /** + * Current right mouse button state. + */ + private boolean rButton=false; + /** + * Current GLFW modifier bits. + */ + private int modifiers=0; + /** + * Last rendering time. + */ + private long lastTime; + /** + * Saved matrix stack; + */ + protected MatrixStack matrixStack=null; + + /** + * Constructor. + */ + public MinecraftGUI() { + super(Text.literal("PanelStudio GUI")); + } + + /** + * Displays the GUI. + */ + public void enterGUI() { + MinecraftClient.getInstance().setScreen(this); + } + + /** + * Closes the GUI. + */ + public void exitGUI() { + MinecraftClient.getInstance().setScreen(null); + } + + /** + * Renders the GUI. + */ + protected void renderGUI() { + lastTime=System.currentTimeMillis(); + getInterface().begin(true); + getGUI().render(); + getInterface().end(true); + } + + @Override + public void init() { + getGUI().enter(); + } + + @Override + public void removed() { + getGUI().exit(); + } + + @Override + public void render (MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { + matrixStack=matrices; + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + renderGUI(); + } + + @Override + public boolean mouseScrolled (double mouseX, double mouseY, double scroll) { + if (!super.mouseScrolled(mouseX,mouseY,scroll)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + if (scroll!=0) { + if (scroll>0) getGUI().handleScroll(-getScrollSpeed()); + else getGUI().handleScroll(getScrollSpeed()); + } + } + return true; + } + + @Override + public boolean mouseClicked (double mouseX, double mouseY, int clickedButton) { + if (!super.mouseReleased(mouseX,mouseY,clickedButton)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + switch (clickedButton) { + case IInterface.LBUTTON: { lButton = true; break; } + case IInterface.RBUTTON: { rButton = true; break; } + } + getGUI().handleButton(clickedButton); + } + return true; + } + + @Override + public boolean mouseReleased (double mouseX, double mouseY, int releaseButton) { + if (!super.mouseReleased(mouseX,mouseY,releaseButton)) { + mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); + switch (releaseButton) { + case IInterface.LBUTTON: { lButton = false; break; } + case IInterface.RBUTTON: { rButton = false; break; } + } + getGUI().handleButton(releaseButton); + } + return true; + } + + @Override + public boolean keyPressed (int keyCode, int scanCode, int modifiers) { + this.modifiers=modifiers; + if (keyCode==GLFW.GLFW_KEY_ESCAPE) exitGUI(); + else getGUI().handleKey(keyCode); + return true; + } + + @Override + public boolean charTyped (char chr, int modifiers) { + this.modifiers=modifiers; + getGUI().handleChar(chr); + return true; + } + + @Override + public boolean shouldPause() { + return false; + } + + /** + * Get the {@link GUI} to be rendered. + * @return current GUI + */ + protected abstract GUI getGUI(); + + /** + * Get current {@link GUIInterface}. + * @return the current interface + */ + protected abstract GUIInterface getInterface(); + + /** + * Get current scroll speed. + * @return the scroll speed + */ + protected abstract int getScrollSpeed(); + + + /** + * Implementation of {@link GLInterface} to be used with {@link MinecraftGUI} + * @author lukflug + */ + public abstract class GUIInterface extends GLInterface { + /** + * Constructor. + * @param clipX whether to clip in the horizontal direction + */ + public GUIInterface (boolean clipX) { + super(clipX); + } + + @Override + public boolean getModifier (int modifier) { + switch (modifier) { + case SHIFT: + return (modifiers&GLFW.GLFW_MOD_SHIFT)!=0; + case CTRL: + return (modifiers&GLFW.GLFW_MOD_CONTROL)!=0; + case ALT: + return (modifiers&GLFW.GLFW_MOD_ALT)!=0; + case SUPER: + return (modifiers&GLFW.GLFW_MOD_SUPER)!=0; + } + return false; + } + + @Override + public long getTime() { + return lastTime; + } + + @Override + public boolean getButton (int button) { + switch (button) { + case IInterface.LBUTTON: + return lButton; + case IInterface.RBUTTON: + return rButton; + } + return false; + } + + @Override + public Point getMouse() { + return new Point(mouse); + } + + @Override + protected float getZLevel() { + return getZOffset(); + } + + @Override + protected MatrixStack getMatrixStack() { + return matrixStack; + } + } +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftHUDGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftHUDGUI.java new file mode 100644 index 0000000..1380d49 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/MinecraftHUDGUI.java @@ -0,0 +1,73 @@ +package com.lukflug.panelstudio.mc19; + +import org.lwjgl.glfw.GLFW; + +import com.lukflug.panelstudio.container.GUI; +import com.lukflug.panelstudio.hud.HUDGUI; + +/** + * An extension of {@link MinecraftGUI} for HUD editors. + * @author lukflug + */ +public abstract class MinecraftHUDGUI extends MinecraftGUI { + /** + * Whether {@link GUI#enter()} has been called. + */ + private boolean guiOpened=false; + + @Override + public void enterGUI() { + if (!getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.enterGUI(); + } + + @Override + public void exitGUI() { + if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.exitGUI(); + } + + /** + * Open the HUD editor. + */ + public void enterHUDEditor() { + if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); + if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); + super.enterGUI(); + } + + @Override + public void init() { + } + + @Override + public void removed() { + } + + @Override + protected void renderGUI() { + if (!guiOpened) getGUI().enter(); + guiOpened=true; + super.renderGUI(); + } + + /** + * Render function to be called even when the GUI is closed. + */ + public void render() { + if (!getGUI().getGUIVisibility().isOn() && !getGUI().getHUDVisibility().isOn()) renderGUI(); + } + + /** + * Key event function to be called when the GUI is closed. + * @param scancode the key scancode + */ + public void handleKeyEvent (int scancode) { + if (scancode!=GLFW.GLFW_KEY_ESCAPE && !getGUI().getGUIVisibility().isOn() && !getGUI().getGUIVisibility().isOn()) getGUI().handleKey(scancode); + } + + @Override + protected abstract HUDGUI getGUI(); +} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java new file mode 100644 index 0000000..6f70455 --- /dev/null +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java @@ -0,0 +1,6 @@ +/** + * PanelStudio-MC utility functions designed for FabricMC 1.19.x. + * This library only depends on the Fabric Yarn mappings and not on the Fabric Mod Loader or the Fabric API. + * @author lukflug + */ +package com.lukflug.panelstudio.mc19; diff --git a/panelstudio-mc19/src/main/resources/fabric.mod.json b/panelstudio-mc19/src/main/resources/fabric.mod.json index e706d0f..d6c5f22 100644 --- a/panelstudio-mc19/src/main/resources/fabric.mod.json +++ b/panelstudio-mc19/src/main/resources/fabric.mod.json @@ -4,7 +4,7 @@ "version": "${version}", "name": "PanelStudio-MC19", "description": "A supplement to PanelStudio designed for FabricMC 1.19.x.", - "authors": ["lukflug, Marc"], + "authors": ["lukflug, Diliard"], "contact": { "homepage": "https://lukflug.github.io", "sources": "https://github.com/lukflug/PanelStudio" From 40f2f34e797fe70430deb48253269e5a6ece0ee8 Mon Sep 17 00:00:00 2001 From: Diliard <43886528+Diliard@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:55:37 +0200 Subject: [PATCH 04/11] Delete panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17 directory --- .../lukflug/panelstudio/mc17/GLInterface.java | 346 ------------------ .../panelstudio/mc17/MinecraftGUI.java | 223 ----------- .../panelstudio/mc17/MinecraftHUDGUI.java | 73 ---- .../panelstudio/mc17/package-info.java | 6 - 4 files changed, 648 deletions(-) delete mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java delete mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java delete mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java delete mode 100644 panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java deleted file mode 100644 index 2082148..0000000 --- a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/GLInterface.java +++ /dev/null @@ -1,346 +0,0 @@ -package com.lukflug.panelstudio.mc17; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.util.Stack; - -import javax.imageio.ImageIO; - -import org.lwjgl.opengl.GL11; - -import com.lukflug.panelstudio.base.IInterface; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.platform.TextureUtil; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormat.DrawMode; -import net.minecraft.client.render.VertexFormats; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.Matrix4f; - -/** - * Implementation of {@link IInterface} for OpenGL in Minecraft. - * @author lukflug - */ -public abstract class GLInterface implements IInterface { - /** - * Clipping rectangle stack. - */ - private final Stack clipRect=new Stack(); - /** - * Stored projection matrix. - */ - private Matrix4f projection=null; - /** - * Boolean indicating whether to clip in the horizontal direction. - */ - protected boolean clipX; - - /** - * Constructor. - * @param clipX whether to clip in the horizontal direction - */ - public GLInterface (boolean clipX) { - this.clipX=clipX; - } - - @Override - public Dimension getWindowSize() { - return new Dimension((int)Math.ceil(getScreenWidth()),(int)Math.ceil(getScreenHeight())); - } - - @SuppressWarnings("resource") - @Override - public void drawString (Point pos, int height, String s, Color c) { - MatrixStack modelview=RenderSystem.getModelViewStack(); - modelview.push(); - modelview.translate(pos.x,pos.y,0); - float scale=height/(float)MinecraftClient.getInstance().textRenderer.fontHeight; - modelview.scale(scale,scale,1); - RenderSystem.applyModelViewMatrix(); - end(false); - MinecraftClient.getInstance().textRenderer.drawWithShadow(getMatrixStack(),s,0,0,c.getRGB()); - begin(false); - modelview.pop(); - RenderSystem.applyModelViewMatrix(); - } - - @SuppressWarnings("resource") - @Override - public int getFontWidth (int height, String s) { - double scale=height/(double)MinecraftClient.getInstance().textRenderer.fontHeight; - return (int)Math.round(MinecraftClient.getInstance().textRenderer.getWidth(s)*scale); - } - - @Override - public void fillTriangle (Point pos1, Point pos2, Point pos3, Color c1, Color c2, Color c3) { - RenderSystem.setShader(GameRenderer::getPositionColorShader); - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferbuilder = tessellator.getBuffer(); - bufferbuilder.begin(DrawMode.TRIANGLES,VertexFormats.POSITION_COLOR); - bufferbuilder.vertex(pos1.x,pos1.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); - bufferbuilder.vertex(pos2.x,pos2.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); - bufferbuilder.vertex(pos3.x,pos3.y,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); - tessellator.draw(); - } - - @Override - public void drawLine (Point a, Point b, Color c1, Color c2) { - RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader); - float normalx=b.x-a.x,normaly=b.y-a.y; - float scale=(float)Math.sqrt(normalx*normalx+normaly*normaly); - normalx/=scale; - normaly/=scale; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferbuilder = tessellator.getBuffer(); - bufferbuilder.begin(DrawMode.LINES,VertexFormats.LINES); - bufferbuilder.vertex(a.x*256/255f,a.y*256/255f,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).normal(normalx,normaly,0).next(); - bufferbuilder.vertex(b.x*256/255f,b.y*256/255f,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).normal(normalx,normaly,0).next(); - tessellator.draw(); - } - - @Override - public void fillRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { - RenderSystem.setShader(GameRenderer::getPositionColorShader); - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferbuilder = tessellator.getBuffer(); - bufferbuilder.begin(DrawMode.QUADS, VertexFormats.POSITION_COLOR); - bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).next(); - bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).next(); - bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).next(); - bufferbuilder.vertex(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).next(); - tessellator.draw(); - } - - @Override - public void drawRect (Rectangle r, Color c1, Color c2, Color c3, Color c4) { - drawLine(new Point(r.x,r.y+r.height),new Point(r.x+r.width,r.y+r.height),c4,c3); - drawLine(new Point(r.x+r.width,r.y+r.height),new Point(r.x+r.width,r.y),c3,c2); - drawLine(new Point(r.x+r.width,r.y),new Point(r.x,r.y),c2,c1); - drawLine(new Point(r.x,r.y),new Point(r.x,r.y+r.height),c1,c4); - } - - @Override - public synchronized int loadImage (String name) { - try { - Identifier rl=new Identifier(getResourcePrefix()+name); - //InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).getInputStream(); - InputStream stream = MinecraftClient.getInstance().getResourceManager().getResource(rl).get().getInputStream(); - BufferedImage image=ImageIO.read(stream); - int texture=TextureUtil.generateTextureId(); - RenderSystem.bindTextureForSetup(texture); - int width=image.getWidth(),height=image.getHeight(); - IntBuffer buffer=ByteBuffer.allocateDirect(4*width*height).order(ByteOrder.nativeOrder()).asIntBuffer(); - buffer.put(image.getRGB(0,0,width,height,null,0,width)); - buffer.flip(); - TextureUtil.initTexture(buffer,width,height); - return texture; - } catch (IOException e) { - e.printStackTrace(); - return 0; - } - } - - @Override - public void drawImage (Rectangle r, int rotation, boolean parity, int image, Color color) { - if (image==0) return; - int texCoords[][]={{0,1},{1,1},{1,0},{0,0}}; - for (int i=0;ix1 && y2>y1) { - Rectangle rect=new Rectangle(x1,y1,x2-x1,y2-y1); - scissor(rect); - clipRect.push(rect); - } else { - scissor(null); - clipRect.push(null); - } - } - } - } - - @Override - public void restore() { - if (!clipRect.isEmpty()) { - clipRect.pop(); - if (clipRect.isEmpty()) GL11.glDisable(GL11.GL_SCISSOR_TEST); - else scissor(clipRect.peek()); - } - } - - /** - * Utility function to convert screen pixel coordinates to PanelStudio GUI coordinates. - * @param p the screen coordinates - * @return the corresponding GUI coordinates - */ - public Point screenToGui (Point p) { - int resX=getWindowSize().width; - int resY=getWindowSize().height; - return new Point(p.x*resX/MinecraftClient.getInstance().getWindow().getWidth(),resY-p.y*resY/MinecraftClient.getInstance().getWindow().getHeight()-1); - } - - /** - * Utility function to convert PanelStudio GUI coordinates to screen pixel coordinates. - * @param p the GUI coordinates - * @return the corresponding screen coordinates - */ - public Point guiToScreen (Point p) { - double resX=getScreenWidth(); - double resY=getScreenHeight(); - return new Point((int)Math.round(p.x*MinecraftClient.getInstance().getWindow().getWidth()/resX),(int)Math.round((resY-p.y)*MinecraftClient.getInstance().getWindow().getHeight()/resY)); - } - - /** - * Get the current screen width. - * @return the screen width - */ - protected double getScreenWidth() { - return MinecraftClient.getInstance().getWindow().getScaledWidth(); - } - - /** - * Get the current screen height. - * @return the screen height - */ - protected double getScreenHeight() { - return MinecraftClient.getInstance().getWindow().getScaledHeight(); - } - - /** - * Set OpenGL to the state used by the rendering methods. - * Should be called before rendering. - * @param matrix whether to set up the modelview matrix - */ - public void begin (boolean matrix) { - if (matrix) { - projection=RenderSystem.getProjectionMatrix().copy(); - float array[]={2/(float)getScreenWidth(),0,0,-1, 0,-2/(float)getScreenHeight(),0,1, 0,0,-1/3000f,0, 0,0,0,1}; - FloatBuffer buffer=FloatBuffer.allocate(16).put(array).flip(); - RenderSystem.getProjectionMatrix().readRowMajor(buffer); - MatrixStack modelview=RenderSystem.getModelViewStack(); - modelview.push(); - modelview.loadIdentity(); - RenderSystem.applyModelViewMatrix(); - } - RenderSystem.enableBlend(); - RenderSystem.disableTexture(); - RenderSystem.disableCull(); - RenderSystem.lineWidth(2); - RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA,GL11.GL_ONE,GL11.GL_ZERO); - } - - /** - * Restore OpenGL to the state expected by Minecraft. - * Should be called after rendering. - * @param matrix whether to restore the modelview matrix - */ - public void end (boolean matrix) { - RenderSystem.enableCull(); - RenderSystem.enableTexture(); - RenderSystem.disableBlend(); - if (matrix) { - RenderSystem.getModelViewStack().pop(); - RenderSystem.applyModelViewMatrix(); - RenderSystem.getProjectionMatrix().load(projection); - projection=null; - } - } - - /** - * Get the z-coordinate to render everything. - * @return the z-level - */ - protected abstract float getZLevel(); - - /** - * Get the matrix stack to be used. - * @return the current matrix stack - */ - protected abstract MatrixStack getMatrixStack(); - - /** - * Get the Minecraft resource location string. - * @return the resource prefix - */ - protected abstract String getResourcePrefix(); -} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java deleted file mode 100644 index 05b9757..0000000 --- a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftGUI.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.lukflug.panelstudio.mc17; - -import java.awt.Point; - -import net.minecraft.text.Text; -import org.lwjgl.glfw.GLFW; - -import com.lukflug.panelstudio.base.IInterface; -import com.lukflug.panelstudio.container.GUI; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; - -/** - * Implementation of Minecraft's {@link Screen} that renders a PanelStudio GUI. - * @author lukflug - */ -public abstract class MinecraftGUI extends Screen { - /** - * The current mouse position. - */ - private Point mouse=new Point(); - /** - * Current left mouse button state. - */ - private boolean lButton=false; - /** - * Current right mouse button state. - */ - private boolean rButton=false; - /** - * Current GLFW modifier bits. - */ - private int modifiers=0; - /** - * Last rendering time. - */ - private long lastTime; - /** - * Saved matrix stack; - */ - protected MatrixStack matrixStack=null; - - /** - * Constructor. - */ - public MinecraftGUI() { - super(Text.literal("PanelStudio GUI")); - } - - /** - * Displays the GUI. - */ - public void enterGUI() { - MinecraftClient.getInstance().setScreen(this); - } - - /** - * Closes the GUI. - */ - public void exitGUI() { - MinecraftClient.getInstance().setScreen(null); - } - - /** - * Renders the GUI. - */ - protected void renderGUI() { - lastTime=System.currentTimeMillis(); - getInterface().begin(true); - getGUI().render(); - getInterface().end(true); - } - - @Override - public void init() { - getGUI().enter(); - } - - @Override - public void removed() { - getGUI().exit(); - } - - @Override - public void render (MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { - matrixStack=matrices; - mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); - renderGUI(); - } - - @Override - public boolean mouseScrolled (double mouseX, double mouseY, double scroll) { - if (!super.mouseScrolled(mouseX,mouseY,scroll)) { - mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); - if (scroll!=0) { - if (scroll>0) getGUI().handleScroll(-getScrollSpeed()); - else getGUI().handleScroll(getScrollSpeed()); - } - } - return true; - } - - @Override - public boolean mouseClicked (double mouseX, double mouseY, int clickedButton) { - if (!super.mouseReleased(mouseX,mouseY,clickedButton)) { - mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); - switch (clickedButton) { - case IInterface.LBUTTON -> lButton = true; - case IInterface.RBUTTON -> rButton = true; - } - getGUI().handleButton(clickedButton); - } - return true; - } - - @Override - public boolean mouseReleased (double mouseX, double mouseY, int releaseButton) { - if (!super.mouseReleased(mouseX,mouseY,releaseButton)) { - mouse=new Point((int)Math.round(mouseX),(int)Math.round(mouseY)); - switch (releaseButton) { - case IInterface.LBUTTON -> lButton = false; - case IInterface.RBUTTON -> rButton = false; - } - getGUI().handleButton(releaseButton); - } - return true; - } - - @Override - public boolean keyPressed (int keyCode, int scanCode, int modifiers) { - this.modifiers=modifiers; - if (keyCode==GLFW.GLFW_KEY_ESCAPE) exitGUI(); - else getGUI().handleKey(keyCode); - return true; - } - - @Override - public boolean charTyped (char chr, int modifiers) { - this.modifiers=modifiers; - getGUI().handleChar(chr); - return true; - } - - @Override - public boolean shouldPause() { - return false; - } - - /** - * Get the {@link GUI} to be rendered. - * @return current GUI - */ - protected abstract GUI getGUI(); - - /** - * Get current {@link GUIInterface}. - * @return the current interface - */ - protected abstract GUIInterface getInterface(); - - /** - * Get current scroll speed. - * @return the scroll speed - */ - protected abstract int getScrollSpeed(); - - - /** - * Implementation of {@link GLInterface} to be used with {@link MinecraftGUI} - * @author lukflug - */ - public abstract class GUIInterface extends GLInterface { - /** - * Constructor. - * @param clipX whether to clip in the horizontal direction - */ - public GUIInterface (boolean clipX) { - super(clipX); - } - - @Override - public boolean getModifier (int modifier) { - return switch (modifier) { - case SHIFT -> (modifiers & GLFW.GLFW_MOD_SHIFT) != 0; - case CTRL -> (modifiers & GLFW.GLFW_MOD_CONTROL) != 0; - case ALT -> (modifiers & GLFW.GLFW_MOD_ALT) != 0; - case SUPER -> (modifiers & GLFW.GLFW_MOD_SUPER) != 0; - default -> false; - }; - } - - @Override - public long getTime() { - return lastTime; - } - - @Override - public boolean getButton (int button) { - return switch (button) { - case IInterface.LBUTTON -> lButton; - case IInterface.RBUTTON -> rButton; - default -> false; - }; - } - - @Override - public Point getMouse() { - return new Point(mouse); - } - - @Override - protected float getZLevel() { - return getZOffset(); - } - - @Override - protected MatrixStack getMatrixStack() { - return matrixStack; - } - } -} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java deleted file mode 100644 index acc0545..0000000 --- a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/MinecraftHUDGUI.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.lukflug.panelstudio.mc17; - -import org.lwjgl.glfw.GLFW; - -import com.lukflug.panelstudio.container.GUI; -import com.lukflug.panelstudio.hud.HUDGUI; - -/** - * An extension of {@link MinecraftGUI} for HUD editors. - * @author lukflug - */ -public abstract class MinecraftHUDGUI extends MinecraftGUI { - /** - * Whether {@link GUI#enter()} has been called. - */ - private boolean guiOpened=false; - - @Override - public void enterGUI() { - if (!getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); - if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); - super.enterGUI(); - } - - @Override - public void exitGUI() { - if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); - if (getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); - super.exitGUI(); - } - - /** - * Open the HUD editor. - */ - public void enterHUDEditor() { - if (getGUI().getGUIVisibility().isOn()) getGUI().getGUIVisibility().toggle(); - if (!getGUI().getHUDVisibility().isOn()) getGUI().getHUDVisibility().toggle(); - super.enterGUI(); - } - - @Override - public void init() { - } - - @Override - public void removed() { - } - - @Override - protected void renderGUI() { - if (!guiOpened) getGUI().enter(); - guiOpened=true; - super.renderGUI(); - } - - /** - * Render function to be called even when the GUI is closed. - */ - public void render() { - if (!getGUI().getGUIVisibility().isOn() && !getGUI().getHUDVisibility().isOn()) renderGUI(); - } - - /** - * Key event function to be called when the GUI is closed. - * @param scancode the key scancode - */ - public void handleKeyEvent (int scancode) { - if (scancode!=GLFW.GLFW_KEY_ESCAPE && !getGUI().getGUIVisibility().isOn() && !getGUI().getGUIVisibility().isOn()) getGUI().handleKey(scancode); - } - - @Override - protected abstract HUDGUI getGUI(); -} diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java deleted file mode 100644 index 4d9adef..0000000 --- a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc17/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * PanelStudio-MC utility functions designed for FabricMC 1.17.x and 1.18.x. - * This library only depends on the Fabric Yarn mappings and not on the Fabric Mod Loader or the Fabric API. - * @author lukflug - */ -package com.lukflug.panelstudio.mc17; From 7374f32c07f9641c739d327968596cbc3af543a7 Mon Sep 17 00:00:00 2001 From: Diliard <43886528+Diliard@users.noreply.github.com> Date: Sun, 23 Oct 2022 01:21:55 +0200 Subject: [PATCH 05/11] Update and rename mc17.yml to mc19.yml --- .github/workflows/{mc17.yml => mc19.yml} | 5 +++++ 1 file changed, 5 insertions(+) rename .github/workflows/{mc17.yml => mc19.yml} (92%) diff --git a/.github/workflows/mc17.yml b/.github/workflows/mc19.yml similarity index 92% rename from .github/workflows/mc17.yml rename to .github/workflows/mc19.yml index df917b0..6165ea8 100644 --- a/.github/workflows/mc17.yml +++ b/.github/workflows/mc19.yml @@ -42,6 +42,11 @@ jobs: cd example-mod18 chmod +x gradlew ./gradlew build + - name: Build ExampleMod19 + run: | + cd example-mod19 + chmod +x gradlew + ./gradlew build - name: Upload package uses: actions/upload-artifact@v2 with: From 72013504c0e6a9b50d0f212d5c5573920cd6fcd0 Mon Sep 17 00:00:00 2001 From: lukflug Date: Sun, 23 Oct 2022 21:51:27 +0200 Subject: [PATCH 06/11] Added PanelStudio-MC19 CI workflow and fix package author --- .github/workflows/{mc19.yml => mc17.yml} | 7 ++++++- .../java/com/lukflug/panelstudio/mc19/package-info.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) rename .github/workflows/{mc19.yml => mc17.yml} (90%) diff --git a/.github/workflows/mc19.yml b/.github/workflows/mc17.yml similarity index 90% rename from .github/workflows/mc19.yml rename to .github/workflows/mc17.yml index 6165ea8..0ec6e21 100644 --- a/.github/workflows/mc19.yml +++ b/.github/workflows/mc17.yml @@ -27,11 +27,16 @@ jobs: ${{ runner.os }}-gradle- - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build with Gradle + - name: Build PanelStudio-MC17 run: | cd panelstudio-mc17 chmod +x gradlew ./gradlew build + - name: Build PanelStudio-MC19 + run: | + cd panelstudio-mc19 + chmod +x gradlew + ./gradlew build - name: Build ExampleMod17 run: | cd example-mod17 diff --git a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java index 6f70455..2cb68bb 100644 --- a/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java +++ b/panelstudio-mc19/src/main/java/com/lukflug/panelstudio/mc19/package-info.java @@ -1,6 +1,6 @@ /** * PanelStudio-MC utility functions designed for FabricMC 1.19.x. * This library only depends on the Fabric Yarn mappings and not on the Fabric Mod Loader or the Fabric API. - * @author lukflug + * @author lukflug, Diliard */ package com.lukflug.panelstudio.mc19; From 4885ddc44c4fb388c601d8defe9ce3dfc858f75d Mon Sep 17 00:00:00 2001 From: lukflug Date: Mon, 24 Oct 2022 00:16:11 +0200 Subject: [PATCH 07/11] update dependencies to newest version --- LICENSE | 2 +- example-mod16-fabric/gradle.properties | 4 ++-- example-mod16-forge/gradle.properties | 4 ++-- example-mod17/gradle.properties | 6 +++--- example-mod18/build.gradle | 2 +- example-mod18/gradle.properties | 10 +++++----- example-mod19/build.gradle | 2 +- example-mod19/gradle.properties | 8 ++++---- example-mod8-fabric/build.gradle | 2 +- example-mod8-fabric/gradle.properties | 8 ++++---- gradle.properties | 8 ++++---- panelstudio-mc17/gradle.properties | 4 ++-- panelstudio-mc19/build.gradle | 2 +- panelstudio-mc19/gradle.properties | 8 +++----- panelstudio-mc8-fabric/build.gradle | 2 +- 15 files changed, 35 insertions(+), 37 deletions(-) diff --git a/LICENSE b/LICENSE index 3940f8d..10c6417 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020,2021 lukflug +Copyright (c) 2020,2021,2022 lukflug and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/example-mod16-fabric/gradle.properties b/example-mod16-fabric/gradle.properties index 6f51b03..4ee88b4 100644 --- a/example-mod16-fabric/gradle.properties +++ b/example-mod16-fabric/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 versionmc = 0.2.0 -loomVersion = 0.7.34 +loomVersion = 0.7.35 minecraft16fabric = 1.16.5 mappings16fabric = 1.16.5+build.10 -loader16fabric = 0.13.3 +loader16fabric = 0.14.10 api16fabric = 0.42.0+1.16 diff --git a/example-mod16-forge/gradle.properties b/example-mod16-forge/gradle.properties index ab3f0c0..e63b572 100644 --- a/example-mod16-forge/gradle.properties +++ b/example-mod16-forge/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 versionmc = 0.2.0 -forgeGradle5 = 5.1.31 +forgeGradle5 = 5.1.56 mappings16forge = 20210309-1.16.5 -minecraft16forge = 1.16.5-36.2.20 +minecraft16forge = 1.16.5-36.2.34 diff --git a/example-mod17/gradle.properties b/example-mod17/gradle.properties index 243600b..a40aef2 100644 --- a/example-mod17/gradle.properties +++ b/example-mod17/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 -versionmc = 0.2.2 +versionmc = 0.2.3 -loomVersion = 0.12.1 +loomVersion = 1.0.11 minecraft17 = 1.17.1 mappings17 = 1.17.1+build.65 -loader17 = 0.13.3 +loader17 = 0.14.10 api17 = 0.46.1+1.17 diff --git a/example-mod18/build.gradle b/example-mod18/build.gradle index 55fa5e8..bb5d25b 100644 --- a/example-mod18/build.gradle +++ b/example-mod18/build.gradle @@ -51,7 +51,7 @@ processResources { shadowJar { classifier = "dev" configurations = [project.configurations.shadow] - relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2" + relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3" } remapJar { diff --git a/example-mod18/gradle.properties b/example-mod18/gradle.properties index 5d62380..c10cfbb 100644 --- a/example-mod18/gradle.properties +++ b/example-mod18/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 -versionmc = 0.2.2 +versionmc = 0.2.3 -loomVersion = 0.12.1 +loomVersion = 1.0.11 minecraft18 = 1.18.2 -mappings18 = 1.18.2+build.2 -loader18 = 0.13.3 -api18 = 0.47.10+1.18.2 +mappings18 = 1.18.2+build.4 +loader18 = 0.14.10 +api18 = 0.48.0+1.18.2 diff --git a/example-mod19/build.gradle b/example-mod19/build.gradle index d68a39c..53de1bb 100644 --- a/example-mod19/build.gradle +++ b/example-mod19/build.gradle @@ -54,7 +54,7 @@ processResources { shadowJar { classifier = "dev" configurations = [project.configurations.shadow] - relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2" + relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3" } remapJar { diff --git a/example-mod19/gradle.properties b/example-mod19/gradle.properties index 7d1a969..9e37102 100644 --- a/example-mod19/gradle.properties +++ b/example-mod19/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 -versionmc = 0.2.2 +versionmc = 0.2.3 -loomVersion = 1.0-SNAPSHOT +loomVersion = 1.0.11 minecraft19 = 1.19.2 -mappings19 = 1.19.2+build.25 -loader19 = 0.14.9 +mappings19 = 1.19.2+build.28 +loader19 = 0.14.10 api19 = 0.64.0+1.19.2 diff --git a/example-mod8-fabric/build.gradle b/example-mod8-fabric/build.gradle index 40afd68..699bae9 100644 --- a/example-mod8-fabric/build.gradle +++ b/example-mod8-fabric/build.gradle @@ -46,7 +46,7 @@ minecraft { dependencies { minecraft "com.mojang:minecraft:${minecraft8fabric}" - mappings "net.fabricmc:yarn:${mappings8fabric}:v2" + mappings "net.legacyfabric:yarn:${mappings8fabric}:v2" modImplementation "net.fabricmc:fabric-loader:${loader8fabric}" modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${api8fabric}") { exclude module: "fabric-loader-1.8.9" diff --git a/example-mod8-fabric/gradle.properties b/example-mod8-fabric/gradle.properties index 469beeb..dc0f670 100644 --- a/example-mod8-fabric/gradle.properties +++ b/example-mod8-fabric/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 versionmc = 0.2.2 -loomVersion = 0.7.33 +loomVersion = 0.7.35 minecraft8fabric = 1.8.9 -mappings8fabric = 1.8.9+build.202202110257 -loader8fabric = 0.13.3 -api8fabric = 1.2.2+1.8.9 +mappings8fabric = 1.8.9+build.421 +loader8fabric = 0.14.10 +api8fabric = 1.8.0+1.8.9 diff --git a/gradle.properties b/gradle.properties index cac1f56..1a53439 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ org.gradle.jvmargs = -Xmx2500m -version = 0.2.2 +version = 0.2.3 forgeGradle3 = 3.0.195 mappings12 = 39-1.12 minecraft12 = 1.12.2-14.23.5.2859 -loomVersion = 0.7.33 +loomVersion = 0.7.35 minecraft16fabric = 1.16.5 mappings16fabric = 1.16.5+build.10 mappings16forge = 20210309-1.16.5 -minecraft16forge = 1.16.5-36.2.20 +minecraft16forge = 1.16.5-36.2.34 minecraft8fabric = 1.8.9 -mappings8fabric = 1.8.9+build.202202110257 +mappings8fabric = 1.8.9+build.421 forgeGradle2 = 2.1.3 mappings8forge = stable_22 diff --git a/panelstudio-mc17/gradle.properties b/panelstudio-mc17/gradle.properties index 363890c..2a2c8d9 100644 --- a/panelstudio-mc17/gradle.properties +++ b/panelstudio-mc17/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs = -Xmx2500m -version = 0.2.2 +version = 0.2.3 coreVersion = 0.2.1 -loomVersion = 0.12.1 +loomVersion = 1.0.11 minecraft17 = 1.17.1 mappings17 = 1.17.1+build.65 diff --git a/panelstudio-mc19/build.gradle b/panelstudio-mc19/build.gradle index 2387e9c..2aae57f 100644 --- a/panelstudio-mc19/build.gradle +++ b/panelstudio-mc19/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath "net.fabricmc:fabric-loom:${loom19Version}" + classpath "net.fabricmc:fabric-loom:${loomVersion}" } } diff --git a/panelstudio-mc19/gradle.properties b/panelstudio-mc19/gradle.properties index 5ddf578..1af6f98 100644 --- a/panelstudio-mc19/gradle.properties +++ b/panelstudio-mc19/gradle.properties @@ -1,9 +1,7 @@ org.gradle.jvmargs = -Xmx2500m -version = 0.2.2 +version = 0.2.3 coreVersion = 0.2.1 -loom19Version = 1.0-SNAPSHOT - +loomVersion = 1.0.11 minecraft19 = 1.19.2 - -mappings19 = 1.19.2+build.25 \ No newline at end of file +mappings19 = 1.19.2+build.28 diff --git a/panelstudio-mc8-fabric/build.gradle b/panelstudio-mc8-fabric/build.gradle index 2129dca..2a7995f 100644 --- a/panelstudio-mc8-fabric/build.gradle +++ b/panelstudio-mc8-fabric/build.gradle @@ -31,7 +31,7 @@ minecraft { dependencies { minecraft "com.mojang:minecraft:${minecraft8fabric}" - mappings "net.fabricmc:yarn:${mappings8fabric}:v2" + mappings "net.legacyfabric:yarn:${mappings8fabric}:v2" annotationProcessor "org.ow2.asm:asm:9.0" annotationProcessor "org.ow2.asm:asm-analysis:9.0" annotationProcessor "org.ow2.asm:asm-commons:9.0" From 22046ffdeb595f7cc72e3abaf6510c84f7e73b32 Mon Sep 17 00:00:00 2001 From: lukflug Date: Mon, 24 Oct 2022 21:58:36 +0200 Subject: [PATCH 08/11] got everything back to working order --- .github/workflows/gradle.yml | 5 ----- .github/workflows/mc17.yml | 5 +++++ example-mod16-fabric/gradle.properties | 2 +- example-mod17/build.gradle | 2 +- example-mod8-fabric/build.gradle | 9 +++------ example-mod8-fabric/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- panelstudio-mc17/build.gradle | 4 ---- panelstudio-mc17/gradle.properties | 2 ++ panelstudio-mc19/build.gradle | 4 ---- panelstudio-mc19/gradle.properties | 2 ++ 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 00ae35f..2a0fe00 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -44,11 +44,6 @@ jobs: cd example-mod16-forge chmod +x gradlew ./gradlew build - - name: Build ExampleMod8-Fabric - run: | - cd example-mod8-fabric - chmod +x gradlew - ./gradlew build - name: Build ExampleMod8-Forge run: | cd example-mod8-forge diff --git a/.github/workflows/mc17.yml b/.github/workflows/mc17.yml index 0ec6e21..0e7fb12 100644 --- a/.github/workflows/mc17.yml +++ b/.github/workflows/mc17.yml @@ -37,6 +37,11 @@ jobs: cd panelstudio-mc19 chmod +x gradlew ./gradlew build + - name: Build ExampleMod8-Fabric + run: | + cd example-mod8-fabric + chmod +x gradlew + ./gradlew build - name: Build ExampleMod17 run: | cd example-mod17 diff --git a/example-mod16-fabric/gradle.properties b/example-mod16-fabric/gradle.properties index 4ee88b4..015f420 100644 --- a/example-mod16-fabric/gradle.properties +++ b/example-mod16-fabric/gradle.properties @@ -5,5 +5,5 @@ versionmc = 0.2.0 loomVersion = 0.7.35 minecraft16fabric = 1.16.5 mappings16fabric = 1.16.5+build.10 -loader16fabric = 0.14.10 +loader16fabric = 0.13.3 api16fabric = 0.42.0+1.16 diff --git a/example-mod17/build.gradle b/example-mod17/build.gradle index 4975722..079c045 100644 --- a/example-mod17/build.gradle +++ b/example-mod17/build.gradle @@ -51,7 +51,7 @@ processResources { shadowJar { classifier = "dev" configurations = [project.configurations.shadow] - relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2" + relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3" } remapJar { diff --git a/example-mod8-fabric/build.gradle b/example-mod8-fabric/build.gradle index 699bae9..936a93b 100644 --- a/example-mod8-fabric/build.gradle +++ b/example-mod8-fabric/build.gradle @@ -37,11 +37,8 @@ repositories { } } - -minecraft { - intermediaryUrl = { - return "https://maven.legacyfabric.net/net/fabricmc/intermediary/" + it + "/intermediary-" + it + "-v2.jar"; - } +loom { + setIntermediaryUrl("https://maven.legacyfabric.net/net/fabricmc/intermediary/" + it + "/intermediary-" + it + "-v2.jar"); } dependencies { @@ -49,7 +46,7 @@ dependencies { mappings "net.legacyfabric:yarn:${mappings8fabric}:v2" modImplementation "net.fabricmc:fabric-loader:${loader8fabric}" modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${api8fabric}") { - exclude module: "fabric-loader-1.8.9" + exclude module: "legacy-fabric-entity-events-v1" } shadow "com.lukflug:panelstudio:${version}" shadow "com.lukflug:panelstudio-mc8-fabric:${versionmc}" diff --git a/example-mod8-fabric/gradle.properties b/example-mod8-fabric/gradle.properties index dc0f670..5092bd8 100644 --- a/example-mod8-fabric/gradle.properties +++ b/example-mod8-fabric/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2500m version = 0.2.1 versionmc = 0.2.2 -loomVersion = 0.7.35 +loomVersion = 1.0.11 minecraft8fabric = 1.8.9 mappings8fabric = 1.8.9+build.421 loader8fabric = 0.14.10 diff --git a/example-mod8-fabric/gradle/wrapper/gradle-wrapper.properties b/example-mod8-fabric/gradle/wrapper/gradle-wrapper.properties index 69a9715..00e33ed 100644 --- a/example-mod8-fabric/gradle/wrapper/gradle-wrapper.properties +++ b/example-mod8-fabric/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/panelstudio-mc17/build.gradle b/panelstudio-mc17/build.gradle index 4739709..911c43f 100644 --- a/panelstudio-mc17/build.gradle +++ b/panelstudio-mc17/build.gradle @@ -22,10 +22,6 @@ repositories { } } -loom { - remapArchives=false -} - dependencies { minecraft "com.mojang:minecraft:${minecraft17}" mappings "net.fabricmc:yarn:${mappings17}:v2" diff --git a/panelstudio-mc17/gradle.properties b/panelstudio-mc17/gradle.properties index 2a2c8d9..6135a27 100644 --- a/panelstudio-mc17/gradle.properties +++ b/panelstudio-mc17/gradle.properties @@ -5,3 +5,5 @@ coreVersion = 0.2.1 loomVersion = 1.0.11 minecraft17 = 1.17.1 mappings17 = 1.17.1+build.65 + +fabric.loom.dontRemap = true diff --git a/panelstudio-mc19/build.gradle b/panelstudio-mc19/build.gradle index 2aae57f..9c84da4 100644 --- a/panelstudio-mc19/build.gradle +++ b/panelstudio-mc19/build.gradle @@ -22,10 +22,6 @@ repositories { } } -loom { - //remapArchives=false -} - dependencies { minecraft "com.mojang:minecraft:${minecraft19}" mappings "net.fabricmc:yarn:${mappings19}:v2" diff --git a/panelstudio-mc19/gradle.properties b/panelstudio-mc19/gradle.properties index 1af6f98..02c94f6 100644 --- a/panelstudio-mc19/gradle.properties +++ b/panelstudio-mc19/gradle.properties @@ -5,3 +5,5 @@ coreVersion = 0.2.1 loomVersion = 1.0.11 minecraft19 = 1.19.2 mappings19 = 1.19.2+build.28 + +fabric.loom.dontRemap = true From d532786f68401bef476cb2f2e0b472cb193e284c Mon Sep 17 00:00:00 2001 From: lukflug Date: Mon, 24 Oct 2022 22:03:59 +0200 Subject: [PATCH 09/11] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0e57713..f06f28e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ In addition to the core PanelStudio library, there are the PanelStudio-MC suppor | panelstudio-mc8-fabric | example-mod8-fabric | Legacy Fabric 1.8.9 | | panelstudio-mc8-forge | example-mod8-forge | Minecraft Forge 1.8.9 | | panelstudio-mc17 | example-mod17 & example-mod18 | FabricMC 1.17.1 & 1.18.2 | +| panelstudio-mc19 | example-mod19 | FabricMC 1.19.2 | Minecraft versions or APIs not in this table can also be used with PanelStudio, but the small PanelStudio-MC library has to be ported, which shouldn't be hard in most cases. @@ -19,6 +20,7 @@ Minecraft versions or APIs not in this table can also be used with PanelStudio, * Thanks to NirvanaNevermind for making the original port of PanelStudio-MC to Fabric 1.8.9! * Thanks to Go_Hoosiers (aka. GooberTown or IUDevman) for designing the original PanelStudio logo! * Thanks to Chomp for making a pull request to change the readme, I guess. +* Thanks to Diliard for porting PanelStudio-MC to Fabric 1.19.2! ## Features * Everything is flexible and can be extended. From 408d90eafbbc8d275fc3fdf70d7a4a357371ece7 Mon Sep 17 00:00:00 2001 From: lukflug Date: Mon, 24 Oct 2022 22:28:39 +0200 Subject: [PATCH 10/11] fix build.gradle --- example-mod8-fabric/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-mod8-fabric/build.gradle b/example-mod8-fabric/build.gradle index 936a93b..a15915d 100644 --- a/example-mod8-fabric/build.gradle +++ b/example-mod8-fabric/build.gradle @@ -38,7 +38,7 @@ repositories { } loom { - setIntermediaryUrl("https://maven.legacyfabric.net/net/fabricmc/intermediary/" + it + "/intermediary-" + it + "-v2.jar"); + setIntermediaryUrl("https://maven.legacyfabric.net/net/legacyfabric/intermediary/%1$s/intermediary-%1$s-v2.jar"); } dependencies { From 12296c8b8e19fa3b68ee2839924d1ab9cb14186b Mon Sep 17 00:00:00 2001 From: lukflug Date: Mon, 24 Oct 2022 22:34:36 +0200 Subject: [PATCH 11/11] one more build.gradle fix --- example-mod8-fabric/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-mod8-fabric/build.gradle b/example-mod8-fabric/build.gradle index a15915d..92b8f1c 100644 --- a/example-mod8-fabric/build.gradle +++ b/example-mod8-fabric/build.gradle @@ -38,7 +38,7 @@ repositories { } loom { - setIntermediaryUrl("https://maven.legacyfabric.net/net/legacyfabric/intermediary/%1$s/intermediary-%1$s-v2.jar"); + setIntermediaryUrl('https://maven.legacyfabric.net/net/legacyfabric/intermediary/%1$s/intermediary-%1$s-v2.jar'); } dependencies {