commit b7faf329285b83e11fe9aaf0e3658d029bbee214 Author: Sangelo Date: Sun Jun 9 19:03:28 2024 +0200 Initial Commit diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..e2e23a7 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,37 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 21, # Current Java LTS + ] + runs-on: ubuntu-latest + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: "microsoft" + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b5ad31 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# quilt + +run/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2d935a8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Sangelo + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..81acd2b --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# ExploreCraft Tweaks \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..bfe7aed --- /dev/null +++ b/build.gradle @@ -0,0 +1,105 @@ +plugins { + id 'maven-publish' + alias libs.plugins.quilt.loom +} + +base { + archivesName = project.archives_base_name +} + +version = "$project.version+${libs.versions.minecraft.get()}" +group = project.maven_group + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +loom { + // Loom and Loader both use this block in order to gather more information about your mod. + mods { + // This should match your mod id. + "tweaks" { + // Tell Loom about each source set used by your mod here. This ensures that your mod's classes are properly transformed by Loader. + sourceSet("main") + // If you shade (directly include classes, not JiJ) a dependency into your mod, include it here using one of these methods: + // dependency("com.example.shadowedmod:1.2.3") + // configuration("exampleShadedConfigurationName") + } + } +} + +// All the dependencies are declared at gradle/libs.version.toml and referenced with "libs." +// See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. +dependencies { + minecraft libs.minecraft + mappings variantOf(libs.quilt.mappings) { classifier 'intermediary-v2' } + // Replace the above line with the block below if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs + /* + mappings loom.layered { + mappings "org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:intermediary-v2" + officialMojangMappings() + } + */ + modImplementation libs.quilt.loader + + // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. + // Quilted Fabric API will automatically pull in the correct QSL version. + modImplementation libs.quilted.fabric.api + // modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one +} + +processResources { + inputs.properties 'version': version, 'group': project.group + + filesMatching('quilt.mod.json') { + expand 'version': version, 'group': project.group + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() +} + +// If you plan to use a different file for the license, don't forget to change the file name here! +jar { + from('LICENSE.md') { + rename { "${it}_${base.archivesName.get()}" } + } +} + +// Configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d04ba3a --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +# Mod Properties +version = 1.0.0 +maven_group = net.explorecraft +archives_base_name = tweaks + +# Dependencies are managed at gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..3a2c41c --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,24 @@ +# The latest versions are available at https://quiltmc.org/en/usage/latest-versions +[versions] +minecraft = "1.20.1" +quilt_mappings = "1.20.1+build.23" + +quilt_loom = "1.6.8" +quilt_loader = "0.26.0" + +quilted_fabric_api = "7.5.0+0.91.0-1.20.1" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } +quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } + +quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } +quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" } + +# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". +[bundles] +quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"] + +[plugins] +quilt_loom = { id = "org.quiltmc.loom", version.ref = "quilt_loom" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..b82aa23 --- /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.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 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..7101f8e --- /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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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 b/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/net/explorecraft/tweaks/Tweaks.java b/src/main/java/net/explorecraft/tweaks/Tweaks.java new file mode 100644 index 0000000..b3caf99 --- /dev/null +++ b/src/main/java/net/explorecraft/tweaks/Tweaks.java @@ -0,0 +1,22 @@ +package net.explorecraft.tweaks; + +import net.explorecraft.tweaks.item.ModItems; +import net.explorecraft.tweaks.util.ModLootTableModifiers; +import org.quiltmc.loader.api.ModContainer; +import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Tweaks implements ModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger("ExploreCraft: Tweaks"); + public static final String MOD_ID = "explorecraft"; + + @Override + public void onInitialize(ModContainer mod) { + LOGGER.info("[ExploreCraft] Initializing ExploreCraft Tweaks..."); + ModItems.registerItems(); + ModLootTableModifiers.modifyLootTables(); + LOGGER.info("[ExploreCraft] {} was loaded successfully!", mod.metadata().name()); + LOGGER.info("Herobrine has joined the game"); + } +} \ No newline at end of file diff --git a/src/main/java/net/explorecraft/tweaks/item/ModFoodComponents.java b/src/main/java/net/explorecraft/tweaks/item/ModFoodComponents.java new file mode 100644 index 0000000..c09cd8a --- /dev/null +++ b/src/main/java/net/explorecraft/tweaks/item/ModFoodComponents.java @@ -0,0 +1,10 @@ +package net.explorecraft.tweaks.item; + +import net.minecraft.item.FoodComponent; + +public class ModFoodComponents { + public static final FoodComponent RAW_DONUT = new FoodComponent.Builder().hunger(1).saturationModifier(0.25f).snack().build(); + public static final FoodComponent DONUT = new FoodComponent.Builder().hunger(8).saturationModifier(0.6f).build(); + public static final FoodComponent CHOCOLATE_DONUT = new FoodComponent.Builder().hunger(10).saturationModifier(0.8f).build(); + public static final FoodComponent VANILLA_DONUT = new FoodComponent.Builder().hunger(10).saturationModifier(0.8f).build(); +} diff --git a/src/main/java/net/explorecraft/tweaks/item/ModItems.java b/src/main/java/net/explorecraft/tweaks/item/ModItems.java new file mode 100644 index 0000000..c136093 --- /dev/null +++ b/src/main/java/net/explorecraft/tweaks/item/ModItems.java @@ -0,0 +1,84 @@ +package net.explorecraft.tweaks.item; + +import net.explorecraft.tweaks.Tweaks; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.minecraft.item.*; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import net.minecraft.registry.*; +import net.minecraft.util.Rarity; +import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; + +import java.util.List; + +public class ModItems { + + // Smithing Icons + private static final Identifier INGOT_ICON = new Identifier("item/empty_slot_ingot"); + private static final Identifier SWORD_ICON = new Identifier("item/empty_slot_sword"); + private static final Identifier BLOCK_ICON = new Identifier("explorecraft:gui/empty_slot_block"); + + private static List getAdvancedItemIcons() { + return List.of(BLOCK_ICON, SWORD_ICON, INGOT_ICON); + } + + // Items + public static final Item ADVANCED_NETHERITE_UPGRADE = registerItem("advanced_netherite_upgrade", new SmithingTemplateItem( + Text.translatable("smithing.explorecraft.advanced_netherite_upgrade.appliesTo").formatted(Formatting.BLUE), + Text.translatable("smithing.explorecraft.advanced_netherite_upgrade.ingredients").formatted(Formatting.BLUE), + Text.translatable("item.explorecraft.advanced_netherite_upgrade").formatted(Formatting.GRAY), + Text.translatable("smithing.explorecraft.advanced_netherite_upgrade.baseSlot"), + Text.translatable("smithing.explorecraft.advanced_netherite_upgrade.additionsSlot"), + getAdvancedItemIcons(), + getAdvancedItemIcons() + )); + public static final Item DIAMOND_UPGRADE_FRAME = registerItem("diamond_upgrade_frame", new SmithingTemplateItem( + Text.translatable("smithing.explorecraft.diamond_upgrade_frame.appliesTo").formatted(Formatting.BLUE), + Text.translatable("smithing.explorecraft.diamond_upgrade_frame.ingredients").formatted(Formatting.BLUE), + Text.translatable("item.explorecraft.diamond_upgrade_frame").formatted(Formatting.GRAY), + Text.translatable("smithing.explorecraft.diamond_upgrade_frame.baseSlot"), + Text.translatable("smithing.explorecraft.diamond_upgrade_frame.additionsSlot"), + List.of(INGOT_ICON), + List.of(INGOT_ICON) + )); + public static final Item CORE = registerItem("core", new Item(new QuiltItemSettings().fireproof().rarity(Rarity.RARE))); + + // Foods + public static final Item RAW_DONUT = registerItem("raw_donut", new Item(new QuiltItemSettings().food(ModFoodComponents.RAW_DONUT))); + public static final Item DONUT = registerItem("donut", new Item(new QuiltItemSettings().food(ModFoodComponents.DONUT))); + public static final Item CHOCOLATE_DONUT = registerItem("chocolate_donut", new Item(new QuiltItemSettings().food(ModFoodComponents.CHOCOLATE_DONUT))); + public static final Item VANILLA_DONUT = registerItem("vanilla_donut", new Item(new QuiltItemSettings().food(ModFoodComponents.VANILLA_DONUT))); + + // Item Groups + private static final ItemGroup MAIN_ITEM_GROUP = FabricItemGroup.builder() + .icon(() -> new ItemStack(CORE)) + .name(Text.translatable("itemGroup.explorecraft.main_group")) + .entries((context, entries) -> { + entries.addItem(ADVANCED_NETHERITE_UPGRADE); + entries.addItem(DIAMOND_UPGRADE_FRAME); + entries.addItem(CORE); + }) + .build(); + private static final ItemGroup FOOD_ITEM_GROUP = FabricItemGroup.builder() + .icon(() -> new ItemStack(CHOCOLATE_DONUT)) + .name(Text.translatable("itemGroup.explorecraft.food_group")) + .entries((context, entries) -> { + entries.addItem(RAW_DONUT); + entries.addItem(DONUT); + entries.addItem(CHOCOLATE_DONUT); + entries.addItem(VANILLA_DONUT); + }) + .build(); + + // Functions + private static Item registerItem(String name, Item item) { + return Registry.register(Registries.ITEM, new Identifier(Tweaks.MOD_ID, name), item); + } + + public static void registerItems() { + Tweaks.LOGGER.info("[ExploreCraft] Registering mod items..."); + Registry.register(Registries.ITEM_GROUP, new Identifier(Tweaks.MOD_ID, "main_group"), MAIN_ITEM_GROUP); + Registry.register(Registries.ITEM_GROUP, new Identifier(Tweaks.MOD_ID, "food_group"), FOOD_ITEM_GROUP); + } +} diff --git a/src/main/java/net/explorecraft/tweaks/mixin/TitleScreenMixin.java b/src/main/java/net/explorecraft/tweaks/mixin/TitleScreenMixin.java new file mode 100644 index 0000000..19d2a6f --- /dev/null +++ b/src/main/java/net/explorecraft/tweaks/mixin/TitleScreenMixin.java @@ -0,0 +1,16 @@ +package net.explorecraft.tweaks.mixin; + +import net.explorecraft.tweaks.Tweaks; +import net.minecraft.client.gui.screen.TitleScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(TitleScreen.class) +public class TitleScreenMixin { + @Inject(method = "init", at = @At("TAIL")) + public void onInit(CallbackInfo ci) { + Tweaks.LOGGER.info("This line is printed by an example mod mixin!"); + } +} \ No newline at end of file diff --git a/src/main/java/net/explorecraft/tweaks/util/ModLootTableModifiers.java b/src/main/java/net/explorecraft/tweaks/util/ModLootTableModifiers.java new file mode 100644 index 0000000..14dcc39 --- /dev/null +++ b/src/main/java/net/explorecraft/tweaks/util/ModLootTableModifiers.java @@ -0,0 +1,67 @@ +package net.explorecraft.tweaks.util; + +import net.explorecraft.tweaks.Tweaks; +import net.explorecraft.tweaks.item.ModItems; +import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.condition.RandomChanceLootCondition; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.ConstantLootNumberProvider; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; +import net.minecraft.util.Identifier; + +public class ModLootTableModifiers { + + // Loot Tables + private static final Identifier DESERT_PYRAMID_ID = + new Identifier("minecraft", "chests/desert_pyramid"); + private static final Identifier BASTION_TREASURE_ID = + new Identifier("minecraft", "chests/bastion_treasure"); + private static final Identifier BASTION_BRIDGE_ID = + new Identifier("minecraft", "chests/bastion_bridge"); + private static final Identifier STRONGHOLD_LIBRARY_ID = + new Identifier("minecraft", "chests/stronghold_library"); + + public static void modifyLootTables() { + Tweaks.LOGGER.info("[ExploreCraft] Modifying loot tables..."); + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { + if (DESERT_PYRAMID_ID.equals(id)) { + LootPool.Builder poolBuilder = LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(RandomChanceLootCondition.builder(0.1f)) // drops 10% of the time + .with(ItemEntry.builder(ModItems.DIAMOND_UPGRADE_FRAME)) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 1.0f)).build()); + + tableBuilder.pool(poolBuilder.build()); + } + if (BASTION_TREASURE_ID.equals(id)) { + LootPool.Builder poolBuilder = LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(RandomChanceLootCondition.builder(1f)) // drops 100% of the time + .with(ItemEntry.builder(ModItems.DIAMOND_UPGRADE_FRAME)) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 3.0f)).build()); + + tableBuilder.pool(poolBuilder.build()); + } + if (BASTION_BRIDGE_ID.equals(id)) { + LootPool.Builder poolBuilder = LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(RandomChanceLootCondition.builder(0.7f)) // drops 70% of the time + .with(ItemEntry.builder(ModItems.DIAMOND_UPGRADE_FRAME)) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 1.0f)).build()); + + tableBuilder.pool(poolBuilder.build()); + } + if (STRONGHOLD_LIBRARY_ID.equals(id)) { + LootPool.Builder poolBuilder = LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(RandomChanceLootCondition.builder(0.6f)) // drops 60% of the time + .with(ItemEntry.builder(ModItems.DIAMOND_UPGRADE_FRAME)) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 2.0f)).build()); + + tableBuilder.pool(poolBuilder.build()); + } + }); + } +} diff --git a/src/main/resources/assets/explorecraft/icon.png b/src/main/resources/assets/explorecraft/icon.png new file mode 100644 index 0000000..4d3a439 Binary files /dev/null and b/src/main/resources/assets/explorecraft/icon.png differ diff --git a/src/main/resources/assets/explorecraft/lang/en_us.json b/src/main/resources/assets/explorecraft/lang/en_us.json new file mode 100644 index 0000000..01eb049 --- /dev/null +++ b/src/main/resources/assets/explorecraft/lang/en_us.json @@ -0,0 +1,19 @@ +{ + "itemGroup.explorecraft.main_group": "ExploreCraft: Tweaks", + "itemGroup.explorecraft.food_group": "ExploreCraft: Foods", + "item.explorecraft.advanced_netherite_upgrade": "Advanced Netherite Upgrade", + "smithing.explorecraft.advanced_netherite_upgrade.appliesTo": "Modded Items", + "smithing.explorecraft.advanced_netherite_upgrade.ingredients": "Netherite Ingot", + "smithing.explorecraft.advanced_netherite_upgrade.baseSlot": "Insert a Modded Item", + "smithing.explorecraft.advanced_netherite_upgrade.additionsSlot": "Insert a Netherite Ingot", + "item.explorecraft.diamond_upgrade_frame": "Diamond Upgrade Frame", + "smithing.explorecraft.diamond_upgrade_frame.appliesTo": "Netherite Ingot", + "smithing.explorecraft.diamond_upgrade_frame.ingredients": "Gold Ingot", + "smithing.explorecraft.diamond_upgrade_frame.baseSlot": "Insert a Netherite Ingot", + "smithing.explorecraft.diamond_upgrade_frame.additionsSlot": "Insert a Gold Ingot", + "item.explorecraft.raw_donut": "Raw Donut", + "item.explorecraft.donut": "Donut", + "item.explorecraft.chocolate_donut": "Chocolate Donut", + "item.explorecraft.vanilla_donut": "Vanilla Donut", + "item.explorecraft.core": "The Core" +} diff --git a/src/main/resources/assets/explorecraft/models/item/advanced_netherite_upgrade.json b/src/main/resources/assets/explorecraft/models/item/advanced_netherite_upgrade.json new file mode 100644 index 0000000..af69a87 --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/advanced_netherite_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/smithing_templates/advanced_netherite_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/chocolate_donut.json b/src/main/resources/assets/explorecraft/models/item/chocolate_donut.json new file mode 100644 index 0000000..184e857 --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/chocolate_donut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/foods/chocolate_donut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/core.json b/src/main/resources/assets/explorecraft/models/item/core.json new file mode 100644 index 0000000..9a2e24e --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/core" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/diamond_upgrade_frame.json b/src/main/resources/assets/explorecraft/models/item/diamond_upgrade_frame.json new file mode 100644 index 0000000..bbb9b81 --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/diamond_upgrade_frame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/smithing_templates/diamond_upgrade_frame" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/donut.json b/src/main/resources/assets/explorecraft/models/item/donut.json new file mode 100644 index 0000000..f9cc85a --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/donut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/foods/donut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/raw_donut.json b/src/main/resources/assets/explorecraft/models/item/raw_donut.json new file mode 100644 index 0000000..543cb3b --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/raw_donut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/foods/raw_donut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/models/item/vanilla_donut.json b/src/main/resources/assets/explorecraft/models/item/vanilla_donut.json new file mode 100644 index 0000000..949f32f --- /dev/null +++ b/src/main/resources/assets/explorecraft/models/item/vanilla_donut.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "explorecraft:item/foods/vanilla_donut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/explorecraft/textures/gui/empty_slot_block.png b/src/main/resources/assets/explorecraft/textures/gui/empty_slot_block.png new file mode 100644 index 0000000..cf2b8f0 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/gui/empty_slot_block.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/core.png b/src/main/resources/assets/explorecraft/textures/item/core.png new file mode 100644 index 0000000..e40a1d0 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/core.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/empty_slot_block.png~ b/src/main/resources/assets/explorecraft/textures/item/empty_slot_block.png~ new file mode 100644 index 0000000..70b215d Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/empty_slot_block.png~ differ diff --git a/src/main/resources/assets/explorecraft/textures/item/foods/chocolate_donut.png b/src/main/resources/assets/explorecraft/textures/item/foods/chocolate_donut.png new file mode 100644 index 0000000..23aeaa1 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/foods/chocolate_donut.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/foods/donut.png b/src/main/resources/assets/explorecraft/textures/item/foods/donut.png new file mode 100644 index 0000000..7a213fe Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/foods/donut.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/foods/raw_donut.png b/src/main/resources/assets/explorecraft/textures/item/foods/raw_donut.png new file mode 100644 index 0000000..7900072 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/foods/raw_donut.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/foods/vanilla_donut.png b/src/main/resources/assets/explorecraft/textures/item/foods/vanilla_donut.png new file mode 100644 index 0000000..81a3c55 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/foods/vanilla_donut.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/smithing_templates/advanced_netherite_upgrade.png b/src/main/resources/assets/explorecraft/textures/item/smithing_templates/advanced_netherite_upgrade.png new file mode 100644 index 0000000..1e4fb49 Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/smithing_templates/advanced_netherite_upgrade.png differ diff --git a/src/main/resources/assets/explorecraft/textures/item/smithing_templates/diamond_upgrade_frame.png b/src/main/resources/assets/explorecraft/textures/item/smithing_templates/diamond_upgrade_frame.png new file mode 100644 index 0000000..65642ec Binary files /dev/null and b/src/main/resources/assets/explorecraft/textures/item/smithing_templates/diamond_upgrade_frame.png differ diff --git a/src/main/resources/data/explorecraft/recipes/advanced_netherite_upgrade.json b/src/main/resources/data/explorecraft/recipes/advanced_netherite_upgrade.json new file mode 100644 index 0000000..21337fc --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/advanced_netherite_upgrade.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:smithing_transform", + "base": { + "item": "minecraft:netherite_ingot" + }, + "template": { + "item": "explorecraft:diamond_upgrade_frame" + }, + "addition": { + "item": "minecraft:gold_ingot" + }, + "result": { + "item": "explorecraft:advanced_netherite_upgrade", + "count": 1 + } +} diff --git a/src/main/resources/data/explorecraft/recipes/chocolate_donut.json b/src/main/resources/data/explorecraft/recipes/chocolate_donut.json new file mode 100644 index 0000000..b52e3db --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/chocolate_donut.json @@ -0,0 +1,24 @@ +{ + "type": "create:mixing", + "ingredients": [ + { + "item": "explorecraft:donut" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "amount": 5063, + "fluid": "create_dd:hot_chocolate" + } + ], + "results": [ + { + "amount": 1, + "item": "explorecraft:chocolate_donut" + } + ] +} diff --git a/src/main/resources/data/explorecraft/recipes/diamond_upgrade_frame.json b/src/main/resources/data/explorecraft/recipes/diamond_upgrade_frame.json new file mode 100644 index 0000000..9f8ce3a --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/diamond_upgrade_frame.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "dTd", + "dDd", + "ddd" + ], + "key": { + "D": { + "item": "minecraft:diamond_block" + }, + + "d": { + "item": "minecraft:diamond" + }, + + "T": { + "item": "explorecraft:diamond_upgrade_frame" + } + }, + "result": { + "item": "explorecraft:diamond_upgrade_frame", + "count": 2 + } +} diff --git a/src/main/resources/data/explorecraft/recipes/donut_from_furnace.json b/src/main/resources/data/explorecraft/recipes/donut_from_furnace.json new file mode 100644 index 0000000..a163c7c --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/donut_from_furnace.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "explorecraft:raw_donut" + }, + "result": "explorecraft:donut", + "experience": 0.1, + "cookingtime": 200 +} diff --git a/src/main/resources/data/explorecraft/recipes/donut_from_smoking.json b/src/main/resources/data/explorecraft/recipes/donut_from_smoking.json new file mode 100644 index 0000000..a1a7825 --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/donut_from_smoking.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smoking", + "ingredient": { + "item": "explorecraft:raw_donut" + }, + "result": "explorecraft:donut", + "experience": 0.1, + "cookingtime": 100 +} diff --git a/src/main/resources/data/explorecraft/recipes/raw_donut.json b/src/main/resources/data/explorecraft/recipes/raw_donut.json new file mode 100644 index 0000000..ef310ce --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/raw_donut.json @@ -0,0 +1,27 @@ +{ + "type": "create:mixing", + "ingredients": [ + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:wheat" + }, + { + "item": "minecraft:wheat" + }, + { + "item": "minecraft:egg" + }, + { + "amount": 5063, + "fluidTag": "c:milk" + } + ], + "results": [ + { + "amount": 1, + "item": "explorecraft:raw_donut" + } + ] +} diff --git a/src/main/resources/data/explorecraft/recipes/vanilla_donut.json b/src/main/resources/data/explorecraft/recipes/vanilla_donut.json new file mode 100644 index 0000000..10989d4 --- /dev/null +++ b/src/main/resources/data/explorecraft/recipes/vanilla_donut.json @@ -0,0 +1,24 @@ +{ + "type": "create:mixing", + "ingredients": [ + { + "item": "explorecraft:donut" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "amount": 5063, + "fluid": "create_dd:vanilla" + } + ], + "results": [ + { + "amount": 1, + "item": "explorecraft:vanilla_donut" + } + ] +} diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json new file mode 100644 index 0000000..1a7287b --- /dev/null +++ b/src/main/resources/quilt.mod.json @@ -0,0 +1,40 @@ +{ + "schema_version": 1, + "quilt_loader": { + "group": "${group}", + "id": "explorecraft", + "version": "${version}", + "metadata": { + "name": "ExploreCraft: Tweaks", + "description": "A collection of tweaks and additions for the ExploreCraft Modpack", + "contributors": { + "Sangelo": "Developer" + }, + "contact": { + "homepage": "https://explorecraft.net/", + "sources": "https://gitpot.org/ExploreCraft/tweaks", + "issues": "https://gitpot.org/ExploreCraft/tweaks/issues" + }, + "icon": "assets/explorecraft/icon.png" + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "entrypoints": { + "init": "net.explorecraft.tweaks.Tweaks" + }, + "depends": [ + { + "id": "quilt_loader", + "versions": ">=0.19.1" + }, + { + "id": "quilted_fabric_api", + "versions": ">=7.0.2" + }, + { + "id": "minecraft", + "versions": ">=1.20" + } + ] + }, + "mixin": "tweaks.mixins.json" +} \ No newline at end of file diff --git a/src/main/resources/tweaks.mixins.json b/src/main/resources/tweaks.mixins.json new file mode 100644 index 0000000..e84cb1f --- /dev/null +++ b/src/main/resources/tweaks.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "net.explorecraft.tweaks.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [], + "client": [ + "TitleScreenMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file