diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..f836c58 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,41 @@ +# 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: [ + 17, # Current Java LTS & minimum supported by Minecraft + 21, # Current Java LTS + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12f8644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..b8b5085 --- /dev/null +++ b/LICENSE @@ -0,0 +1,380 @@ +Copyright (c) 2023 Hiiragi283 + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4322dca --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,104 @@ +import java.text.SimpleDateFormat +import java.util.Date + +plugins { + alias(libs.plugins.forge.gradle) +} + +group = libs.versions.mod.group.get() +version = libs.versions.mod.version.get() +base.archivesName = libs.versions.mod.name.get() + +println( + "Java: ${System.getProperty("java.version")}, " + + "JVM: ${System.getProperty("java.vm.version")} (${System.getProperty("java.vendor")}), " + + "Arch: ${System.getProperty("os.arch")}" +) +minecraft { + mappings(libs.versions.mappings.channel, libs.versions.mappings.version) + copyIdeResources = true + + runs { + configureEach { + workingDirectory(project.file("run")) + + property("forge.logging.markers", "REGISTRIES") + property("forge.logging.console.level", "debug") + property("forge.enabledGameTestNamespaces", libs.versions.mod.id.get()) + + mods { + create(libs.versions.mod.id.get()) { + source(sourceSets.main.get()) + } + } + } + + create("client") { + + } + + create("server") { + args("--nogui") + } + } +} + +repositories { + maven(url = "https://dvs1.progwml6.com/files/maven/") +} + +dependencies { + minecraft(libs.minecraft) + compileOnly("org.jetbrains:annotations:24.1.+") + runtimeOnly(fg.deobf("mezz.jei:jei-1.16.5:7.7.1.153")) +} + +tasks { + processResources.configure { + val propertiesMap: Map = hashMapOf( + "forge_version" to libs.versions.forge.asProvider(), + "forge_version_range" to libs.versions.forge.range, + "loader_version_range" to libs.versions.loader.range, + "minecraft_version" to libs.versions.mc.asProvider(), + "minecraft_version_range" to libs.versions.mc.range, + "mod_authors" to libs.versions.mod.authors, + "mod_description" to libs.versions.mod.description, + "mod_id" to libs.versions.mod.id, + "mod_license" to libs.versions.mod.license, + "mod_name" to libs.versions.mod.name, + "mod_version" to libs.versions.mod.version + ).mapValues { it.value.get() } + inputs.properties(propertiesMap) + filesMatching(listOf("META-INF/mods.toml", "pack.mcmeta")) { + expand(buildMap { + putAll(propertiesMap) + put("project", project) + }) + } + } + + jar.configure { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } + + manifest { + attributes( + hashMapOf( + "Specification-Title" to libs.versions.mod.id.get(), + "Specification-Vendor" to libs.versions.mod.authors.get(), + "Specification-Version" to "1", + "Implementation-Title" to project.name, + "Implementation-Version" to archiveVersion.get(), + "Implementation-Vendor" to libs.versions.mod.authors.get(), + "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()) + ) + ) + } + finalizedBy("reobfJar") + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f237dcf --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..ac83bb5 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +[versions] +forge = "36.2.34" +forge-gradle = "6.+" +forge-range = "[36,)" +loader-range = "[36,)" +mappings-channel = "official" +mappings-version = "1.16.5" +mc = "1.16.5" +mc-forge = "1.16.5-36.2.34" +mc-range = "[1.16,1.17)" +mod-authors = "Hiiragi283" +mod-description = "Add new Smithing Recipe format applying enchantment" +mod-group = "io.github.hiiragi283.enchsmith" +mod-id = "enchanting_smith" +mod-license = "MPL-2.0" +mod-name = "Enchanting Smith" +mod-version = "1.0.0+forge1.16.5" + +[libraries] +minecraft = { group = "net.minecraftforge", name = "forge", version.ref = "mc-forge" } + +[bundles] + +[plugins] +forge-gradle = { id = "net.minecraftforge.gradle", version.ref = "forge-gradle" } \ 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..7f93135 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..3fa8f86 --- /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.4-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..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 b/settings.gradle new file mode 100644 index 0000000..93f1b80 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' +} \ No newline at end of file diff --git a/src/main/java/io/github/hiiragi283/enchsmith/EnchantingSmith.java b/src/main/java/io/github/hiiragi283/enchsmith/EnchantingSmith.java new file mode 100644 index 0000000..778c2c8 --- /dev/null +++ b/src/main/java/io/github/hiiragi283/enchsmith/EnchantingSmith.java @@ -0,0 +1,29 @@ +package io.github.hiiragi283.enchsmith; + +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +@Mod(EnchantingSmith.MOD_ID) +public final class EnchantingSmith { + + @NotNull + public static final String MOD_ID = "enchanting_smith"; + @NotNull + public static final String MOD_NAME = "Enchanting Smith"; + @NotNull + private static final Logger logger = LogManager.getLogger(MOD_NAME); + + public EnchantingSmith() { + FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(IRecipeSerializer.class, this::onRegister); + } + + private void onRegister(RegistryEvent.Register> event) { + event.getRegistry().register(UpgradeSmithingRecipe.Serializer.INSTANCE); + logger.info("[{}] Initialized!", MOD_NAME); + } +} \ No newline at end of file diff --git a/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipe.java b/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipe.java new file mode 100644 index 0000000..852ed9b --- /dev/null +++ b/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipe.java @@ -0,0 +1,137 @@ +package io.github.hiiragi283.enchsmith; + +import com.google.gson.JsonObject; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentData; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.EnchantmentType; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.EnchantedBookItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.SmithingRecipe; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.NotNull; + +import java.util.Map; +import java.util.Objects; +import java.util.stream.StreamSupport; + +public final class UpgradeSmithingRecipe extends SmithingRecipe { + + @NotNull + public final EnchantmentType target; + @NotNull + public final Ingredient upgrade; + @NotNull + public final Enchantment enchantment; + + @NotNull + private static Ingredient convertInput(@NotNull EnchantmentType target) { + return Ingredient.of(StreamSupport.stream(ForgeRegistries.ITEMS.spliterator(), false) + .filter(target::canEnchant) + .map(Item::getDefaultInstance)); + } + + public UpgradeSmithingRecipe(@NotNull ResourceLocation location, @NotNull EnchantmentType target, @NotNull Ingredient upgrade, @NotNull Enchantment enchantment) { + super(location, convertInput(target), upgrade, ItemStack.EMPTY); + this.target = target; + this.upgrade = upgrade; + this.enchantment = enchantment; + } + + // Do not over max enchant level + @Override + public boolean matches(@NotNull IInventory inventory, @NotNull World world) { + return target.canEnchant(inventory.getItem(0).getItem()) + && upgrade.test(inventory.getItem(1)) + && EnchantmentHelper.getItemEnchantmentLevel(enchantment, inventory.getItem(0)) < enchantment.getMaxLevel(); + } + + // Set enchant or add enchant level if present + @NotNull + @Override + public ItemStack assemble(@NotNull IInventory inventory) { + ItemStack result = inventory.getItem(0).copy(); + Map enchantMap = EnchantmentHelper.getEnchantments(result); + enchantMap.compute(enchantment, (ench, oldLevel) -> (oldLevel == null ? 0 : oldLevel) + 1); + EnchantmentHelper.setEnchantments(enchantMap, result); + return result; + } + + // Display enchanted book as dummy result + @NotNull + @Override + public ItemStack getResultItem() { + return EnchantedBookItem.createForEnchantment(new EnchantmentData(enchantment, 1)); + } + + // Serializer // + + public enum Serializer implements IRecipeSerializer { + INSTANCE; + + @NotNull + @Override + public UpgradeSmithingRecipe fromJson(@NotNull ResourceLocation location, @NotNull JsonObject json) { + EnchantmentType target = EnchantmentType.valueOf(JSONUtils.getAsString(json, "target")); + Ingredient upgrade = Ingredient.fromJson(JSONUtils.getAsJsonObject(json, "upgrade")); + ResourceLocation enchantmentId = new ResourceLocation(JSONUtils.getAsString(json, "enchantment")); + if (!ForgeRegistries.ENCHANTMENTS.containsKey(enchantmentId)) { + throw new IllegalStateException("Could not found enchantment; " + enchantmentId); + } + Enchantment enchantment = ForgeRegistries.ENCHANTMENTS.getValue(enchantmentId); + return new UpgradeSmithingRecipe(location, target, upgrade, Objects.requireNonNull(enchantment)); + } + + @NotNull + @Override + public UpgradeSmithingRecipe fromNetwork(@NotNull ResourceLocation location, @NotNull PacketBuffer buf) { + EnchantmentType target = EnchantmentType.valueOf(buf.readUtf()); + Ingredient upgrade = Ingredient.fromNetwork(buf); + ResourceLocation enchantmentLocation = new ResourceLocation(buf.readUtf()); + Enchantment enchantment = ForgeRegistries.ENCHANTMENTS.getValue(enchantmentLocation); + if (enchantment == null) { + throw new IllegalStateException("Could not found enchantment; " + enchantmentLocation); + } + return new UpgradeSmithingRecipe(location, target, upgrade, enchantment); + } + + @Override + public void toNetwork(@NotNull PacketBuffer buf, @NotNull UpgradeSmithingRecipe recipe) { + buf.writeUtf(recipe.target.name()); + recipe.upgrade.toNetwork(buf); + buf.writeUtf(Objects.requireNonNull(recipe.enchantment.getRegistryName()).toString()); + } + + @NotNull + @Override + public IRecipeSerializer setRegistryName(ResourceLocation name) { + return this; + } + + @NotNull + @Override + public ResourceLocation getRegistryName() { + return new ResourceLocation(EnchantingSmith.MOD_ID, "upgrade"); + } + + @NotNull + @SuppressWarnings("unchecked") + private Class castClass() { + return (Class) Serializer.class; + } + + @NotNull + @Override + public Class> getRegistryType() { + return castClass(); + } + } +} \ No newline at end of file diff --git a/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipeBuilder.java b/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipeBuilder.java new file mode 100644 index 0000000..e088bdd --- /dev/null +++ b/src/main/java/io/github/hiiragi283/enchsmith/UpgradeSmithingRecipeBuilder.java @@ -0,0 +1,108 @@ +package io.github.hiiragi283.enchsmith; + +import com.google.gson.JsonObject; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.ICriterionInstance; +import net.minecraft.advancements.IRequirementsStrategy; +import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentType; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Consumer; + +public final class UpgradeSmithingRecipeBuilder { + + @NotNull + private final EnchantmentType target; + @NotNull + private final Ingredient upgrade; + @NotNull + private final Enchantment enchantment; + + public UpgradeSmithingRecipeBuilder(@NotNull EnchantmentType target, @NotNull Ingredient upgrade, @NotNull Enchantment enchantment) { + this.target = target; + this.upgrade = upgrade; + this.enchantment = enchantment; + } + + @NotNull + private final Advancement.Builder builder = Advancement.Builder.advancement(); + + @NotNull + public UpgradeSmithingRecipeBuilder unlocks(@NotNull String name, @NotNull ICriterionInstance criterionInstance) { + builder.addCriterion(name, criterionInstance); + return this; + } + + public void offerTo(@NotNull Consumer exporter, @NotNull ResourceLocation recipeLocation) { + builder.parent(new ResourceLocation("recipes/root")) + .addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(recipeLocation)) + .rewards(AdvancementRewards.Builder.recipe(recipeLocation)) + .requirements(IRequirementsStrategy.OR); + exporter.accept(new Provider(recipeLocation, target, upgrade, enchantment, builder.serializeToJson())); + } + + public static final class Provider implements IFinishedRecipe { + + @NotNull + private final ResourceLocation recipeLocation; + @NotNull + private final EnchantmentType target; + @NotNull + private final Ingredient upgrade; + @NotNull + private final Enchantment enchantment; + @NotNull + private final JsonObject advancement; + @NotNull + private final ResourceLocation advancementId; + + public Provider(@NotNull ResourceLocation recipeLocation, @NotNull EnchantmentType target, @NotNull Ingredient upgrade, @NotNull Enchantment enchantment, @NotNull JsonObject advancement) { + this.recipeLocation = recipeLocation; + this.target = target; + this.upgrade = upgrade; + this.enchantment = enchantment; + this.advancement = advancement; + this.advancementId = new ResourceLocation(recipeLocation.getNamespace(), "recipes/" + recipeLocation.getPath()); + } + + @Override + public void serializeRecipeData(@NotNull JsonObject json) { + json.addProperty("target", target.name()); + json.add("upgrade", upgrade.toJson()); + ResourceLocation enchantmentLocation = enchantment.getRegistryName(); + String enchantmentName = enchantmentLocation == null ? "null" : enchantmentLocation.toString(); + json.addProperty("enchantment", enchantmentName); + } + + @NotNull + @Override + public ResourceLocation getId() { + return recipeLocation; + } + + @NotNull + @Override + public IRecipeSerializer getType() { + return UpgradeSmithingRecipe.Serializer.INSTANCE; + } + + @NotNull + @Override + public JsonObject serializeAdvancement() { + return advancement; + } + + @NotNull + @Override + public ResourceLocation getAdvancementId() { + return advancementId; + } + } +} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..8cf3e73 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,64 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors="${mod_authors}" #optional +# Display Test controls the display for your mod in the server connection screen +# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. +# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. +# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. +# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. +# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. +#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) + +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.${mod_id}]] #optional +# the modid of the dependency +modId="forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory=true #mandatory +# The version range of the dependency +versionRange="${forge_version_range}" #mandatory +# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering="NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side="BOTH" +# Here's another dependency +[[dependencies.${mod_id}]] +modId="minecraft" +mandatory=true +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" diff --git a/src/main/resources/data/enchanting_smith/recipes/aqua_affinity.json b/src/main/resources/data/enchanting_smith/recipes/aqua_affinity.json new file mode 100644 index 0000000..9f08998 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/aqua_affinity.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR_HEAD", + "upgrade": { + "item": "minecraft:heart_of_the_sea" + }, + "enchantment": "minecraft:aqua_affinity" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/bane_of_arthropods.json b/src/main/resources/data/enchanting_smith/recipes/bane_of_arthropods.json new file mode 100644 index 0000000..568f878 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/bane_of_arthropods.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:pufferfish" + }, + "enchantment": "minecraft:bane_of_arthropods" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/blast_protection.json b/src/main/resources/data/enchanting_smith/recipes/blast_protection.json new file mode 100644 index 0000000..cdf3c35 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/blast_protection.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR", + "upgrade": { + "item": "minecraft:obsidian" + }, + "enchantment": "minecraft:blast_protection" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/channeling.json b/src/main/resources/data/enchanting_smith/recipes/channeling.json new file mode 100644 index 0000000..a0bc8d0 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/channeling.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "TRIDENT", + "upgrade": { + "tag": "minecraft:blaze_rod" + }, + "enchantment": "minecraft:channeling" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/depth_strider.json b/src/main/resources/data/enchanting_smith/recipes/depth_strider.json new file mode 100644 index 0000000..61f5373 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/depth_strider.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR_FEET", + "upgrade": { + "item": "minecraft:nautilus_shell" + }, + "enchantment": "minecraft:depth_strider" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/efficiency.json b/src/main/resources/data/enchanting_smith/recipes/efficiency.json new file mode 100644 index 0000000..39bc0a5 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/efficiency.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "DIGGER", + "upgrade": { + "tag": "minecraft:redstone_block" + }, + "enchantment": "minecraft:efficiency" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/feather_falling.json b/src/main/resources/data/enchanting_smith/recipes/feather_falling.json new file mode 100644 index 0000000..a32d68a --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/feather_falling.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR_FEET", + "upgrade": { + "item": "minecraft:feather" + }, + "enchantment": "minecraft:feather_falling" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/fire_aspect.json b/src/main/resources/data/enchanting_smith/recipes/fire_aspect.json new file mode 100644 index 0000000..b5002e6 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/fire_aspect.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:flint_and_steel" + }, + "enchantment": "minecraft:fire_aspect" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/fire_protection.json b/src/main/resources/data/enchanting_smith/recipes/fire_protection.json new file mode 100644 index 0000000..f9c157c --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/fire_protection.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR", + "upgrade": { + "item": "minecraft:nether_bricks" + }, + "enchantment": "minecraft:fire_protection" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/flame.json b/src/main/resources/data/enchanting_smith/recipes/flame.json new file mode 100644 index 0000000..ee51cfd --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/flame.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BOW", + "upgrade": { + "tag": "minecraft:fire_charge" + }, + "enchantment": "minecraft:flame" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/fortune.json b/src/main/resources/data/enchanting_smith/recipes/fortune.json new file mode 100644 index 0000000..075dcad --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/fortune.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "DIGGER", + "upgrade": { + "tag": "minecraft:lapis_block" + }, + "enchantment": "minecraft:fortune" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/frost_walker.json b/src/main/resources/data/enchanting_smith/recipes/frost_walker.json new file mode 100644 index 0000000..fe93611 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/frost_walker.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR_FEET", + "upgrade": { + "item": "minecraft:blue_ice" + }, + "enchantment": "minecraft:frost_walker" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/implaing.json b/src/main/resources/data/enchanting_smith/recipes/implaing.json new file mode 100644 index 0000000..8cc52e9 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/implaing.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "TRIDENT", + "upgrade": { + "tag": "minecraft:prismarine_shard" + }, + "enchantment": "minecraft:impaling" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/infinity.json b/src/main/resources/data/enchanting_smith/recipes/infinity.json new file mode 100644 index 0000000..a58283a --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/infinity.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BOW", + "upgrade": { + "tag": "minecraft:end_crystal" + }, + "enchantment": "minecraft:infinity" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/knockback.json b/src/main/resources/data/enchanting_smith/recipes/knockback.json new file mode 100644 index 0000000..be1c037 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/knockback.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:piston" + }, + "enchantment": "minecraft:knockback" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/looting.json b/src/main/resources/data/enchanting_smith/recipes/looting.json new file mode 100644 index 0000000..60da5b8 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/looting.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:lapis_block" + }, + "enchantment": "minecraft:looting" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/loyalty.json b/src/main/resources/data/enchanting_smith/recipes/loyalty.json new file mode 100644 index 0000000..cceb548 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/loyalty.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "TRIDENT", + "upgrade": { + "tag": "minecraft:lead" + }, + "enchantment": "minecraft:loyalty" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/luck_of_the_sea.json b/src/main/resources/data/enchanting_smith/recipes/luck_of_the_sea.json new file mode 100644 index 0000000..e4b712c --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/luck_of_the_sea.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "FISHING_ROD", + "upgrade": { + "item": "minecraft:lapis_block" + }, + "enchantment": "minecraft:luck_of_the_sea" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/lure.json b/src/main/resources/data/enchanting_smith/recipes/lure.json new file mode 100644 index 0000000..3306084 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/lure.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "FISHING_ROD", + "upgrade": { + "tag": "minecraft:redstone_block" + }, + "enchantment": "minecraft:lure" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/mending.json b/src/main/resources/data/enchanting_smith/recipes/mending.json new file mode 100644 index 0000000..fc07e16 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/mending.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BREAKABLE", + "upgrade": { + "tag": "minecraft:nether_star" + }, + "enchantment": "minecraft:mending" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/multishot.json b/src/main/resources/data/enchanting_smith/recipes/multishot.json new file mode 100644 index 0000000..2d4f6fa --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/multishot.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "CROSSBOW", + "upgrade": { + "tag": "minecraft:crossbow" + }, + "enchantment": "minecraft:multishot" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/piercing.json b/src/main/resources/data/enchanting_smith/recipes/piercing.json new file mode 100644 index 0000000..2212e79 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/piercing.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "CROSSBOW", + "upgrade": { + "tag": "minecraft:arrow" + }, + "enchantment": "minecraft:piercing" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/power.json b/src/main/resources/data/enchanting_smith/recipes/power.json new file mode 100644 index 0000000..86544ae --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/power.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BOW", + "upgrade": { + "tag": "minecraft:blaze_powder" + }, + "enchantment": "minecraft:power" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/projectile_protection.json b/src/main/resources/data/enchanting_smith/recipes/projectile_protection.json new file mode 100644 index 0000000..982a258 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/projectile_protection.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR", + "upgrade": { + "item": "minecraft:shield" + }, + "enchantment": "minecraft:projectile_protection" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/protection.json b/src/main/resources/data/enchanting_smith/recipes/protection.json new file mode 100644 index 0000000..f553c2b --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/protection.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR", + "upgrade": { + "item": "minecraft:iron_block" + }, + "enchantment": "minecraft:protection" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/punch.json b/src/main/resources/data/enchanting_smith/recipes/punch.json new file mode 100644 index 0000000..49b66dd --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/punch.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BOW", + "upgrade": { + "tag": "minecraft:piston" + }, + "enchantment": "minecraft:punch" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/quick_charge.json b/src/main/resources/data/enchanting_smith/recipes/quick_charge.json new file mode 100644 index 0000000..6ed2085 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/quick_charge.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "CROSSBOW", + "upgrade": { + "tag": "minecraft:redstone_block" + }, + "enchantment": "minecraft:quick_charge" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/riptide.json b/src/main/resources/data/enchanting_smith/recipes/riptide.json new file mode 100644 index 0000000..9b53544 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/riptide.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "TRIDENT", + "upgrade": { + "tag": "minecraft:firework_rocket" + }, + "enchantment": "minecraft:riptide" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/sharpness.json b/src/main/resources/data/enchanting_smith/recipes/sharpness.json new file mode 100644 index 0000000..25ca46f --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/sharpness.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:quartz_block" + }, + "enchantment": "minecraft:sharpness" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/silk_touch.json b/src/main/resources/data/enchanting_smith/recipes/silk_touch.json new file mode 100644 index 0000000..fb79dbe --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/silk_touch.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "DIGGER", + "upgrade": { + "tag": "minecraft:phantom_membrane" + }, + "enchantment": "minecraft:silk_touch" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/smite.json b/src/main/resources/data/enchanting_smith/recipes/smite.json new file mode 100644 index 0000000..8b6b114 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/smite.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "item": "minecraft:glowstone_block" + }, + "enchantment": "minecraft:smite" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/soul_speed.json b/src/main/resources/data/enchanting_smith/recipes/soul_speed.json new file mode 100644 index 0000000..9024db7 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/soul_speed.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR_FEET", + "upgrade": { + "item": "minecraft:soul_soil" + }, + "enchantment": "minecraft:soul_speed" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/sweeping.json b/src/main/resources/data/enchanting_smith/recipes/sweeping.json new file mode 100644 index 0000000..7c4dcf7 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/sweeping.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "WEAPON", + "upgrade": { + "tag": "minecraft:signs" + }, + "enchantment": "minecraft:sweeping" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/thorns.json b/src/main/resources/data/enchanting_smith/recipes/thorns.json new file mode 100644 index 0000000..3aec28f --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/thorns.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "ARMOR", + "upgrade": { + "item": "minecraft:cactus" + }, + "enchantment": "minecraft:thorns" +} \ No newline at end of file diff --git a/src/main/resources/data/enchanting_smith/recipes/unbreaking.json b/src/main/resources/data/enchanting_smith/recipes/unbreaking.json new file mode 100644 index 0000000..2b4b2d3 --- /dev/null +++ b/src/main/resources/data/enchanting_smith/recipes/unbreaking.json @@ -0,0 +1,8 @@ +{ + "type": "enchanting_smith:upgrade", + "target": "BREAKABLE", + "upgrade": { + "tag": "minecraft:diamond" + }, + "enchantment": "minecraft:unbreaking" +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..b70a224 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Enchanting Smith's Resources", + "pack_format": 6 + } +} \ No newline at end of file