diff --git a/.gitignore b/.gitignore index a1fc39c..e07026f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .gradle /build/ +/run # Ignore Gradle GUI config gradle-app.setting diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..659bf43 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ba1ec5c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..7a99079 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..84c523c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules/tastytoasters.main.iml b/.idea/modules/tastytoasters.main.iml new file mode 100644 index 0000000..31ee599 --- /dev/null +++ b/.idea/modules/tastytoasters.main.iml @@ -0,0 +1,17 @@ + + + + + + + MIXIN + MCP + FABRIC + + + + + + + \ No newline at end of file diff --git a/.idea/modules/tastytoasters.test.iml b/.idea/modules/tastytoasters.test.iml new file mode 100644 index 0000000..31ee599 --- /dev/null +++ b/.idea/modules/tastytoasters.test.iml @@ -0,0 +1,17 @@ + + + + + + + MIXIN + MCP + FABRIC + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..4ccb45c --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1632679199302 + + + + + + + + + + \ No newline at end of file diff --git a/LICENSE b/LICENSE index 153f123..91ef586 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -MIT License +The MIT License (MIT) -Copyright (c) 2021 blackfur +Copyright (c) 2021 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f521b44 --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '0.9.50' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +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}" + + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. + // You may need to force-disable transitiveness on them. +} + +processResources { + inputs.property "version", project.version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +def targetJavaVersion = 16 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release = targetJavaVersion + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + archivesBaseName = project.archives_base_name + // 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) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // 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..bcb7cc4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.17.1 +yarn_mappings=1.17.1+build.61 +loader_version=0.11.6 +# Mod Properties +mod_version=1.0-SNAPSHOT +maven_group=blackfur +archives_base_name=tastytoasters +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.40.1+1.17 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 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..05679dc --- /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.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /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..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/blackfur/tastytoasters/Tastytoasters.java b/src/main/java/blackfur/tastytoasters/Tastytoasters.java new file mode 100644 index 0000000..8834770 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/Tastytoasters.java @@ -0,0 +1,25 @@ +package blackfur.tastytoasters; + +import blackfur.tastytoasters.items.*; +import net.fabricmc.api.ModInitializer; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class Tastytoasters implements ModInitializer { + + public static final Item RAW_TOAST_ITEM = new RawToastItem(); + public static final Item TOAST_ITEM = new ToastItem(); + public static final Item BURNT_TOAST_ITEM = new BurntToastItem(); + public static final Item BUTTER_ITEM = new ButterItem(); + public static final Item BUTTERED_TOAST_ITEM = new ButteredToastItem(); + + @Override + public void onInitialize() { + Registry.register(Registry.ITEM, new Identifier("tastytoasters", "raw_toast"), RAW_TOAST_ITEM); + Registry.register(Registry.ITEM, new Identifier("tastytoasters", "toast"), TOAST_ITEM); + Registry.register(Registry.ITEM, new Identifier("tastytoasters", "burnt_toast"), BURNT_TOAST_ITEM); + Registry.register(Registry.ITEM, new Identifier("tastytoasters", "butter"), BUTTER_ITEM); + Registry.register(Registry.ITEM, new Identifier("tastytoasters", "buttered_toast"), BUTTERED_TOAST_ITEM); + } +} diff --git a/src/main/java/blackfur/tastytoasters/client/TastytoastersClient.java b/src/main/java/blackfur/tastytoasters/client/TastytoastersClient.java new file mode 100644 index 0000000..c7af9d9 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/client/TastytoastersClient.java @@ -0,0 +1,13 @@ +package blackfur.tastytoasters.client; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class TastytoastersClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + + } +} diff --git a/src/main/java/blackfur/tastytoasters/items/BurntToastItem.java b/src/main/java/blackfur/tastytoasters/items/BurntToastItem.java new file mode 100644 index 0000000..7dcf68f --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/BurntToastItem.java @@ -0,0 +1,42 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class BurntToastItem extends Item { + public BurntToastItem() { + super(new FabricItemSettings() + .group(ItemGroup.FOOD) + .food(new FoodComponent.Builder() + .hunger(2) + .saturationModifier(0.3f) + .statusEffect(new StatusEffectInstance( + StatusEffect.byRawId(17), + 60*20 + ),1f) + .statusEffect(new StatusEffectInstance( + StatusEffect.byRawId(19), + 15*20 + ),0.9f) + .build() + ) + ); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("item.tastytoasters.burnt_toast.tooltip").formatted(Formatting.GRAY)); + } +} diff --git a/src/main/java/blackfur/tastytoasters/items/ButterItem.java b/src/main/java/blackfur/tastytoasters/items/ButterItem.java new file mode 100644 index 0000000..984d7c1 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/ButterItem.java @@ -0,0 +1,45 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class ButterItem extends Item { + public ButterItem() { + super(new FabricItemSettings() + .group(ItemGroup.FOOD) + .food(new FoodComponent.Builder() + .hunger(0) + .saturationModifier(0.1f) + .alwaysEdible() + .snack() + .build() + ) + ); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("item.tastytoasters.butter.tooltip.1").formatted(Formatting.GRAY)); + tooltip.add( new TranslatableText("item.tastytoasters.butter.tooltip.2").formatted(Formatting.GRAY)); + } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + for (StatusEffectInstance effect : user.getStatusEffects()) { + user.removeStatusEffect(effect.getEffectType()); + } + return this.isFood() ? user.eatFood(world, stack) : stack; + } +} diff --git a/src/main/java/blackfur/tastytoasters/items/ButteredToastItem.java b/src/main/java/blackfur/tastytoasters/items/ButteredToastItem.java new file mode 100644 index 0000000..eef97d1 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/ButteredToastItem.java @@ -0,0 +1,47 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class ButteredToastItem extends Item { + public ButteredToastItem() { + super(new FabricItemSettings() + .group(ItemGroup.FOOD) + .food(new FoodComponent.Builder() + .hunger(0) + .saturationModifier(0.1f) + .alwaysEdible() + .build() + ) + ); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("item.tastytoasters.buttered_toast.tooltip").formatted(Formatting.GRAY)); + } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + for (StatusEffectInstance effect : user.getStatusEffects()) { + if (!effect.getEffectType().isBeneficial()) { + user.removeStatusEffect(effect.getEffectType()); + } + } + return this.isFood() ? user.eatFood(world, stack) : stack; + } + + +} diff --git a/src/main/java/blackfur/tastytoasters/items/RawToastItem.java b/src/main/java/blackfur/tastytoasters/items/RawToastItem.java new file mode 100644 index 0000000..4b189b2 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/RawToastItem.java @@ -0,0 +1,31 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class RawToastItem extends Item { + public RawToastItem() { + super(new FabricItemSettings() + .group(ItemGroup.FOOD) + .food(new FoodComponent.Builder() + .hunger(2) + .saturationModifier(0.3f) + .build() + )); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("item.tastytoasters.raw_toast.tooltip").formatted(Formatting.GRAY)); + } +} diff --git a/src/main/java/blackfur/tastytoasters/items/ToastItem.java b/src/main/java/blackfur/tastytoasters/items/ToastItem.java new file mode 100644 index 0000000..8eb3468 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/ToastItem.java @@ -0,0 +1,32 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class ToastItem extends Item { + public ToastItem() { + super(new FabricItemSettings() + .group(ItemGroup.FOOD) + .food(new FoodComponent.Builder() + .hunger(4) + .saturationModifier(1.0f) + .build() + ) + ); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("item.tastytoasters.toast.tooltip").formatted(Formatting.GRAY)); + } +} diff --git a/src/main/java/blackfur/tastytoasters/items/ToasterItem.java b/src/main/java/blackfur/tastytoasters/items/ToasterItem.java new file mode 100644 index 0000000..c7d66d0 --- /dev/null +++ b/src/main/java/blackfur/tastytoasters/items/ToasterItem.java @@ -0,0 +1,25 @@ +package blackfur.tastytoasters.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.Block; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.util.List; + +public class ToasterItem extends BlockItem { + public ToasterItem(Block block) { + super(block, new FabricItemSettings().group(ItemGroup.FOOD)); + } + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + tooltip.add( new TranslatableText("block.tastytoasters.toaster.tooltip").formatted(Formatting.GRAY)); + } +} diff --git a/src/main/resources/assets/tastytoasters/blockstates/toaster.json b/src/main/resources/assets/tastytoasters/blockstates/toaster.json new file mode 100644 index 0000000..e3d73f5 --- /dev/null +++ b/src/main/resources/assets/tastytoasters/blockstates/toaster.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "tastytoasters:block/toaster"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/lang/en_us.json b/src/main/resources/assets/tastytoasters/lang/en_us.json new file mode 100644 index 0000000..bddd544 --- /dev/null +++ b/src/main/resources/assets/tastytoasters/lang/en_us.json @@ -0,0 +1,15 @@ +{ + "item.tastytoasters.raw_toast": "Raw Toast", + "item.tastytoasters.raw_toast.tooltip": "Not very tasty but its ok", + "item.tastytoasters.toast": "Toast", + "item.tastytoasters.toast.tooltip": "Tasty but you can do better", + "item.tastytoasters.burnt_toast": "Burnt Toast", + "item.tastytoasters.burnt_toast.tooltip": "What have you done??", + "item.tastytoasters.butter": "Butter,", + "item.tastytoasters.butter.tooltip.1": "A yummy ingredient that", + "item.tastytoasters.butter.tooltip.2": "inherits milk properties", + "item.tastytoasters.buttered_toast": "Buttered Toast", + "item.tastytoasters.buttered_toast.tooltip": "So great, but not shiny enough", + "block.tastytoasters.toaster": "Toaster", + "block.tastytoasters.toaster.tooltip": "The gate to happiness" +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/block/toaster.json b/src/main/resources/assets/tastytoasters/models/block/toaster.json new file mode 100644 index 0000000..4513b96 --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/block/toaster.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "tastytoasters:block/toaster" + }, + "elements": [ + { + "from": [3, 0, 1], + "to": [13, 8, 15], + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#1"}, + "east": {"uv": [10, 4, 14, 11], "rotation": 270, "texture": "#1"}, + "south": {"uv": [5, 0, 10, 4], "texture": "#1"}, + "west": {"uv": [14, 4, 10, 11], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 4, 5, 11], "texture": "#1"}, + "down": {"uv": [5, 4, 10, 11], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/burnt_toast.json b/src/main/resources/assets/tastytoasters/models/item/burnt_toast.json new file mode 100644 index 0000000..6039660 --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/burnt_toast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tastytoasters:item/burnt_toast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/butter.json b/src/main/resources/assets/tastytoasters/models/item/butter.json new file mode 100644 index 0000000..860580a --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/butter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tastytoasters:item/butter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/buttered_toast.json b/src/main/resources/assets/tastytoasters/models/item/buttered_toast.json new file mode 100644 index 0000000..e9f0a71 --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/buttered_toast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tastytoasters:item/buttered_toast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/raw_toast.json b/src/main/resources/assets/tastytoasters/models/item/raw_toast.json new file mode 100644 index 0000000..dee411d --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/raw_toast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tastytoasters:item/raw_toast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/toast.json b/src/main/resources/assets/tastytoasters/models/item/toast.json new file mode 100644 index 0000000..4d43e9e --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/toast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tastytoasters:item/toast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/models/item/toaster.json b/src/main/resources/assets/tastytoasters/models/item/toaster.json new file mode 100644 index 0000000..439f13c --- /dev/null +++ b/src/main/resources/assets/tastytoasters/models/item/toaster.json @@ -0,0 +1,3 @@ +{ + "parent": "tastytoasters:block/toaster" +} \ No newline at end of file diff --git a/src/main/resources/assets/tastytoasters/textures/block/toaster.png b/src/main/resources/assets/tastytoasters/textures/block/toaster.png new file mode 100644 index 0000000..f901fd6 Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/block/toaster.png differ diff --git a/src/main/resources/assets/tastytoasters/textures/item/burnt_toast.png b/src/main/resources/assets/tastytoasters/textures/item/burnt_toast.png new file mode 100644 index 0000000..89312d2 Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/item/burnt_toast.png differ diff --git a/src/main/resources/assets/tastytoasters/textures/item/butter.png b/src/main/resources/assets/tastytoasters/textures/item/butter.png new file mode 100644 index 0000000..5e1946f Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/item/butter.png differ diff --git a/src/main/resources/assets/tastytoasters/textures/item/buttered_toast.png b/src/main/resources/assets/tastytoasters/textures/item/buttered_toast.png new file mode 100644 index 0000000..01dc10a Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/item/buttered_toast.png differ diff --git a/src/main/resources/assets/tastytoasters/textures/item/raw_toast.png b/src/main/resources/assets/tastytoasters/textures/item/raw_toast.png new file mode 100644 index 0000000..eae3c91 Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/item/raw_toast.png differ diff --git a/src/main/resources/assets/tastytoasters/textures/item/toast.png b/src/main/resources/assets/tastytoasters/textures/item/toast.png new file mode 100644 index 0000000..b10c184 Binary files /dev/null and b/src/main/resources/assets/tastytoasters/textures/item/toast.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..ee42461 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "tastytoasters:toaster" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json new file mode 100644 index 0000000..ee42461 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "tastytoasters:toaster" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json b/src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json new file mode 100644 index 0000000..2743647 --- /dev/null +++ b/src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tastytoasters:toaster" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/tastytoasters/recipes/butter.json b/src/main/resources/data/tastytoasters/recipes/butter.json new file mode 100644 index 0000000..db92301 --- /dev/null +++ b/src/main/resources/data/tastytoasters/recipes/butter.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:milk_bucket" + }, + "B": { + "item": "minecraft:calcite" + } + }, + "result": { + "item": "tastytoasters:butter", + "count": 8 + } +} \ No newline at end of file diff --git a/src/main/resources/data/tastytoasters/recipes/buttered_toast.json b/src/main/resources/data/tastytoasters/recipes/buttered_toast.json new file mode 100644 index 0000000..fdcf24d --- /dev/null +++ b/src/main/resources/data/tastytoasters/recipes/buttered_toast.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "tastytoasters:toast" + }, + { + "item": "tastytoasters:butter" + } + ], + "result": { + "count": 1, + "item": "tastytoasters:buttered_toast" + } +} \ No newline at end of file diff --git a/src/main/resources/data/tastytoasters/recipes/raw_toast.json b/src/main/resources/data/tastytoasters/recipes/raw_toast.json new file mode 100644 index 0000000..2fb5b16 --- /dev/null +++ b/src/main/resources/data/tastytoasters/recipes/raw_toast.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:wheat" + }, + { + "item": "minecraft:wheat" + } + ], + "result": { + "count": 1, + "item": "tastytoasters:raw_toast" + } +} \ No newline at end of file diff --git a/src/main/resources/data/tastytoasters/recipes/toaster.json b/src/main/resources/data/tastytoasters/recipes/toaster.json new file mode 100644 index 0000000..7d95316 --- /dev/null +++ b/src/main/resources/data/tastytoasters/recipes/toaster.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A A", + "B B", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:iron_ingot" + }, + "B": { + "item": "minecraft:blaze_rod" + } + }, + "result": { + "item": "tastytoasters:toaster", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..d8e45bf --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "tastytoasters", + "version": "${version}", + "name": "Tasty Toasters", + "description": "", + "authors": [], + "contact": {}, + "license": "MIT", + "icon": "assets/tastytoasters/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "blackfur.tastytoasters.client.TastytoastersClient" + ], + "main": [ + "blackfur.tastytoasters.Tastytoasters" + ] + }, + "mixins": [ + "tastytoasters.mixins.json" + ], + "depends": { + "fabricloader": ">=0.11.6", + "fabric": "*", + "minecraft": "1.17.1" + } +} diff --git a/src/main/resources/tastytoasters.mixins.json b/src/main/resources/tastytoasters.mixins.json new file mode 100644 index 0000000..0f71de9 --- /dev/null +++ b/src/main/resources/tastytoasters.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "blackfur.tastytoasters.mixin", + "compatibilityLevel": "JAVA_16", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +}