From 0e5bf79b8093d82c5d4cd7587abaa2bf41fd1ffa Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Sat, 27 Jan 2024 08:36:24 +0200 Subject: Initial commit: secret doors are displayed as bookshelves by WTHIT --- .gitignore | 34 +++ build.gradle.kts | 104 +++++++++ gradle.properties | 16 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++++++++++ gradlew.bat | 92 ++++++++ settings.gradle.kts | 33 +++ .../mc/eriscraft_misc/SecretDoorWailaPlugin.java | 35 +++ src/main/resources/quilt.mod.json | 24 ++ src/main/resources/waila_plugins.json | 7 + 11 files changed, 601 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/lv/enes/mc/eriscraft_misc/SecretDoorWailaPlugin.java create mode 100644 src/main/resources/quilt.mod.json create mode 100644 src/main/resources/waila_plugins.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..32968af --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +remappedSrc/ +run/ + +# Eclipse +*.launch + +# IDEA +.idea/ +*.iml +*.ipr +*.iws + +# Fleet +.fleet/ + +# VS Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..81b16a8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,104 @@ +plugins { + `maven-publish` + id("org.quiltmc.loom") +} + +val groupid: String by project +val jakartaAnnotationVersion: String by project +val loaderVersion: String by project +val modid: String by project +val modVersion: String by project +val minecraftVersion: String by project +val quiltMappings: String by project +val wthitVersion: String by project + +group = groupid +version = modVersion + +repositories { + maven { + // For WTHIT + url = uri("https://maven2.bai.lol") + content { + includeGroup("lol.bai") + includeGroup("mcp.mobius.waila") + } + } +} + +loom { + mods { + register(modid) { + sourceSet("main") + } + } +} + +dependencies { + minecraft("com.mojang:minecraft:${minecraftVersion}") + mappings(loom.layered { + mappings("org.quiltmc:quilt-mappings:${minecraftVersion}+build.${quiltMappings}:intermediary-v2") + officialMojangMappings() + }) + modImplementation("org.quiltmc:quilt-loader:${loaderVersion}") + + modCompileOnly("mcp.mobius.waila:wthit-api:quilt-${wthitVersion}") + + compileOnly("jakarta.annotation:jakarta.annotation-api:${jakartaAnnotationVersion}") +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } + + withJavadocJar() + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } + + repositories { + maven { + url = uri("https://mvn.enes.lv/") + credentials { + username = (findProperty("mvnUsername") ?: System.getenv("MVN_USERNAME")).toString() + password = (findProperty("mvnPassword") ?: System.getenv("MVN_PASSWORD")).toString() + } + } + } +} + +tasks.processResources { + inputs.property("loader_version", loaderVersion) + inputs.property("minecraft_version", minecraftVersion) + inputs.property("version", version) + + filesMatching("quilt.mod.json") { + expand( + "loader_version" to loaderVersion, + "minecraft_version" to minecraftVersion, + "version" to version + ) + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + options.release = 17 +} + +tasks.javadoc { + (options as StandardJavadocDocletOptions).addBooleanOption("html5", true) +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${name}" } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f8402b4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,16 @@ +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +groupid = lv.enes.mc +modid = eriscraft_misc +modVersion = 1.0 + +loomPluginVersion = 1.4.1 + +minecraftVersion = 1.20.1 +quiltMappings = 23 +loaderVersion = 0.23.0 + +wthitVersion = 8.5.0 + +jakartaAnnotationVersion = 3.0.0-M1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c3a3536 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,33 @@ +pluginManagement { + repositories { + maven { + name = "Quilt" + url = uri("https://maven.quiltmc.org/repository/release") + content { + includeGroup("org.quiltmc") + includeGroup("org.quiltmc.loom") + includeGroup("org.quiltmc.parsers") + } + } + + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + content { + includeGroup("net.fabricmc") + } + } + + gradlePluginPortal() + } + + val loomPluginVersion: String by settings + plugins { + id("org.quiltmc.loom") version loomPluginVersion + } +} + +val modid: String by settings +val minecraftVersion: String by settings + +rootProject.name = "${modid}-mc${minecraftVersion}" \ No newline at end of file diff --git a/src/main/java/lv/enes/mc/eriscraft_misc/SecretDoorWailaPlugin.java b/src/main/java/lv/enes/mc/eriscraft_misc/SecretDoorWailaPlugin.java new file mode 100644 index 0000000..f4aaca9 --- /dev/null +++ b/src/main/java/lv/enes/mc/eriscraft_misc/SecretDoorWailaPlugin.java @@ -0,0 +1,35 @@ +package lv.enes.mc.eriscraft_misc; + +import mcp.mobius.waila.api.*; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.DoorBlock; +import net.minecraft.world.level.block.state.BlockState; + +/** When looking at secret doors as provided by the chipped mod, we say it's a bookshelf :3 + *

+ * TODO: Currently only secret oak doors are considered */ +@SuppressWarnings("unused") +public class SecretDoorWailaPlugin implements IWailaPlugin { + @Override + public void register(IRegistrar registrar) { + registrar.addOverride(Overrider.INSTANCE, DoorBlock.class); + System.out.println("Hello, World!"); + } + + private enum Overrider implements IBlockComponentProvider { + INSTANCE; + + @Override + public BlockState getOverride(IBlockAccessor accessor, IPluginConfig config) { + var id = BuiltInRegistries.BLOCK.getKey(accessor.getBlock()); + // TODO: Somehow get the full list from chipped? + if (id.equals(new ResourceLocation("chipped", "secret_oak_door"))) { + return Blocks.BOOKSHELF.defaultBlockState(); + } else { + return accessor.getBlockState(); + } + } + } +} diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json new file mode 100644 index 0000000..c2ec5a6 --- /dev/null +++ b/src/main/resources/quilt.mod.json @@ -0,0 +1,24 @@ +{ + "schema_version": 1, + "quilt_loader": { + "group": "lv.enes.mc", + "id": "eriscraft_misc", + "version": "${version}", + "metadata": { + "name": "ErisCraft Miscellany", + "description": "Miscellaneous things for my modpack :3", + "contributors": { + "Eris": "Owner" + } + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "entrypoints": {}, + "depends": [{ + "id": "quilt_loader", + "versions": "^${loader_version}" + }, { + "id": "minecraft", + "versions": "=${minecraft_version}" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/waila_plugins.json b/src/main/resources/waila_plugins.json new file mode 100644 index 0000000..2dafe26 --- /dev/null +++ b/src/main/resources/waila_plugins.json @@ -0,0 +1,7 @@ +{ + "eris_alchemy:secret_doors": { + "initializer": "lv.enes.mc.eriscraft_misc.SecretDoorWailaPlugin", + "side": "*", + "required": [] + } +} \ No newline at end of file -- cgit v1.2.3