diff --git a/build.gradle b/build.gradle index 7bdb841..37aa56b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,35 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} plugins { id 'eclipse' + id 'idea' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' } -apply plugin: 'net.minecraftforge.gradle' import net.minecraftforge.gradle.common.tasks.SignJar version = "${mc_version}-${mod_version}" -group = 'jackyy.simplesponge' -archivesBaseName = "${mod_name}" +group = "jackyy.${mod_id}" +base { + archivesName = jar_name +} java.toolchain.languageVersion = JavaLanguageVersion.of(8) println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - mappings channel: "${mappings_channel}", version: "${mappings_version}" + mappings channel: mappings_channel, version: mappings_version + copyIdeResources = true runs { - client { + configureEach { workingDirectory project.file('run') property 'forge.logging.markers', 'REGISTRIES' property 'forge.logging.console.level', 'debug' + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + client { if (project.hasProperty('mcUUID')) { args '--uuid', project.getProperty('mcUUID') } @@ -37,32 +39,13 @@ minecraft { if (project.hasProperty('mcAccessToken')) { args '--accessToken', project.getProperty('mcAccessToken') } - mods { - simplesponge { - source sourceSets.main - } - } } server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - mods { - simplesponge { - source sourceSets.main - } - } + args '--nogui' } data { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - args '--mod', 'simplesponge', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - mods { - simplesponge { - source sourceSets.main - } - } + workingDirectory project.file('run-data') + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } @@ -71,11 +54,8 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } repositories { maven { - name = 'JEI Maven' - url = 'https://dvs1.progwml6.com/files/maven' - content { - includeGroup 'mezz.jei' - } + name = 'ModMaven' + url = 'https://modmaven.dev' } maven { name = 'Curse Maven' @@ -92,18 +72,34 @@ dependencies { implementation fg.deobf("mezz.jei:jei-1.16.5:+") implementation fg.deobf("curse.maven:hwyla-253449:3033593") //1.10.11-B78_1.16.2 - implementation fg.deobf("curse.maven:gunpowderlib-356646:3198017") //1.16.5-1.2.2 + implementation fg.deobf("curse.maven:gunpowderlib-356646:4515267") //1.16.5-1.2.3 +} + +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + mc_version: mc_version, mc_version_range: mc_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, jar_name: jar_name, + mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } } jar { manifest { attributes([ - "Specification-Title": "${mod_name}", - "Specification-Version": "${project.mc_version}-${project.mod_version}", - "Specification-Vendor": "Jackyy", - "Implementation-Title": "${mod_name}", - "Implementation-Version": "${project.mc_version}-${project.mod_version}", - "Implementation-Vendor" :"Jackyy", + "Specification-Title": jar_name, + "Specification-Version": "${mc_version}-${mod_version}", + "Specification-Vendor": mod_authors, + "Implementation-Title": jar_name, + "Implementation-Version": "${mc_version}-${mod_version}", + "Implementation-Vendor": mod_authors, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } @@ -113,8 +109,6 @@ tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } -jar.finalizedBy('reobfJar') - task signJar(type: SignJar, dependsOn: jar) { keyStore = project.findProperty('keyStore') alias = project.findProperty('keyStoreAlias') @@ -126,6 +120,8 @@ task signJar(type: SignJar, dependsOn: jar) { build.dependsOn signJar +jar.finalizedBy('reobfJar') + task sourcesJar(type: Jar) { from sourceSets.main.allSource archiveClassifier.set("sources") diff --git a/gradle.properties b/gradle.properties index bb23933..e717d89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,20 @@ org.gradle.jvmargs=-Xmx4G -mod_name=SimpleSponge + +mod_id=simplesponge +jar_name=SimpleSponge +mod_name=Simple Sponge + mc_version=1.16.5 +mc_version_range=[1.16,1.17) + forge_version=36.2.39 -mod_version=5.1.2 +forge_version_range=[35,) +loader_version_range=[35,) + mappings_channel=snapshot mappings_version=20210309-1.16.5 + +mod_version=5.2 +mod_license=MIT License (Original OpenBlocks codes and art assets), Jacky's Minecraft Mods License (The rest of the codes and art assets) +mod_authors=Jackyy, ThatGamerBlue +mod_description=OpenBlocks Sponge port for 1.10+, with some extra sprinkles! diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..65dcd68 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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 -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 +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,105 @@ 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 +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=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=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# 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" = "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 +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 - 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\"" + 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 - i=`expr $i + 1` + # 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 - 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; +# * $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 \ + "$@" + +# 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. +# -# 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" +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 index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b291e98 --- /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.5.0' +} diff --git a/src/main/java/jackyy/simplesponge/block/BlockCreativeSponge.java b/src/main/java/jackyy/simplesponge/block/BlockCreativeSponge.java new file mode 100644 index 0000000..663091a --- /dev/null +++ b/src/main/java/jackyy/simplesponge/block/BlockCreativeSponge.java @@ -0,0 +1,17 @@ +package jackyy.simplesponge.block; + +import jackyy.simplesponge.registry.ModConfigs; + +public class BlockCreativeSponge extends BlockSpongeBase { + + @Override + public int getRange() { + return ModConfigs.CONFIG.creativeSpongeRange.get(); + } + + @Override + public boolean isMagmatic() { + return true; + } + +} diff --git a/src/main/java/jackyy/simplesponge/block/BlockSpongeBase.java b/src/main/java/jackyy/simplesponge/block/BlockSpongeBase.java index 16c6715..9870f30 100644 --- a/src/main/java/jackyy/simplesponge/block/BlockSpongeBase.java +++ b/src/main/java/jackyy/simplesponge/block/BlockSpongeBase.java @@ -78,7 +78,7 @@ private void clearupLiquid(World world, BlockPos pos) { Material material = state.getMaterial(); if (material.isLiquid()) { hitLava |= material == Material.LAVA; - if (hitLava && !allowHotLiquid) break; + if (hitLava && !isMagmatic() && !allowHotLiquid) break; world.setBlockState(workPos, Blocks.AIR.getDefaultState()); } else if (state.hasProperty(BlockStateProperties.WATERLOGGED) && state.get(BlockStateProperties.WATERLOGGED)) { world.setBlockState(workPos, state.with(BlockStateProperties.WATERLOGGED, false)); diff --git a/src/main/java/jackyy/simplesponge/item/ItemCompressedCreativeSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemCompressedCreativeSpongeOnAStick.java new file mode 100644 index 0000000..a148d11 --- /dev/null +++ b/src/main/java/jackyy/simplesponge/item/ItemCompressedCreativeSpongeOnAStick.java @@ -0,0 +1,27 @@ +package jackyy.simplesponge.item; + +import jackyy.simplesponge.registry.ModConfigs; +import net.minecraft.item.Rarity; + +public class ItemCompressedCreativeSpongeOnAStick extends ItemSpongeOnAStickBase { + + public ItemCompressedCreativeSpongeOnAStick() { + super(new Properties().maxDamage(9001).rarity(Rarity.EPIC)); + } + + @Override + public int getRange() { + return ModConfigs.CONFIG.compressedCreativeSpongeOnAStickRange.get() * 2; + } + + @Override + public boolean isMagmatic() { + return true; + } + + @Override + public boolean isCreative() { + return true; + } + +} diff --git a/src/main/java/jackyy/simplesponge/item/ItemCompressedMagmaticSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemCompressedMagmaticSpongeOnAStick.java index bec058a..2b7dc40 100644 --- a/src/main/java/jackyy/simplesponge/item/ItemCompressedMagmaticSpongeOnAStick.java +++ b/src/main/java/jackyy/simplesponge/item/ItemCompressedMagmaticSpongeOnAStick.java @@ -19,9 +19,4 @@ public boolean isMagmatic() { return true; } - @Override - public boolean isPowered() { - return false; - } - } diff --git a/src/main/java/jackyy/simplesponge/item/ItemCompressedSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemCompressedSpongeOnAStick.java index 53d7525..1952200 100644 --- a/src/main/java/jackyy/simplesponge/item/ItemCompressedSpongeOnAStick.java +++ b/src/main/java/jackyy/simplesponge/item/ItemCompressedSpongeOnAStick.java @@ -19,9 +19,4 @@ public boolean isMagmatic() { return false; } - @Override - public boolean isPowered() { - return false; - } - } diff --git a/src/main/java/jackyy/simplesponge/item/ItemCreativeSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemCreativeSpongeOnAStick.java new file mode 100644 index 0000000..4385539 --- /dev/null +++ b/src/main/java/jackyy/simplesponge/item/ItemCreativeSpongeOnAStick.java @@ -0,0 +1,27 @@ +package jackyy.simplesponge.item; + +import jackyy.simplesponge.registry.ModConfigs; +import net.minecraft.item.Rarity; + +public class ItemCreativeSpongeOnAStick extends ItemSpongeOnAStickBase { + + public ItemCreativeSpongeOnAStick() { + super(new Properties().maxDamage(9001).rarity(Rarity.EPIC)); + } + + @Override + public int getRange() { + return ModConfigs.CONFIG.creativeSpongeRange.get(); + } + + @Override + public boolean isMagmatic() { + return true; + } + + @Override + public boolean isCreative() { + return true; + } + +} diff --git a/src/main/java/jackyy/simplesponge/item/ItemMagmaticSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemMagmaticSpongeOnAStick.java index 1013d9f..ef30b12 100644 --- a/src/main/java/jackyy/simplesponge/item/ItemMagmaticSpongeOnAStick.java +++ b/src/main/java/jackyy/simplesponge/item/ItemMagmaticSpongeOnAStick.java @@ -20,9 +20,4 @@ public boolean isMagmatic() { return true; } - @Override - public boolean isPowered() { - return false; - } - } diff --git a/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStick.java b/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStick.java index bb63aa3..1e6fab8 100644 --- a/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStick.java +++ b/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStick.java @@ -24,12 +24,6 @@ public boolean isMagmatic() { return false; } - @Override - public boolean isPowered() { - return false; - } - - @Override public void fillItemGroup(ItemGroup group, NonNullList items) { if (isInGroup(group)) { diff --git a/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStickBase.java b/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStickBase.java index 87e2e40..305a2a5 100644 --- a/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStickBase.java +++ b/src/main/java/jackyy/simplesponge/item/ItemSpongeOnAStickBase.java @@ -48,8 +48,12 @@ public boolean isMagmatic() { return this.isMagmatic(); } + public boolean isCreative() { + return false; + } + public boolean isPowered() { - return this.isPowered(); + return false; } @Override @@ -78,7 +82,7 @@ public ActionResult onItemRightClick(World world, PlayerEntity player } private boolean soakUp(World world, BlockPos pos, PlayerEntity player, ItemStack stack) { - boolean absorbedAnything = false; + boolean succ = false; boolean hitLava = false; boolean allowHotLiquid = ModConfigs.CONFIG.regularSpongeAbsorbHotLiquid.get(); int dmg = stack.getDamage(); @@ -91,22 +95,32 @@ private boolean soakUp(World world, BlockPos pos, PlayerEntity player, ItemStack final BlockState state = world.getBlockState(targetPos); Material material = world.getBlockState(targetPos).getMaterial(); if (material.isLiquid()) { - absorbedAnything = true; + succ = true; hitLava |= material == Material.LAVA; - if (hitLava && !allowHotLiquid) break; + if (hitLava && !isMagmatic() && !allowHotLiquid) break; world.setBlockState(targetPos, Blocks.AIR.getDefaultState()); - if (!isPowered() && ++dmg >= maxDmg) break; - else if (isPowered() && EnergyHelper.getEnergyStored(stack) < getPerRightClickUse()) break; + if (!player.isCreative() && !isCreative()) { + if (!isPowered() && ++dmg >= maxDmg) break; + else if (isPowered() && EnergyHelper.getEnergyStored(stack) < getPerRightClickUse()) break; + } } else if (state.hasProperty(BlockStateProperties.WATERLOGGED) && state.get(BlockStateProperties.WATERLOGGED)) { - absorbedAnything = true; + succ = true; hitLava = false; world.setBlockState(targetPos, state.with(BlockStateProperties.WATERLOGGED, false)); - if (!isPowered() && ++dmg >= maxDmg) break; - else if (isPowered() && EnergyHelper.getEnergyStored(stack) < getPerRightClickUse()) break; + if (!player.isCreative() && !isCreative()) { + if (!isPowered() && ++dmg >= maxDmg) break; + else if (isPowered() && EnergyHelper.getEnergyStored(stack) < getPerRightClickUse()) break; + } } else if (material == Material.OCEAN_PLANT || material == Material.SEA_GRASS) { + succ = true; + hitLava = false; TileEntity tile = state.hasTileEntity() ? world.getTileEntity(targetPos) : null; Block.spawnDrops(state, world, targetPos, tile); world.setBlockState(targetPos, Blocks.AIR.getDefaultState()); + if (!player.isCreative() && !isCreative()) { + if (!isPowered() && ++dmg >= maxDmg) break; + else if (isPowered() && EnergyHelper.getEnergyStored(stack) < getPerRightClickUse()) break; + } } } } @@ -117,8 +131,8 @@ private boolean soakUp(World world, BlockPos pos, PlayerEntity player, ItemStack player.setFire(6); } - if (absorbedAnything) { - if (!player.isCreative()) { + if (succ) { + if (!player.isCreative() && !isCreative()) { if (isPowered()) { if (EnergyHelper.getEnergyStored(stack) >= getPerRightClickUse()) { NBTHelper.setInt(stack, EnergyHelper.ENERGY_NBT, EnergyHelper.getEnergyStored(stack) - getPerRightClickUse()); diff --git a/src/main/java/jackyy/simplesponge/registry/ModBlocks.java b/src/main/java/jackyy/simplesponge/registry/ModBlocks.java index 1fe88f6..a81f5b4 100644 --- a/src/main/java/jackyy/simplesponge/registry/ModBlocks.java +++ b/src/main/java/jackyy/simplesponge/registry/ModBlocks.java @@ -1,6 +1,7 @@ package jackyy.simplesponge.registry; import jackyy.simplesponge.SimpleSponge; +import jackyy.simplesponge.block.BlockCreativeSponge; import jackyy.simplesponge.block.BlockMagmaticSponge; import jackyy.simplesponge.block.BlockSponge; import net.minecraft.block.Block; @@ -15,6 +16,7 @@ public class ModBlocks { public static final RegistryObject SPONGE = BLOCKS.register("sponge", BlockSponge::new); public static final RegistryObject MAGMATIC_SPONGE = BLOCKS.register("magmatic_sponge", BlockMagmaticSponge::new); + public static final RegistryObject CREATIVE_SPONGE = BLOCKS.register("creative_sponge", BlockCreativeSponge::new); public static void init() { BLOCKS.register(FMLJavaModLoadingContext.get().getModEventBus()); diff --git a/src/main/java/jackyy/simplesponge/registry/ModConfigs.java b/src/main/java/jackyy/simplesponge/registry/ModConfigs.java index 0685acb..945870f 100644 --- a/src/main/java/jackyy/simplesponge/registry/ModConfigs.java +++ b/src/main/java/jackyy/simplesponge/registry/ModConfigs.java @@ -21,6 +21,10 @@ public static class CommonConfig { public ForgeConfigSpec.IntValue compressedSpongeOnAStickRange; public ForgeConfigSpec.IntValue compressedMagmaticSpongeOnAStickRange; + public ForgeConfigSpec.IntValue creativeSpongeRange; + public ForgeConfigSpec.IntValue creativeSpongeOnAStickRange; + public ForgeConfigSpec.IntValue compressedCreativeSpongeOnAStickRange; + public ForgeConfigSpec.BooleanValue regularSpongeAbsorbHotLiquid; public ForgeConfigSpec.BooleanValue openBlocksIntegration; @@ -68,6 +72,18 @@ public static class CommonConfig { .defineInRange("compressedMagmaticSpongeOnAStickRange", 5, 1, 64); builder.pop(); + builder.push("creative_sponge"); + creativeSpongeRange = builder + .comment("Set the range for a Creative Sponge") + .defineInRange("creativeSpongeRange", 12, 1, 64); + creativeSpongeOnAStickRange = builder + .comment("Set the range for a Creative Sponge On A Stick") + .defineInRange("creativeSpongeOnAStickRange", 12, 1, 64); + compressedCreativeSpongeOnAStickRange = builder + .comment("Set the range (multiplied by 2) for a Compressed Creative Sponge On A Stick") + .defineInRange("compressedCreativeSpongeOnAStickRange", 12, 1, 64); + builder.pop(); + builder.push("misc"); regularSpongeAbsorbHotLiquid = builder .comment( diff --git a/src/main/java/jackyy/simplesponge/registry/ModItems.java b/src/main/java/jackyy/simplesponge/registry/ModItems.java index f6733c5..9dc4576 100644 --- a/src/main/java/jackyy/simplesponge/registry/ModItems.java +++ b/src/main/java/jackyy/simplesponge/registry/ModItems.java @@ -18,17 +18,23 @@ public class ModItems { = ITEMS.register("sponge_on_a_stick", ItemSpongeOnAStick::new); public static final RegistryObject MAGMATIC_SPONGE_ON_A_STICK = ITEMS.register("magmatic_sponge_on_a_stick", ItemMagmaticSpongeOnAStick::new); + public static final RegistryObject CREATIVE_SPONGE_ON_A_STICK + = ITEMS.register("creative_sponge_on_a_stick", ItemCreativeSpongeOnAStick::new); public static final RegistryObject ENERGIZED_SPONGE_ON_A_STICK = ITEMS.register("energized_sponge_on_a_stick", ItemEnergizedSpongeOnAStick::new); public static final RegistryObject COMPRESSED_SPONGE_ON_A_STICK = ITEMS.register("compressed_sponge_on_a_stick", ItemCompressedSpongeOnAStick::new); public static final RegistryObject COMPRESSED_MAGMATIC_SPONGE_ON_A_STICK = ITEMS.register("compressed_magmatic_sponge_on_a_stick", ItemCompressedMagmaticSpongeOnAStick::new); + public static final RegistryObject COMPRESSED_CREATIVE_SPONGE_ON_A_STICK + = ITEMS.register("compressed_creative_sponge_on_a_stick", ItemCompressedCreativeSpongeOnAStick::new); public static final RegistryObject SPONGE_BLOCK_ITEM = ITEMS.register("sponge", () -> new BlockItem(ModBlocks.SPONGE.get(), new Item.Properties().group(SimpleSponge.TAB))); public static final RegistryObject MAGMATIC_SPONGE_BLOCK_ITEM = ITEMS.register("magmatic_sponge", () -> new BlockItem(ModBlocks.MAGMATIC_SPONGE.get(), new Item.Properties().rarity(Rarity.UNCOMMON).group(SimpleSponge.TAB))); + public static final RegistryObject CREATIVE_SPONGE_BLOCK_ITEM + = ITEMS.register("creative_sponge", () -> new BlockItem(ModBlocks.CREATIVE_SPONGE.get(), new Item.Properties().rarity(Rarity.EPIC).group(SimpleSponge.TAB))); public static void init() { ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus()); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 558288c..9f2306b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,39 +1,37 @@ modLoader="javafml" -loaderVersion="[35,)" -license="MIT License (Original OpenBlocks codes and art assets), Jacky's Minecraft Mods License (The rest of the codes and art assets)" -issueTrackerURL="https://github.com/JackyyTV/SimpleSponge/issues" +loaderVersion="${loader_version_range}" +license="${mod_license}" +issueTrackerURL="https://github.com/JackyyTV/${jar_name}/issues" [[mods]] -modId="simplesponge" -version="5.1.2" -displayName="Simple Sponge" -displayURL="https://github.com/JackyyTV/SimpleSponge" +modId="${mod_id}" +version="${mod_version}" +displayName="${mod_name}" +displayURL="https://github.com/JackyyTV/${jar_name}" logoFile="logo.png" credits="OpenBlocks source code and TurkeyDev" -authors="Jackyy, ThatGamerBlue" -description=''' -OpenBlocks Sponge port for 1.10+, with some extra sprinkles! -''' +authors="${mod_authors}" +description='''${mod_description}''' -[[dependencies.simplesponge]] +[[dependencies.${mod_id}]] modId="forge" mandatory=true - versionRange="[35,)" + versionRange="${forge_version_range}" ordering="NONE" side="BOTH" -[[dependencies.simplesponge]] +[[dependencies.${mod_id}]] modId="minecraft" mandatory=true - versionRange="[1.16,1.17)" + versionRange="${mc_version_range}" ordering="NONE" side="BOTH" -[[dependencies.simplesponge]] +[[dependencies.${mod_id}]] modId="gunpowderlib" mandatory=true - versionRange="[1.16.4-1.2,)" + versionRange="[1.16.4-1.2.1,)" ordering="AFTER" side="BOTH" -[[dependencies.simplesponge]] +[[dependencies.${mod_id}]] modId="openblocks" mandatory=false versionRange="[1.0,)" diff --git a/src/main/resources/assets/simplesponge/blockstates/creative_sponge.json b/src/main/resources/assets/simplesponge/blockstates/creative_sponge.json new file mode 100644 index 0000000..9239fe7 --- /dev/null +++ b/src/main/resources/assets/simplesponge/blockstates/creative_sponge.json @@ -0,0 +1,6 @@ +{ + "forge_marker": 1, + "variants": { + "": { "model": "simplesponge:block/creative_sponge" } + } +} diff --git a/src/main/resources/assets/simplesponge/lang/en_us.json b/src/main/resources/assets/simplesponge/lang/en_us.json index 563c0e2..c02182f 100644 --- a/src/main/resources/assets/simplesponge/lang/en_us.json +++ b/src/main/resources/assets/simplesponge/lang/en_us.json @@ -7,11 +7,14 @@ "item.simplesponge.compressed_sponge_on_a_stick": "Compressed Sponge on a Stick", "item.simplesponge.magmatic_sponge_on_a_stick": "Magmatic Sponge on a Stick", "item.simplesponge.compressed_magmatic_sponge_on_a_stick": "Compressed Magmatic Sponge on a Stick", + "item.simplesponge.creative_sponge_on_a_stick": "Creative Sponge on a Stick", + "item.simplesponge.compressed_creative_sponge_on_a_stick": "Compressed Creative Sponge on a Stick", "item.simplesponge.energized_sponge_on_a_stick": "Energized Sponge on a Stick", "_comment": "Blocks", "block.simplesponge.sponge": "Sponge", "block.simplesponge.magmatic_sponge": "Magmatic Sponge", + "block.simplesponge.creative_sponge": "Creative Sponge", "_comment": "Tooltips", "tooltip.simplesponge.durability": "Durability" diff --git a/src/main/resources/assets/simplesponge/lang/zh_cn.json b/src/main/resources/assets/simplesponge/lang/zh_cn.json index bc01086..aab2925 100644 --- a/src/main/resources/assets/simplesponge/lang/zh_cn.json +++ b/src/main/resources/assets/simplesponge/lang/zh_cn.json @@ -4,9 +4,18 @@ "_comment": "Items", "item.simplesponge.sponge_on_a_stick": "海绵棍", + "item.simplesponge.compressed_sponge_on_a_stick": "压缩海绵棍", "item.simplesponge.magmatic_sponge_on_a_stick": "岩浆海绵棍", + "item.simplesponge.compressed_magmatic_sponge_on_a_stick": "岩浆压缩海绵棍", + "item.simplesponge.creative_sponge_on_a_stick": "创造模式海绵棍", + "item.simplesponge.compressed_creative_sponge_on_a_stick": "创造模式压缩海绵棍", + "item.simplesponge.energized_sponge_on_a_stick": "充能海绵棍", "_comment": "Blocks", "block.simplesponge.sponge": "海绵", - "block.simplesponge.magmatic_sponge": "岩浆海绵" + "block.simplesponge.magmatic_sponge": "岩浆海绵", + "block.simplesponge.creative_sponge": "创造模式海绵", + + "_comment": "Tooltips", + "tooltip.simplesponge.durability": "耐久值" } diff --git a/src/main/resources/assets/simplesponge/lang/zh_hk.json b/src/main/resources/assets/simplesponge/lang/zh_hk.json new file mode 100644 index 0000000..5d4d022 --- /dev/null +++ b/src/main/resources/assets/simplesponge/lang/zh_hk.json @@ -0,0 +1,21 @@ +{ + "_comment": "Creative Tab", + "itemGroup.simplesponge": "簡易海綿", + + "_comment": "Items", + "item.simplesponge.sponge_on_a_stick": "海綿棍", + "item.simplesponge.compressed_sponge_on_a_stick": "壓縮海綿棍", + "item.simplesponge.magmatic_sponge_on_a_stick": "岩漿海綿棍", + "item.simplesponge.compressed_magmatic_sponge_on_a_stick": "岩漿壓縮海綿棍", + "item.simplesponge.creative_sponge_on_a_stick": "創造模式海綿棍", + "item.simplesponge.compressed_creative_sponge_on_a_stick": "創造模式壓縮海綿棍", + "item.simplesponge.energized_sponge_on_a_stick": "充能海綿棍", + + "_comment": "Blocks", + "block.simplesponge.sponge": "海綿", + "block.simplesponge.magmatic_sponge": "岩漿海綿", + "block.simplesponge.creative_sponge": "創造模式海綿", + + "_comment": "Tooltips", + "tooltip.simplesponge.durability": "耐久度" +} diff --git a/src/main/resources/assets/simplesponge/lang/zh_tw.json b/src/main/resources/assets/simplesponge/lang/zh_tw.json new file mode 100644 index 0000000..5d4d022 --- /dev/null +++ b/src/main/resources/assets/simplesponge/lang/zh_tw.json @@ -0,0 +1,21 @@ +{ + "_comment": "Creative Tab", + "itemGroup.simplesponge": "簡易海綿", + + "_comment": "Items", + "item.simplesponge.sponge_on_a_stick": "海綿棍", + "item.simplesponge.compressed_sponge_on_a_stick": "壓縮海綿棍", + "item.simplesponge.magmatic_sponge_on_a_stick": "岩漿海綿棍", + "item.simplesponge.compressed_magmatic_sponge_on_a_stick": "岩漿壓縮海綿棍", + "item.simplesponge.creative_sponge_on_a_stick": "創造模式海綿棍", + "item.simplesponge.compressed_creative_sponge_on_a_stick": "創造模式壓縮海綿棍", + "item.simplesponge.energized_sponge_on_a_stick": "充能海綿棍", + + "_comment": "Blocks", + "block.simplesponge.sponge": "海綿", + "block.simplesponge.magmatic_sponge": "岩漿海綿", + "block.simplesponge.creative_sponge": "創造模式海綿", + + "_comment": "Tooltips", + "tooltip.simplesponge.durability": "耐久度" +} diff --git a/src/main/resources/assets/simplesponge/models/block/creative_sponge.json b/src/main/resources/assets/simplesponge/models/block/creative_sponge.json new file mode 100644 index 0000000..fc77ee6 --- /dev/null +++ b/src/main/resources/assets/simplesponge/models/block/creative_sponge.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "simplesponge:block/creative_sponge" + } +} diff --git a/src/main/resources/assets/simplesponge/models/item/compressed_creative_sponge_on_a_stick.json b/src/main/resources/assets/simplesponge/models/item/compressed_creative_sponge_on_a_stick.json new file mode 100644 index 0000000..c93e3c4 --- /dev/null +++ b/src/main/resources/assets/simplesponge/models/item/compressed_creative_sponge_on_a_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "simplesponge:item/compressed_creative_sponge_on_a_stick" + } +} diff --git a/src/main/resources/assets/simplesponge/models/item/creative_sponge.json b/src/main/resources/assets/simplesponge/models/item/creative_sponge.json new file mode 100644 index 0000000..0bf0d9d --- /dev/null +++ b/src/main/resources/assets/simplesponge/models/item/creative_sponge.json @@ -0,0 +1,3 @@ +{ + "parent": "simplesponge:block/creative_sponge" +} diff --git a/src/main/resources/assets/simplesponge/models/item/creative_sponge_on_a_stick.json b/src/main/resources/assets/simplesponge/models/item/creative_sponge_on_a_stick.json new file mode 100644 index 0000000..2c6acbd --- /dev/null +++ b/src/main/resources/assets/simplesponge/models/item/creative_sponge_on_a_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "simplesponge:item/creative_sponge_on_a_stick" + } +} diff --git a/src/main/resources/assets/simplesponge/textures/block/creative_sponge.png b/src/main/resources/assets/simplesponge/textures/block/creative_sponge.png new file mode 100644 index 0000000..1a77035 Binary files /dev/null and b/src/main/resources/assets/simplesponge/textures/block/creative_sponge.png differ diff --git a/src/main/resources/assets/simplesponge/textures/block/magmatic_sponge.png b/src/main/resources/assets/simplesponge/textures/block/magmatic_sponge.png index ceeff41..d8570f2 100644 Binary files a/src/main/resources/assets/simplesponge/textures/block/magmatic_sponge.png and b/src/main/resources/assets/simplesponge/textures/block/magmatic_sponge.png differ diff --git a/src/main/resources/assets/simplesponge/textures/block/sponge.png b/src/main/resources/assets/simplesponge/textures/block/sponge.png index 1195e87..bd9420a 100644 Binary files a/src/main/resources/assets/simplesponge/textures/block/sponge.png and b/src/main/resources/assets/simplesponge/textures/block/sponge.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/compressed_creative_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/compressed_creative_sponge_on_a_stick.png new file mode 100644 index 0000000..4ed43a8 Binary files /dev/null and b/src/main/resources/assets/simplesponge/textures/item/compressed_creative_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/compressed_magmatic_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/compressed_magmatic_sponge_on_a_stick.png index c59cefb..243f919 100644 Binary files a/src/main/resources/assets/simplesponge/textures/item/compressed_magmatic_sponge_on_a_stick.png and b/src/main/resources/assets/simplesponge/textures/item/compressed_magmatic_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/compressed_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/compressed_sponge_on_a_stick.png index 75c729e..f799eea 100644 Binary files a/src/main/resources/assets/simplesponge/textures/item/compressed_sponge_on_a_stick.png and b/src/main/resources/assets/simplesponge/textures/item/compressed_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/creative_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/creative_sponge_on_a_stick.png new file mode 100644 index 0000000..89113ec Binary files /dev/null and b/src/main/resources/assets/simplesponge/textures/item/creative_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/energized_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/energized_sponge_on_a_stick.png index fd974bd..2bbed8b 100644 Binary files a/src/main/resources/assets/simplesponge/textures/item/energized_sponge_on_a_stick.png and b/src/main/resources/assets/simplesponge/textures/item/energized_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/magmatic_sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/magmatic_sponge_on_a_stick.png index bb8f5a4..738522e 100644 Binary files a/src/main/resources/assets/simplesponge/textures/item/magmatic_sponge_on_a_stick.png and b/src/main/resources/assets/simplesponge/textures/item/magmatic_sponge_on_a_stick.png differ diff --git a/src/main/resources/assets/simplesponge/textures/item/sponge_on_a_stick.png b/src/main/resources/assets/simplesponge/textures/item/sponge_on_a_stick.png index 4b999f5..beb5fd9 100644 Binary files a/src/main/resources/assets/simplesponge/textures/item/sponge_on_a_stick.png and b/src/main/resources/assets/simplesponge/textures/item/sponge_on_a_stick.png differ diff --git a/src/main/resources/data/simplesponge/loot_tables/blocks/creative_sponge.json b/src/main/resources/data/simplesponge/loot_tables/blocks/creative_sponge.json new file mode 100644 index 0000000..d107efc --- /dev/null +++ b/src/main/resources/data/simplesponge/loot_tables/blocks/creative_sponge.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "creative_sponge", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "simplesponge:creative_sponge" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 3799d1c..ea640a6 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { - "pack": { - "description": "Simple Sponge Resources", - "pack_format": 6 - } + "pack": { + "description": { + "text": "${mod_name} resources" + }, + "pack_format": 6 + } }