diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..72f3f4c --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,46 @@ +# 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: + push: + branches: + - 'fabric/**' + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v2 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: generate build number + uses: einaregilsson/build-number@v3 + with: + token: ${{ secrets.github_token }} + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - 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 == '17' }} + uses: actions/upload-artifact@v2 + with: + name: Dev Build + path: build/libs/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09cd281 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..109ec47 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 ΡΞΛΚSΤΞΡ + +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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..b5478bb --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# EMIffect + +EMI addon that appends status effects in EMI and provides information about each status effect. + +Inspired by [Just Enough Effect Descriptions](https://www.curseforge.com/minecraft/mc-mods/just-enough-effect-descriptions-jeed). + +Modders can add descriptions for their own status effects via language files. The format follows JEED: `effect.[mod_id].[effect_name].description` diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4bdc299 --- /dev/null +++ b/build.gradle @@ -0,0 +1,88 @@ +plugins { + id 'fabric-loom' version '1.0-SNAPSHOT' + id "io.shcm.shsupercm.fabric.fletchingtable" version "1.5" // Hacky good stuff + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +archivesBaseName = project.archives_base_name +def baseVersion = project.mod_version +group = project.maven_group + +def ENV = System.getenv() +if (ENV.BUILD_NUMBER) { + version = baseVersion + '.' + ENV.BUILD_NUMBER + "+" + project.minecraft_version +} else { + version = baseVersion + '.local' + "+" + project.minecraft_version +} + +repositories { + maven { + name = "TerraformersMC" + url = "https://maven.terraformersmc.com/" + } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modImplementation "dev.emi:emi:${project.emi_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // 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() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} + +// 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..fa8a2c0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/develop + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.28 + loader_version=0.14.10 + +# Mod Properties + mod_version = 0.1 + maven_group = io.github.pkstdev + archives_base_name = emiffect + +# Dependencies + fabric_version=0.64.0+1.19.2 + emi_version=0.4.0+1.19 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 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..ae04661 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/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/master/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&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 + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto 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%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b02216b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} diff --git a/src/main/java/io/github/pkstdev/emiffect/EMIffectPlugin.java b/src/main/java/io/github/pkstdev/emiffect/EMIffectPlugin.java new file mode 100644 index 0000000..e0ce3c2 --- /dev/null +++ b/src/main/java/io/github/pkstdev/emiffect/EMIffectPlugin.java @@ -0,0 +1,51 @@ +package io.github.pkstdev.emiffect; + +import dev.emi.emi.api.EmiPlugin; +import dev.emi.emi.api.EmiRegistry; +import dev.emi.emi.api.recipe.EmiRecipeCategory; +import dev.emi.emi.api.render.EmiTexture; +import dev.emi.emi.api.stack.EmiStack; +import io.github.pkstdev.emiffect.recipe.StatusEffectInfo; +import io.github.pkstdev.emiffect.util.stack.StatusEffectEmiStack; +import io.shcm.shsupercm.fabric.fletchingtable.api.Entrypoint; +import net.minecraft.block.Blocks; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Entrypoint("emi") // For automatically registering the entrypoint +public class EMIffectPlugin implements EmiPlugin { + public static final String MOD_ID = "emiffect"; + public static final Logger LOGGER = LoggerFactory.getLogger("Emiffect"); + public static final Identifier CATEGORY_ICON = new Identifier(MOD_ID, "textures/gui/emi/icon.png"); + public static final EmiRecipeCategory CATEGORY + = new EmiRecipeCategory(new Identifier(MOD_ID, "status_effect_info"), new EmiTexture(CATEGORY_ICON, 0, 0, 16, 16, 16, 16, 16, 16)); + + @Override + public void register(EmiRegistry registry) { + for (StatusEffect effect : Registry.STATUS_EFFECT) { + StatusEffectEmiStack stack = StatusEffectEmiStack.of(effect); + registry.addEmiStack(stack); + registry.addRecipe(new StatusEffectInfo(effect, stack)); + } + registry.addCategory(CATEGORY); + registry.addWorkstation(CATEGORY, EmiStack.of(Blocks.BEACON)); + registry.addWorkstation(CATEGORY, EmiStack.of(Items.POTION)); + registry.addWorkstation(CATEGORY, EmiStack.of(Items.SPLASH_POTION)); + registry.addWorkstation(CATEGORY, EmiStack.of(Items.LINGERING_POTION)); + registry.addWorkstation(CATEGORY, EmiStack.of(Items.SUSPICIOUS_STEW)); + for (Item item : Registry.ITEM) { + FoodComponent food = item.getFoodComponent(); + if (food != null) { + if (!food.getStatusEffects().isEmpty()) { + registry.addWorkstation(CATEGORY, EmiStack.of(item)); + } + } + } + } +} diff --git a/src/main/java/io/github/pkstdev/emiffect/mixin/package-info.java b/src/main/java/io/github/pkstdev/emiffect/mixin/package-info.java new file mode 100644 index 0000000..b89a7ee --- /dev/null +++ b/src/main/java/io/github/pkstdev/emiffect/mixin/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains the Mixin stuffs. + */ +package io.github.pkstdev.emiffect.mixin; \ No newline at end of file diff --git a/src/main/java/io/github/pkstdev/emiffect/recipe/StatusEffectInfo.java b/src/main/java/io/github/pkstdev/emiffect/recipe/StatusEffectInfo.java new file mode 100644 index 0000000..8c840ed --- /dev/null +++ b/src/main/java/io/github/pkstdev/emiffect/recipe/StatusEffectInfo.java @@ -0,0 +1,143 @@ +package io.github.pkstdev.emiffect.recipe; + +import com.mojang.datafixers.util.Pair; +import dev.emi.emi.EmiPort; +import dev.emi.emi.api.recipe.EmiRecipe; +import dev.emi.emi.api.recipe.EmiRecipeCategory; +import dev.emi.emi.api.stack.EmiIngredient; +import dev.emi.emi.api.stack.EmiStack; +import dev.emi.emi.api.widget.SlotWidget; +import dev.emi.emi.api.widget.WidgetHolder; +import io.github.pkstdev.emiffect.EMIffectPlugin; +import io.github.pkstdev.emiffect.util.stack.StatusEffectEmiStack; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.FlowerBlock; +import net.minecraft.block.entity.BeaconBlockEntity; +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionUtil; +import net.minecraft.text.OrderedText; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class StatusEffectInfo implements EmiRecipe { + private final List inputs; + private final List desc; + private final Identifier id; + private int inputStackRow; + private final StatusEffectEmiStack emiStack; + + public StatusEffectInfo(StatusEffect effect, StatusEffectEmiStack emiStack) { + this.id = Registry.STATUS_EFFECT.getId(effect) != null ? Registry.STATUS_EFFECT.getId(effect) : new Identifier("emiffect", "missingno"); + List inputs1 = new ArrayList<>(List.of(EmiStack.of(PotionUtil.setPotion(Items.POTION.getDefaultStack(), Potion.byId(id.toString()))), + EmiStack.of(PotionUtil.setPotion(Items.SPLASH_POTION.getDefaultStack(), Potion.byId(id.toString()))), + EmiStack.of(PotionUtil.setPotion(Items.LINGERING_POTION.getDefaultStack(), Potion.byId(id.toString()))), + EmiStack.of(PotionUtil.setPotion(Items.TIPPED_ARROW.getDefaultStack(), Potion.byId(id.toString()))))); + for (Block block : Registry.BLOCK) { + if (block instanceof FlowerBlock flower) { + ItemStack stew = new ItemStack(Items.SUSPICIOUS_STEW); + StatusEffect flowerEffect = flower.getEffectInStew(); + if (flowerEffect.equals(effect)) { + SuspiciousStewItem.addEffectToStew(stew, effect, 200); + inputs1.add(EmiStack.of(stew)); + break; + } + } + } + for (Item item : Registry.ITEM) { + FoodComponent food = item.getFoodComponent(); + if (food != null) { + ItemStack stack = new ItemStack(item); + for (Pair pair : food.getStatusEffects()) { + if (pair.getFirst().getEffectType().equals(effect)) { + inputs1.add(EmiStack.of(stack)); + break; + } + } + } + } + for (StatusEffect[] effects : BeaconBlockEntity.EFFECTS_BY_LEVEL) { + if (Arrays.asList(effects).contains(effect)) { + inputs1.add(EmiStack.of(Blocks.BEACON)); + } + } + this.inputs = inputs1; + this.desc = MinecraftClient.getInstance().textRenderer.wrapLines(EmiPort.translatable("effect." + id.getNamespace() + "." + id.getPath() + ".description"), 110); + this.inputStackRow = 1; + int inputColumn = 0; + for (EmiIngredient ignored : inputs) { + if (inputColumn >= 6) { + this.inputStackRow += 1; + inputColumn = 0; + } + inputColumn += 1; + } + this.emiStack = emiStack; + } + + @Override + public EmiRecipeCategory getCategory() { + return EMIffectPlugin.CATEGORY; + } + + @Override + public @Nullable Identifier getId() { + return new Identifier("emi", "emiffect/" + + id.getNamespace() + + "/" + id.getPath()); + } + + @Override + public List getInputs() { + return inputs; + } + + @Override + public List getOutputs() { + return List.of(emiStack); + } + + @Override + public int getDisplayWidth() { + return 144; + } + + @Override + public int getDisplayHeight() { + return 2 + Math.max(desc.size() * MinecraftClient.getInstance().textRenderer.fontHeight, 30) + 4 + (inputStackRow * 18) + 2; + } + + @Override + public void addWidgets(WidgetHolder widgets) { + int lineHeight = MinecraftClient.getInstance().textRenderer.fontHeight; + int descLine = 0; + for (OrderedText text : desc) { + widgets.addText(text, 31, 2 + lineHeight * descLine, 16777215, true); + descLine += 1; + } + int descHeight = Math.max(descLine * lineHeight, 30); + + int inputRow = 0; + int inputColumn = 0; + for (EmiIngredient ingredient : inputs) { + widgets.addSlot(ingredient, 18 + (inputColumn * 18), descHeight + 4 + (inputRow * 18)); + inputColumn += 1; + if (inputColumn >= 6) { + inputRow += 1; + inputColumn = 0; + } + } + + SlotWidget effectSlot = new SlotWidget(getOutputs().get(0), 3, (descHeight - 26) / 2).output(true); + widgets.add(effectSlot); + } +} diff --git a/src/main/java/io/github/pkstdev/emiffect/util/package-info.java b/src/main/java/io/github/pkstdev/emiffect/util/package-info.java new file mode 100644 index 0000000..2f1f7ac --- /dev/null +++ b/src/main/java/io/github/pkstdev/emiffect/util/package-info.java @@ -0,0 +1 @@ +package io.github.pkstdev.emiffect.util; \ No newline at end of file diff --git a/src/main/java/io/github/pkstdev/emiffect/util/stack/StatusEffectEmiStack.java b/src/main/java/io/github/pkstdev/emiffect/util/stack/StatusEffectEmiStack.java new file mode 100644 index 0000000..8d207ff --- /dev/null +++ b/src/main/java/io/github/pkstdev/emiffect/util/stack/StatusEffectEmiStack.java @@ -0,0 +1,127 @@ +package io.github.pkstdev.emiffect.util.stack; + +import com.mojang.blaze3d.systems.RenderSystem; +import dev.emi.emi.EmiPort; +import dev.emi.emi.api.stack.EmiStack; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.tooltip.TooltipComponent; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.StatusEffectSpriteManager; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class StatusEffectEmiStack extends EmiStack { + @Nullable + private final StatusEffect effect; + private final StatusEffectEntry entry; + + protected StatusEffectEmiStack(@Nullable StatusEffect effect) { + this.effect = effect; + this.entry = new StatusEffectEntry(effect); + } + + public static StatusEffectEmiStack of(@Nullable StatusEffect effect) { + return new StatusEffectEmiStack(effect); + } + + @Override + public EmiStack copy() { + return StatusEffectEmiStack.of(this.effect); + } + + @Override + public boolean isEmpty() { + return effect != null; + } + + public @Nullable StatusEffect getEffect() { + return effect; + } + + @Override + public void render(MatrixStack matrices, int x, int y, float delta, int flags) { + StatusEffectSpriteManager sprites = MinecraftClient.getInstance().getStatusEffectSpriteManager(); + if (effect != null) { + Sprite sprite = sprites.getSprite(effect); + RenderSystem.clearColor(1.0F, 1.0F,1.0F,1.0F); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, sprite.getAtlas().getId()); + DrawableHelper.drawSprite(matrices, x, y, 0, 18, 18, sprite); + RenderSystem.applyModelViewMatrix(); + } + } + + @Override + public NbtCompound getNbt() { + return null; + } + + @Override + public Object getKey() { + return effect; + } + + @Override + public Entry getEntry() { + return entry; + } + + @Override + public Identifier getId() { + return Registry.STATUS_EFFECT.getId(effect); + } + + @Override + public List getTooltipText() { + return List.of(getName()); + } + + @Override + public List getTooltip() { + if (effect == null) return List.of(); + List tooltips = new ArrayList<>(getTooltipText().stream().map(EmiPort::ordered).map(TooltipComponent::of).toList()); + switch (effect.getCategory()) { + case BENEFICIAL -> tooltips.add(TooltipComponent.of(EmiPort.ordered( + EmiPort.translatable("tooltip.emiffect.beneficial").formatted(Formatting.GREEN)))); + case NEUTRAL -> tooltips.add(TooltipComponent.of(EmiPort.ordered( + EmiPort.translatable("tooltip.emiffect.neutral").formatted(Formatting.GOLD)))); + case HARMFUL -> tooltips.add(TooltipComponent.of(EmiPort.ordered( + EmiPort.translatable("tooltip.emiffect.harmful").formatted(Formatting.RED)))); + } + tooltips.add(TooltipComponent.of(EmiPort.ordered( + EmiPort.translatable("tooltip.emiffect.color", "#" + String.format("%02x", effect.getColor())).formatted(Formatting.GRAY)))); + Identifier id = Registry.STATUS_EFFECT.getId(effect); + if (id != null) + FabricLoader.getInstance().getModContainer(id.getNamespace()).ifPresent(modContainer -> tooltips.add(TooltipComponent.of(EmiPort.ordered( + EmiPort.literal(modContainer.getMetadata().getName()).formatted(Formatting.BLUE, Formatting.ITALIC))))); + return tooltips; + } + + @Override + public Text getName() { + return effect != null ? effect.getName() : EmiPort.literal("missingno"); + } + + public static class StatusEffectEntry extends Entry { + public StatusEffectEntry(StatusEffect value) { + super(value); + } + + @Override + public Class getType() { + return getValue().getClass(); + } + } +} diff --git a/src/main/resources/assets/emiffect/icon.png b/src/main/resources/assets/emiffect/icon.png new file mode 100644 index 0000000..4db8a01 Binary files /dev/null and b/src/main/resources/assets/emiffect/icon.png differ diff --git a/src/main/resources/assets/emiffect/lang/en_us.json b/src/main/resources/assets/emiffect/lang/en_us.json new file mode 100644 index 0000000..a72a787 --- /dev/null +++ b/src/main/resources/assets/emiffect/lang/en_us.json @@ -0,0 +1,42 @@ +{ + "emi.category.emiffect.status_effect_info": "Status Effect Info", + + "tooltip.emiffect.beneficial": "Beneficial", + "tooltip.emiffect.neutral": "Neutral", + "tooltip.emiffect.harmful": "Harmful", + "tooltip.emiffect.color": "Color: %s", + + "effect.minecraft.absorption.description": "Adds damage some damaging absorbing hearths (which can't be regenerated); higher levels give more absorption.", + "effect.minecraft.bad_omen.description": "Causes an illager raid to start upon entering a village; higher levels increase the raid difficulty.", + "effect.minecraft.blindness.description": "Impairs vision and disables the ability to sprint and critical hit.", + "effect.minecraft.darkness.description": "Causes vision to temporarily deteriorate.", + "effect.minecraft.conduit_power.description": "Increases underwater visibility and mining speed, prevents drowning.", + "effect.minecraft.dolphins_grace.description": "Drastically increases swimming speed. Effect given by dolphins", + "effect.minecraft.fire_resistance.description": "Grants immunity to fire damage as well as damage from lava.", + "effect.minecraft.glowing.description": "Marks affected entities with an outline glow, allowing them to be seen through blocks.", + "effect.minecraft.haste.description": "Increases mining and attack speed; higher levels increase both stats further.", + "effect.minecraft.health_boost.description": "Increases maximum health; higher levels give more additional hearths.", + "effect.minecraft.hero_of_the_village.description": "Gives discounts on trades with villagers, and makes villagers throw items at the player depending on their profession.", + "effect.minecraft.hunger.description": "Increases food exhaustion; higher levels cause to starve quicker.", + "effect.minecraft.instant_damage.description": "Damages living entities, heals undead; higher levels increase the effect potency.", + "effect.minecraft.instant_health.description": "Heals living entities, damages undead; higher levels increase the effect potency.", + "effect.minecraft.invisibility.description": "Grants invisibility, making the user invisible and reducing its detection range. Held or worn items will still be visible. Higher levels further decrease the detection range", + "effect.minecraft.jump_boost.description": "Increases jump height and reduces fall damage; higher levels increase both effects.", + "effect.minecraft.levitation.description": "Make affected entities float upwards.", + "effect.minecraft.luck.description": "Can increase chances of high-quality and more loot; higher levels increase the chances of better loot.", + "effect.minecraft.mining_fatigue.description": "Decreases mining and attack speed; higher levels decrease both stats further.", + "effect.minecraft.nausea.description": "Wobbles and warps the screen.", + "effect.minecraft.night_vision.description": "Improves vision in dark areas and underwater.", + "effect.minecraft.poison.description": "Inflicts non lethal damage over time; higher levels do more damage per second. Does not affect undeads.", + "effect.minecraft.regeneration.description": "Regenerates health over time; higher levels make health regenerate quicker.", + "effect.minecraft.resistance.description": "Provides 20% damage reduction per level.", + "effect.minecraft.saturation.description": "Restores hunger and saturation.", + "effect.minecraft.slow_falling.description": "Decreases falling speed and negates fall damage.", + "effect.minecraft.slowness.description": "Decreases walking speed; higher levels make the user slower and decrease their field of view.", + "effect.minecraft.speed.description": "Increases walking speed; higher levels make the user faster and increase their field of view.", + "effect.minecraft.strength.description": "Increases melee damage; higher levels increase the damage boost power.", + "effect.minecraft.unluck.description": "Can reduce chances of high-quality and more loot; higher levels reduce the chance of good loot.", + "effect.minecraft.water_breathing.description": "Prevents drowning and allows to breathe underwater.", + "effect.minecraft.weakness.description": "Decreases melee damage; higher levels decrease damage dealt further.", + "effect.minecraft.wither.description": "Inflicts lethal damage over time; higher levels do more damage per second." +} \ No newline at end of file diff --git a/src/main/resources/assets/emiffect/textures/gui/emi/icon.png b/src/main/resources/assets/emiffect/textures/gui/emi/icon.png new file mode 100644 index 0000000..f7e2c5c Binary files /dev/null and b/src/main/resources/assets/emiffect/textures/gui/emi/icon.png differ diff --git a/src/main/resources/emiffect.mixins.json b/src/main/resources/emiffect.mixins.json new file mode 100644 index 0000000..772efcb --- /dev/null +++ b/src/main/resources/emiffect.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.github.pkstdev.emiffect.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..c501cc3 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "emiffect", + "version": "${version}", + + "name": "EMIffect", + "description": "EMI addon that appends status effects in EMI and provides information about each status effect.", + "authors": [ + "pkstDev" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/pkstDev/fabric-example-mod" + }, + + "license": "MIT", + "icon": "assets/emiffect/icon.png", + + "environment": "*", + "entrypoints": { + "emi": [ + ] + }, + "mixins": [ + "emiffect.mixins.json" + ], + + "depends": { + "fabricloader": ">=0.14.9", + "fabric-api": "*", + "minecraft": "~1.19", + "java": ">=17", + "emi": "*" + } +}