Compare commits
No commits in common. "master" and "v0.10.0" have entirely different histories.
@ -20,10 +20,9 @@
|
||||
nether_ore, bone, netherite, ancient_debris, lodestone, chain,
|
||||
nether_gold_ore, gilded_blackstone, candle, amethyst_block,
|
||||
amethyst_cluster, small_amethyst_bud, medium_amethyst_bud,
|
||||
large_amethyst_bud, tuff, tuff_bricks, polished_tuff, calcite,
|
||||
dripstone_block, pointed_dripstone, copper, copper_bulb,
|
||||
copper_grate, cave_vines, spore_blossom, azalea, flowering_azalea,
|
||||
moss_carpet, pink_petals, moss_block, big_dripleaf,
|
||||
large_amethyst_bud, tuff, calcite, dripstone_block,
|
||||
pointed_dripstone, copper, cave_vines, spore_blossom, azalea,
|
||||
flowering_azalea, moss_carpet, pink_petals, moss_block, big_dripleaf,
|
||||
small_dripleaf, rooted_dirt, hanging_roots, azalea_leaves,
|
||||
sculk_sensor, sculk_catalyst, sculk, sculk_vein, sculk_shrieker,
|
||||
glow_lichen, deepslate, deepslate_bricks, deepslate_tiles,
|
||||
@ -32,9 +31,7 @@
|
||||
nether_wood_hanging_sign, bamboo_wood_hanging_sign, bamboo_wood,
|
||||
nether_wood, cherry_wood, cherry_sapling, cherry_leaves,
|
||||
cherry_wood_hanging_sign, chiseled_bookshelf, suspicious_sand,
|
||||
suspicious_gravel, decorated_pot, decorated_pot_shatter,
|
||||
trial_spawner, sponge, wet_sponge, vault, heavy_core,
|
||||
cobweb
|
||||
suspicious_gravel, decorated_pot, decorated_pot_shatter
|
||||
changes how the block sounds
|
||||
|
||||
"dropTableId" ~ string
|
||||
@ -58,7 +55,7 @@
|
||||
|
||||
"slipperiness" ~ float
|
||||
|
||||
"movementVelocityMultiplier" ~ float
|
||||
"slowDownMultiplier" ~ float
|
||||
|
||||
"jumpVelocityMultiplier" ~ float
|
||||
|
||||
@ -139,25 +136,4 @@
|
||||
dull_red (0xBD3031), dull_pink (0x943F61), dark_crimson (0x5C191D),
|
||||
teal (0x167E86), dark_aqua (0x3A8E8C), dark_dull_pink (0x562C3E),
|
||||
bright_teal (0x14B485), deepslate_gray (0x646464),
|
||||
raw_iron_pink (0xD8AF93), lichen_green (0x7FA796)
|
||||
|
||||
"renderLayer" ~ string
|
||||
one of:
|
||||
solid, cutout_mipped, cutout, translucent,
|
||||
translucent_moving_block, translucent_no_crumbling,
|
||||
leash, water_mask, armor_glint, armor_entity_glint, glint_translucent,
|
||||
glint, direct_glint, entity_glint, direct_entity_glint, text_background,
|
||||
text_background_see_through, lightning, tripwire, end_portal,
|
||||
end_gateway, lines, line_strip, debug_filled_box, debug_quads,
|
||||
debug_section_quads, gui, gui_overlay, gui_text_highlight,
|
||||
gui_ghost_recipe_overlay
|
||||
different renderLayers allow different graphical effects.
|
||||
Only the first 4 are interesting
|
||||
solid = solid block no transparency
|
||||
stone ...
|
||||
cutout_mipped = 100% or no transparency, ?gets softened far away when mipmapping is enabled?
|
||||
glass, leaves and similar
|
||||
cutout = 100% or no transparency
|
||||
flowers, saplings...
|
||||
translucent = full alpha support
|
||||
ice, stained glass, portal...
|
||||
raw_iron_pink (0xD8AF93), lichen_green (0x7FA796)
|
||||
66
build.gradle
66
build.gradle
@ -1,6 +1,5 @@
|
||||
plugins {
|
||||
id "com.modrinth.minotaur" version "2.+"
|
||||
id 'fabric-loom' version '1.9-SNAPSHOT'
|
||||
id 'fabric-loom' version '1.2-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
@ -17,11 +16,36 @@ repositories {
|
||||
// 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.
|
||||
maven { url 'https://maven.siphalor.de/' }
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url "https://maven.shedaniel.me/" }
|
||||
maven { url "https://maven.terraformersmc.com/releases/" }
|
||||
maven {
|
||||
name = 'Ladysnake Mods'
|
||||
url = 'https://ladysnake.jfrog.io/artifactory/mods'
|
||||
}
|
||||
maven {
|
||||
url = "https://api.modrinth.com/maven"
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://ueaj.dev/maven")
|
||||
// for 0.4.2 and older
|
||||
// url uri("https://raw.githubusercontent.com/Devan-Kerman/Devan-Repo/master/")
|
||||
}
|
||||
}
|
||||
|
||||
loom {
|
||||
splitEnvironmentSourceSets()
|
||||
|
||||
mods {
|
||||
"modid" {
|
||||
sourceSet sourceSets.main
|
||||
sourceSet sourceSets.client
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// To change the versions see the gradle.properties file
|
||||
@ -32,15 +56,29 @@ dependencies {
|
||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||
|
||||
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
|
||||
include "maven.modrinth:midnightlib:${project.midnightlib_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.
|
||||
|
||||
|
||||
include(modApi(platform("de.siphalor.tweed4:tweed4-bom-$project.minecraft_major_version:$project.tweed_version")))
|
||||
// Pick any modules you want to use, e.g.:
|
||||
include(modApi("de.siphalor.tweed4:tweed4-base-$project.minecraft_major_version"))
|
||||
include(modApi("de.siphalor.tweed4:tweed4-annotated-$project.minecraft_major_version"))
|
||||
include(modApi("de.siphalor.tweed4:tweed4-data-$project.minecraft_major_version"))
|
||||
include(modApi("de.siphalor.tweed4:tweed4-data-hjson-$project.minecraft_major_version"))
|
||||
//include(modApi("de.siphalor.tweed4:tweed4-tailor-cloth-$project.minecraft_major_version"))
|
||||
include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$project.minecraft_major_version"))
|
||||
|
||||
|
||||
modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version") {
|
||||
exclude(group: "net.fabricmc.fabric-api")
|
||||
}
|
||||
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
|
||||
}
|
||||
|
||||
configurations.include.transitive = true
|
||||
configurations.include.dependencies.each {
|
||||
if (!it.name.contains("bom") && !it.name.contains("fabric")) {
|
||||
if (!it.name.contains("bom")) {
|
||||
it.transitive = false
|
||||
}
|
||||
}
|
||||
@ -54,7 +92,7 @@ processResources {
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.release = 21
|
||||
it.options.release = 17
|
||||
}
|
||||
|
||||
java {
|
||||
@ -63,8 +101,8 @@ java {
|
||||
// If you remove this line, sources will not be generated.
|
||||
withSourcesJar()
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
jar {
|
||||
@ -73,18 +111,6 @@ jar {
|
||||
}
|
||||
}
|
||||
|
||||
import com.modrinth.minotaur.dependencies.DependencyType
|
||||
import com.modrinth.minotaur.dependencies.ModDependency
|
||||
|
||||
modrinth {
|
||||
projectId = 'vHsuCD0F' // The ID of your Modrinth project. Slugs will not work.
|
||||
uploadFile = remapJar // Tells Minotaur to use the remapped jar
|
||||
versionType = "alpha"
|
||||
dependencies = [
|
||||
new ModDependency('P7dR8mSH', DependencyType.REQUIRED), //required dependency on Fabric API
|
||||
new ModDependency('codAaoxh', DependencyType.EMBEDDED), //embedded midnightlib
|
||||
]
|
||||
}
|
||||
// configure the maven publication
|
||||
publishing {
|
||||
publications {
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
org.gradle.jvmargs = -Xmx1G
|
||||
|
||||
#Fabric properties
|
||||
minecraft_version=1.21.4
|
||||
yarn_mappings=1.21.4+build.7
|
||||
loader_version=0.16.9
|
||||
minecraft_version=1.20.1
|
||||
minecraft_major_version=1.20
|
||||
yarn_mappings=1.20.1+build.9
|
||||
loader_version=0.14.21
|
||||
|
||||
# Fabric API
|
||||
fabric_version=0.114.0+1.21.4
|
||||
#Fabric api
|
||||
fabric_version=0.84.0+1.20.1
|
||||
|
||||
#Mod properties
|
||||
mod_version = 0.10.3
|
||||
mod_version = 0.10.0
|
||||
maven_group = quimufu.simple_creator
|
||||
archives_base_name = simple_creator
|
||||
|
||||
midnightlib_version=1.6.6-fabric
|
||||
tweed_version=1.3.0+mc1.20-pre1
|
||||
cloth_config_version=11.0.99
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,7 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
296
gradlew
vendored
296
gradlew
vendored
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
# 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.
|
||||
@ -15,116 +15,80 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# 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/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# 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
|
||||
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
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
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
|
||||
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 ;;
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
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
|
||||
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
|
||||
@ -133,120 +97,92 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
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
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
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
|
||||
# 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
|
||||
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, switch paths to Windows format before running java
|
||||
if $cygwin ; 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=$((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 "$@")
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
# Collect all arguments for the java command, 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"
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
60
gradlew.bat
vendored
60
gradlew.bat
vendored
@ -13,10 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@ -27,14 +25,10 @@
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
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"
|
||||
|
||||
@ -43,13 +37,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
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
|
||||
|
||||
@ -57,36 +51,48 @@ goto fail
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
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
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
: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 %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
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!
|
||||
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%
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
jcenter()
|
||||
maven {
|
||||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
@ -4,34 +4,31 @@ import com.google.common.collect.Maps;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonObject;
|
||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
|
||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
|
||||
import net.minecraft.block.AbstractBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.MapColor;
|
||||
import net.minecraft.block.enums.NoteBlockInstrument;
|
||||
import net.minecraft.block.enums.Instrument;
|
||||
import net.minecraft.block.piston.PistonBehavior;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.loot.LootTable;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.registry.RegistryKeys;
|
||||
import net.minecraft.sound.BlockSoundGroup;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Pair;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import quimufu.simple_creator.mixin.BlockSettingsAccessor;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import static quimufu.simple_creator.SimpleCreatorMod.log;
|
||||
|
||||
@ -61,7 +58,6 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
|
||||
@Override
|
||||
protected Pair<Block, Item> deserialize(Pair<Identifier, JsonObject> e) {
|
||||
JsonObject jo = e.getRight();
|
||||
log(Level.INFO, e.getRight().toString());
|
||||
|
||||
// get block information
|
||||
BlockSettingsPojo bspj = GSON.fromJson(jo, BlockSettingsPojo.class);
|
||||
@ -72,17 +68,9 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
|
||||
// parse item group
|
||||
String group = bspj.itemGroup;
|
||||
RegistryKey<ItemGroup> g = ItemResourceLoader.findGroup(group);
|
||||
|
||||
bs.registryKey(RegistryKey.of(Registries.BLOCK.getKey(), e.getLeft()));
|
||||
|
||||
//create block and corresponding item
|
||||
Block resB = new Block(bs);
|
||||
|
||||
Item.Settings is = new Item.Settings();
|
||||
is.useBlockPrefixedTranslationKey();
|
||||
is.registryKey(RegistryKey.of(Registries.ITEM.getKey(), e.getLeft()));
|
||||
Item resI = new BlockItem(resB, is);
|
||||
|
||||
Item resI = new BlockItem(resB, new FabricItemSettings());
|
||||
ItemGroupEvents.modifyEntriesEvent(g).register(content -> content.add(resI));
|
||||
|
||||
int burnChance = bspj.burnChance;
|
||||
@ -90,20 +78,19 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
|
||||
if (burnChance != -1 && spreadChance != -1) {
|
||||
FlammableBlockRegistry.getDefaultInstance().add(resB, spreadChance, burnChance);
|
||||
}
|
||||
|
||||
SimpleCreatorMod.BLOCKS_RENDER_LAYER.add(new Pair<>(resB, bspj.renderLayer));
|
||||
return new Pair<>(resB, resI);
|
||||
}
|
||||
|
||||
private Block.Settings getSettings(BlockSettingsPojo bspj) {
|
||||
AbstractBlock.Settings blockSettings = AbstractBlock.Settings.create();
|
||||
FabricBlockSettings fabricBlockSettings = FabricBlockSettings.create();
|
||||
|
||||
blockSettings
|
||||
fabricBlockSettings
|
||||
.collidable(bspj.collidable)
|
||||
.slipperiness(bspj.slipperiness)
|
||||
.velocityMultiplier(bspj.movementVelocityMultiplier)
|
||||
.velocityMultiplier(bspj.slowDownMultiplier)
|
||||
.jumpVelocityMultiplier(bspj.jumpVelocityMultiplier)
|
||||
.sounds(getSoundGroup(bspj.soundGroup))
|
||||
.lootTable(Optional.ofNullable(getDropTableId(bspj.dropTableId)))
|
||||
.drops(getDropTableId(bspj.dropTableId))
|
||||
.mapColor(getMapColor(bspj.mapColor))
|
||||
.allowsSpawning(bspj.allowsSpawning ? BlockResourceLoader::always : BlockResourceLoader::never)
|
||||
.solidBlock(bspj.solidBlock ? BlockResourceLoader::always : BlockResourceLoader::never)
|
||||
@ -116,88 +103,108 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
|
||||
.offset(getOffset(bspj.modelOffset))
|
||||
.pistonBehavior(getPistonBehavior(bspj.pistonBehavior))
|
||||
.instrument(getInstrument(bspj.instrument))
|
||||
.luminance((blockState) -> bspj.lightLevel);
|
||||
|
||||
((BlockSettingsAccessor) blockSettings)
|
||||
.setCollidable(bspj.collidable);
|
||||
|
||||
.luminance(bspj.lightLevel);
|
||||
if (bspj.burnable) {
|
||||
blockSettings.burnable();
|
||||
fabricBlockSettings.burnable();
|
||||
}
|
||||
//not supported for now
|
||||
//blockSettings.liquid()
|
||||
//fabricBlockSettings.liquid()
|
||||
if (bspj.solidBlock) {
|
||||
blockSettings.solid();
|
||||
fabricBlockSettings.solid();
|
||||
} else {
|
||||
blockSettings.notSolid();
|
||||
fabricBlockSettings.notSolid();
|
||||
}
|
||||
if (bspj.replaceable) {
|
||||
blockSettings.replaceable();
|
||||
fabricBlockSettings.replaceable();
|
||||
}
|
||||
//not supported for now
|
||||
//blockSettings.air()
|
||||
//fabricBlockSettings.air()
|
||||
|
||||
if (bspj.noBlockBreakParticles) {
|
||||
blockSettings.noBlockBreakParticles();
|
||||
fabricBlockSettings.noBlockBreakParticles();
|
||||
}
|
||||
if (bspj.requiresTool) {
|
||||
blockSettings.requiresTool();
|
||||
fabricBlockSettings.requiresTool();
|
||||
|
||||
}
|
||||
if (bspj.breaksInstantly) {
|
||||
blockSettings.breakInstantly();
|
||||
fabricBlockSettings.breakInstantly();
|
||||
}
|
||||
|
||||
if (!bspj.opaque) {
|
||||
blockSettings.nonOpaque();
|
||||
fabricBlockSettings.nonOpaque();
|
||||
}
|
||||
|
||||
return blockSettings;
|
||||
return fabricBlockSettings;
|
||||
}
|
||||
|
||||
private NoteBlockInstrument getInstrument(String instrument) {
|
||||
return switch (instrument.toUpperCase()) {
|
||||
case "HARP" -> NoteBlockInstrument.HARP;
|
||||
case "BASEDRUM" -> NoteBlockInstrument.BASEDRUM;
|
||||
case "SNARE" -> NoteBlockInstrument.SNARE;
|
||||
case "HAT" -> NoteBlockInstrument.HAT;
|
||||
case "BASS" -> NoteBlockInstrument.BASS;
|
||||
case "FLUTE" -> NoteBlockInstrument.FLUTE;
|
||||
case "BELL" -> NoteBlockInstrument.BELL;
|
||||
case "GUITAR" -> NoteBlockInstrument.GUITAR;
|
||||
case "CHIME" -> NoteBlockInstrument.CHIME;
|
||||
case "XYLOPHONE" -> NoteBlockInstrument.XYLOPHONE;
|
||||
case "IRON_XYLOPHONE" -> NoteBlockInstrument.IRON_XYLOPHONE;
|
||||
case "COW_BELL" -> NoteBlockInstrument.COW_BELL;
|
||||
case "DIDGERIDOO" -> NoteBlockInstrument.DIDGERIDOO;
|
||||
case "BIT" -> NoteBlockInstrument.BIT;
|
||||
case "BANJO" -> NoteBlockInstrument.BANJO;
|
||||
case "PLING" -> NoteBlockInstrument.PLING;
|
||||
case "ZOMBIE" -> NoteBlockInstrument.ZOMBIE;
|
||||
case "SKELETON" -> NoteBlockInstrument.SKELETON;
|
||||
case "CREEPER" -> NoteBlockInstrument.CREEPER;
|
||||
case "DRAGON" -> NoteBlockInstrument.DRAGON;
|
||||
case "WITHER_SKELETON" -> NoteBlockInstrument.WITHER_SKELETON;
|
||||
case "PIGLIN" -> NoteBlockInstrument.PIGLIN;
|
||||
case "CUSTOM_HEAD" -> NoteBlockInstrument.CUSTOM_HEAD;
|
||||
default -> {
|
||||
private Instrument getInstrument(String instrument) {
|
||||
switch (instrument.toUpperCase()) {
|
||||
case "HARP":
|
||||
return Instrument.HARP;
|
||||
case "BASEDRUM":
|
||||
return Instrument.BASEDRUM;
|
||||
case "SNARE":
|
||||
return Instrument.SNARE;
|
||||
case "HAT":
|
||||
return Instrument.HAT;
|
||||
case "BASS":
|
||||
return Instrument.BASS;
|
||||
case "FLUTE":
|
||||
return Instrument.FLUTE;
|
||||
case "BELL":
|
||||
return Instrument.BELL;
|
||||
case "GUITAR":
|
||||
return Instrument.GUITAR;
|
||||
case "CHIME":
|
||||
return Instrument.CHIME;
|
||||
case "XYLOPHONE":
|
||||
return Instrument.XYLOPHONE;
|
||||
case "IRON_XYLOPHONE":
|
||||
return Instrument.IRON_XYLOPHONE;
|
||||
case "COW_BELL":
|
||||
return Instrument.COW_BELL;
|
||||
case "DIDGERIDOO":
|
||||
return Instrument.DIDGERIDOO;
|
||||
case "BIT":
|
||||
return Instrument.BIT;
|
||||
case "BANJO":
|
||||
return Instrument.BANJO;
|
||||
case "PLING":
|
||||
return Instrument.PLING;
|
||||
case "ZOMBIE":
|
||||
return Instrument.ZOMBIE;
|
||||
case "SKELETON":
|
||||
return Instrument.SKELETON;
|
||||
case "CREEPER":
|
||||
return Instrument.CREEPER;
|
||||
case "DRAGON":
|
||||
return Instrument.DRAGON;
|
||||
case "WITHER_SKELETON":
|
||||
return Instrument.WITHER_SKELETON;
|
||||
case "PIGLIN":
|
||||
return Instrument.PIGLIN;
|
||||
case "CUSTOM_HEAD":
|
||||
return Instrument.CUSTOM_HEAD;
|
||||
default:
|
||||
log(Level.WARN, "Instrument " + instrument + " not found, using harp");
|
||||
yield NoteBlockInstrument.HARP;
|
||||
}
|
||||
};
|
||||
return Instrument.HARP;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private AbstractBlock.OffsetType getOffset(String modelOffset) {
|
||||
return switch (modelOffset.toUpperCase()) {
|
||||
case "NONE" -> AbstractBlock.OffsetType.NONE;
|
||||
case "XZ" -> AbstractBlock.OffsetType.XZ;
|
||||
case "XYZ" -> AbstractBlock.OffsetType.XYZ;
|
||||
default -> {
|
||||
switch (modelOffset.toUpperCase()) {
|
||||
case "NONE":
|
||||
return AbstractBlock.OffsetType.NONE;
|
||||
case "XZ":
|
||||
return AbstractBlock.OffsetType.XZ;
|
||||
case "XYZ":
|
||||
return AbstractBlock.OffsetType.XYZ;
|
||||
default:
|
||||
log(Level.WARN, "ModelOffset " + modelOffset + " not found, using none");
|
||||
yield AbstractBlock.OffsetType.NONE;
|
||||
}
|
||||
};
|
||||
return AbstractBlock.OffsetType.NONE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -226,221 +233,386 @@ public class BlockResourceLoader extends GenericManualResourceLoader<Pair<Block,
|
||||
}
|
||||
|
||||
private PistonBehavior getPistonBehavior(String pistonBehavior) {
|
||||
return switch (pistonBehavior.toUpperCase()) {
|
||||
case "NORMAL" -> PistonBehavior.NORMAL;
|
||||
case "DESTROY" -> PistonBehavior.DESTROY;
|
||||
case "BLOCK" -> PistonBehavior.BLOCK;
|
||||
case "IGNORE" -> PistonBehavior.IGNORE;
|
||||
case "PUSH_ONLY" -> PistonBehavior.PUSH_ONLY;
|
||||
switch (pistonBehavior.toUpperCase()) {
|
||||
case "NORMAL" -> {
|
||||
return PistonBehavior.NORMAL;
|
||||
}
|
||||
case "DESTROY" -> {
|
||||
return PistonBehavior.DESTROY;
|
||||
}
|
||||
case "BLOCK" -> {
|
||||
return PistonBehavior.BLOCK;
|
||||
}
|
||||
case "IGNORE" -> {
|
||||
return PistonBehavior.IGNORE;
|
||||
}
|
||||
case "PUSH_ONLY" -> {
|
||||
return PistonBehavior.PUSH_ONLY;
|
||||
}
|
||||
default -> {
|
||||
log(Level.WARN, "Piston Behavior " + pistonBehavior + " not found, using normal");
|
||||
yield PistonBehavior.NORMAL;
|
||||
return PistonBehavior.NORMAL;
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private MapColor getMapColor(String color) {
|
||||
return switch (color.toUpperCase()) {
|
||||
case "CLEAR" -> MapColor.CLEAR;
|
||||
case "PALE_GREEN" -> MapColor.PALE_GREEN;
|
||||
case "PALE_YELLOW" -> MapColor.PALE_YELLOW;
|
||||
case "WHITE_GRAY" -> MapColor.WHITE_GRAY;
|
||||
case "BRIGHT_RED" -> MapColor.BRIGHT_RED;
|
||||
case "PALE_PURPLE" -> MapColor.PALE_PURPLE;
|
||||
case "IRON_GRAY" -> MapColor.IRON_GRAY;
|
||||
case "DARK_GREEN" -> MapColor.DARK_GREEN;
|
||||
case "WHITE" -> MapColor.WHITE;
|
||||
case "LIGHT_BLUE_GRAY" -> MapColor.LIGHT_BLUE_GRAY;
|
||||
case "DIRT_BROWN" -> MapColor.DIRT_BROWN;
|
||||
case "STONE_GRAY" -> MapColor.STONE_GRAY;
|
||||
case "WATER_BLUE" -> MapColor.WATER_BLUE;
|
||||
case "OAK_TAN" -> MapColor.OAK_TAN;
|
||||
case "OFF_WHITE" -> MapColor.OFF_WHITE;
|
||||
case "ORANGE" -> MapColor.ORANGE;
|
||||
case "MAGENTA" -> MapColor.MAGENTA;
|
||||
case "LIGHT_BLUE" -> MapColor.LIGHT_BLUE;
|
||||
case "YELLOW" -> MapColor.YELLOW;
|
||||
case "LIME" -> MapColor.LIME;
|
||||
case "PINK" -> MapColor.PINK;
|
||||
case "GRAY" -> MapColor.GRAY;
|
||||
case "LIGHT_GRAY" -> MapColor.LIGHT_GRAY;
|
||||
case "CYAN" -> MapColor.CYAN;
|
||||
case "PURPLE" -> MapColor.PURPLE;
|
||||
case "BLUE" -> MapColor.BLUE;
|
||||
case "BROWN" -> MapColor.BROWN;
|
||||
case "GREEN" -> MapColor.GREEN;
|
||||
case "RED" -> MapColor.RED;
|
||||
case "BLACK" -> MapColor.BLACK;
|
||||
case "GOLD" -> MapColor.GOLD;
|
||||
case "DIAMOND_BLUE" -> MapColor.DIAMOND_BLUE;
|
||||
case "LAPIS_BLUE" -> MapColor.LAPIS_BLUE;
|
||||
case "EMERALD_GREEN" -> MapColor.EMERALD_GREEN;
|
||||
case "SPRUCE_BROWN" -> MapColor.SPRUCE_BROWN;
|
||||
case "DARK_RED" -> MapColor.DARK_RED;
|
||||
case "TERRACOTTA_WHITE" -> MapColor.TERRACOTTA_WHITE;
|
||||
case "TERRACOTTA_ORANGE" -> MapColor.TERRACOTTA_ORANGE;
|
||||
case "TERRACOTTA_MAGENTA" -> MapColor.TERRACOTTA_MAGENTA;
|
||||
case "TERRACOTTA_LIGHT_BLUE" -> MapColor.TERRACOTTA_LIGHT_BLUE;
|
||||
case "TERRACOTTA_YELLOW" -> MapColor.TERRACOTTA_YELLOW;
|
||||
case "TERRACOTTA_LIME" -> MapColor.TERRACOTTA_LIME;
|
||||
case "TERRACOTTA_PINK" -> MapColor.TERRACOTTA_PINK;
|
||||
case "TERRACOTTA_GRAY" -> MapColor.TERRACOTTA_GRAY;
|
||||
case "TERRACOTTA_LIGHT_GRAY" -> MapColor.TERRACOTTA_LIGHT_GRAY;
|
||||
case "TERRACOTTA_CYAN" -> MapColor.TERRACOTTA_CYAN;
|
||||
case "TERRACOTTA_PURPLE" -> MapColor.TERRACOTTA_PURPLE;
|
||||
case "TERRACOTTA_BLUE" -> MapColor.TERRACOTTA_BLUE;
|
||||
case "TERRACOTTA_BROWN" -> MapColor.TERRACOTTA_BROWN;
|
||||
case "TERRACOTTA_GREEN" -> MapColor.TERRACOTTA_GREEN;
|
||||
case "TERRACOTTA_RED" -> MapColor.TERRACOTTA_RED;
|
||||
case "TERRACOTTA_BLACK" -> MapColor.TERRACOTTA_BLACK;
|
||||
case "DULL_RED" -> MapColor.DULL_RED;
|
||||
case "DULL_PINK" -> MapColor.DULL_PINK;
|
||||
case "DARK_CRIMSON" -> MapColor.DARK_CRIMSON;
|
||||
case "TEAL" -> MapColor.TEAL;
|
||||
case "DARK_AQUA" -> MapColor.DARK_AQUA;
|
||||
case "DARK_DULL_PINK" -> MapColor.DARK_DULL_PINK;
|
||||
case "BRIGHT_TEAL" -> MapColor.BRIGHT_TEAL;
|
||||
case "DEEPSLATE_GRAY" -> MapColor.DEEPSLATE_GRAY;
|
||||
case "RAW_IRON_PINK" -> MapColor.RAW_IRON_PINK;
|
||||
case "LICHEN_GREEN" -> MapColor.LICHEN_GREEN;
|
||||
default -> {
|
||||
switch (color.toUpperCase()) {
|
||||
case "CLEAR":
|
||||
return MapColor.CLEAR;
|
||||
case "PALE_GREEN":
|
||||
return MapColor.PALE_GREEN;
|
||||
case "PALE_YELLOW":
|
||||
return MapColor.PALE_YELLOW;
|
||||
case "WHITE_GRAY":
|
||||
return MapColor.WHITE_GRAY;
|
||||
case "BRIGHT_RED":
|
||||
return MapColor.BRIGHT_RED;
|
||||
case "PALE_PURPLE":
|
||||
return MapColor.PALE_PURPLE;
|
||||
case "IRON_GRAY":
|
||||
return MapColor.IRON_GRAY;
|
||||
case "DARK_GREEN":
|
||||
return MapColor.DARK_GREEN;
|
||||
case "WHITE":
|
||||
return MapColor.WHITE;
|
||||
case "LIGHT_BLUE_GRAY":
|
||||
return MapColor.LIGHT_BLUE_GRAY;
|
||||
case "DIRT_BROWN":
|
||||
return MapColor.DIRT_BROWN;
|
||||
case "STONE_GRAY":
|
||||
return MapColor.STONE_GRAY;
|
||||
case "WATER_BLUE":
|
||||
return MapColor.WATER_BLUE;
|
||||
case "OAK_TAN":
|
||||
return MapColor.OAK_TAN;
|
||||
case "OFF_WHITE":
|
||||
return MapColor.OFF_WHITE;
|
||||
case "ORANGE":
|
||||
return MapColor.ORANGE;
|
||||
case "MAGENTA":
|
||||
return MapColor.MAGENTA;
|
||||
case "LIGHT_BLUE":
|
||||
return MapColor.LIGHT_BLUE;
|
||||
case "YELLOW":
|
||||
return MapColor.YELLOW;
|
||||
case "LIME":
|
||||
return MapColor.LIME;
|
||||
case "PINK":
|
||||
return MapColor.PINK;
|
||||
case "GRAY":
|
||||
return MapColor.GRAY;
|
||||
case "LIGHT_GRAY":
|
||||
return MapColor.LIGHT_GRAY;
|
||||
case "CYAN":
|
||||
return MapColor.CYAN;
|
||||
case "PURPLE":
|
||||
return MapColor.PURPLE;
|
||||
case "BLUE":
|
||||
return MapColor.BLUE;
|
||||
case "BROWN":
|
||||
return MapColor.BROWN;
|
||||
case "GREEN":
|
||||
return MapColor.GREEN;
|
||||
case "RED":
|
||||
return MapColor.RED;
|
||||
case "BLACK":
|
||||
return MapColor.BLACK;
|
||||
case "GOLD":
|
||||
return MapColor.GOLD;
|
||||
case "DIAMOND_BLUE":
|
||||
return MapColor.DIAMOND_BLUE;
|
||||
case "LAPIS_BLUE":
|
||||
return MapColor.LAPIS_BLUE;
|
||||
case "EMERALD_GREEN":
|
||||
return MapColor.EMERALD_GREEN;
|
||||
case "SPRUCE_BROWN":
|
||||
return MapColor.SPRUCE_BROWN;
|
||||
case "DARK_RED":
|
||||
return MapColor.DARK_RED;
|
||||
case "TERRACOTTA_WHITE":
|
||||
return MapColor.TERRACOTTA_WHITE;
|
||||
case "TERRACOTTA_ORANGE":
|
||||
return MapColor.TERRACOTTA_ORANGE;
|
||||
case "TERRACOTTA_MAGENTA":
|
||||
return MapColor.TERRACOTTA_MAGENTA;
|
||||
case "TERRACOTTA_LIGHT_BLUE":
|
||||
return MapColor.TERRACOTTA_LIGHT_BLUE;
|
||||
case "TERRACOTTA_YELLOW":
|
||||
return MapColor.TERRACOTTA_YELLOW;
|
||||
case "TERRACOTTA_LIME":
|
||||
return MapColor.TERRACOTTA_LIME;
|
||||
case "TERRACOTTA_PINK":
|
||||
return MapColor.TERRACOTTA_PINK;
|
||||
case "TERRACOTTA_GRAY":
|
||||
return MapColor.TERRACOTTA_GRAY;
|
||||
case "TERRACOTTA_LIGHT_GRAY":
|
||||
return MapColor.TERRACOTTA_LIGHT_GRAY;
|
||||
case "TERRACOTTA_CYAN":
|
||||
return MapColor.TERRACOTTA_CYAN;
|
||||
case "TERRACOTTA_PURPLE":
|
||||
return MapColor.TERRACOTTA_PURPLE;
|
||||
case "TERRACOTTA_BLUE":
|
||||
return MapColor.TERRACOTTA_BLUE;
|
||||
case "TERRACOTTA_BROWN":
|
||||
return MapColor.TERRACOTTA_BROWN;
|
||||
case "TERRACOTTA_GREEN":
|
||||
return MapColor.TERRACOTTA_GREEN;
|
||||
case "TERRACOTTA_RED":
|
||||
return MapColor.TERRACOTTA_RED;
|
||||
case "TERRACOTTA_BLACK":
|
||||
return MapColor.TERRACOTTA_BLACK;
|
||||
case "DULL_RED":
|
||||
return MapColor.DULL_RED;
|
||||
case "DULL_PINK":
|
||||
return MapColor.DULL_PINK;
|
||||
case "DARK_CRIMSON":
|
||||
return MapColor.DARK_CRIMSON;
|
||||
case "TEAL":
|
||||
return MapColor.TEAL;
|
||||
case "DARK_AQUA":
|
||||
return MapColor.DARK_AQUA;
|
||||
case "DARK_DULL_PINK":
|
||||
return MapColor.DARK_DULL_PINK;
|
||||
case "BRIGHT_TEAL":
|
||||
return MapColor.BRIGHT_TEAL;
|
||||
case "DEEPSLATE_GRAY":
|
||||
return MapColor.DEEPSLATE_GRAY;
|
||||
case "RAW_IRON_PINK":
|
||||
return MapColor.RAW_IRON_PINK;
|
||||
case "LICHEN_GREEN":
|
||||
return MapColor.LICHEN_GREEN;
|
||||
|
||||
default:
|
||||
log(Level.WARN, "MapColor " + color + " not found, using pink");
|
||||
yield MapColor.PINK;
|
||||
}
|
||||
};
|
||||
return MapColor.PINK;
|
||||
}
|
||||
}
|
||||
|
||||
private RegistryKey<LootTable> getDropTableId(String s) {
|
||||
private Identifier getDropTableId(String s) {
|
||||
if (s == null)
|
||||
return null;
|
||||
Identifier i = Identifier.tryParse(s);
|
||||
if (i == null) {
|
||||
log(Level.WARN, "Drop table invalid " + s + ", using default");
|
||||
i = null;
|
||||
}
|
||||
return RegistryKey.of(RegistryKeys.LOOT_TABLE, i);
|
||||
return i;
|
||||
}
|
||||
|
||||
private BlockSoundGroup getSoundGroup(String s) {
|
||||
return switch (s.toUpperCase()) {
|
||||
case "INTENTIONALLY_EMPTY" -> BlockSoundGroup.INTENTIONALLY_EMPTY;
|
||||
case "WOOD" -> BlockSoundGroup.WOOD;
|
||||
case "GRAVEL" -> BlockSoundGroup.GRAVEL;
|
||||
case "GRASS" -> BlockSoundGroup.GRASS;
|
||||
case "LILY_PAD" -> BlockSoundGroup.LILY_PAD;
|
||||
case "STONE" -> BlockSoundGroup.STONE;
|
||||
case "METAL" -> BlockSoundGroup.METAL;
|
||||
case "GLASS" -> BlockSoundGroup.GLASS;
|
||||
case "WOOL" -> BlockSoundGroup.WOOL;
|
||||
case "SAND" -> BlockSoundGroup.SAND;
|
||||
case "SNOW" -> BlockSoundGroup.SNOW;
|
||||
case "POWDER_SNOW" -> BlockSoundGroup.POWDER_SNOW;
|
||||
case "LADDER" -> BlockSoundGroup.LADDER;
|
||||
case "ANVIL" -> BlockSoundGroup.ANVIL;
|
||||
case "SLIME" -> BlockSoundGroup.SLIME;
|
||||
case "HONEY" -> BlockSoundGroup.HONEY;
|
||||
case "WET_GRASS" -> BlockSoundGroup.WET_GRASS;
|
||||
case "CORAL" -> BlockSoundGroup.CORAL;
|
||||
case "BAMBOO" -> BlockSoundGroup.BAMBOO;
|
||||
case "BAMBOO_SAPLING" -> BlockSoundGroup.BAMBOO_SAPLING;
|
||||
case "SCAFFOLDING" -> BlockSoundGroup.SCAFFOLDING;
|
||||
case "SWEET_BERRY_BUSH" -> BlockSoundGroup.SWEET_BERRY_BUSH;
|
||||
case "CROP" -> BlockSoundGroup.CROP;
|
||||
case "STEM" -> BlockSoundGroup.STEM;
|
||||
case "VINE" -> BlockSoundGroup.VINE;
|
||||
case "NETHER_WART" -> BlockSoundGroup.NETHER_WART;
|
||||
case "LANTERN" -> BlockSoundGroup.LANTERN;
|
||||
case "NETHER_STEM" -> BlockSoundGroup.NETHER_STEM;
|
||||
case "NYLIUM" -> BlockSoundGroup.NYLIUM;
|
||||
case "FUNGUS" -> BlockSoundGroup.FUNGUS;
|
||||
case "ROOTS" -> BlockSoundGroup.ROOTS;
|
||||
case "SHROOMLIGHT" -> BlockSoundGroup.SHROOMLIGHT;
|
||||
case "WEEPING_VINES" -> BlockSoundGroup.WEEPING_VINES;
|
||||
case "WEEPING_VINES_LOW_PITCH" -> BlockSoundGroup.WEEPING_VINES_LOW_PITCH;
|
||||
case "SOUL_SAND" -> BlockSoundGroup.SOUL_SAND;
|
||||
case "SOUL_SOIL" -> BlockSoundGroup.SOUL_SOIL;
|
||||
case "BASALT" -> BlockSoundGroup.BASALT;
|
||||
case "WART_BLOCK" -> BlockSoundGroup.WART_BLOCK;
|
||||
case "NETHERRACK" -> BlockSoundGroup.NETHERRACK;
|
||||
case "NETHER_BRICKS" -> BlockSoundGroup.NETHER_BRICKS;
|
||||
case "NETHER_SPROUTS" -> BlockSoundGroup.NETHER_SPROUTS;
|
||||
case "NETHER_ORE" -> BlockSoundGroup.NETHER_ORE;
|
||||
case "BONE" -> BlockSoundGroup.BONE;
|
||||
case "NETHERITE" -> BlockSoundGroup.NETHERITE;
|
||||
case "ANCIENT_DEBRIS" -> BlockSoundGroup.ANCIENT_DEBRIS;
|
||||
case "LODESTONE" -> BlockSoundGroup.LODESTONE;
|
||||
case "CHAIN" -> BlockSoundGroup.CHAIN;
|
||||
case "NETHER_GOLD_ORE" -> BlockSoundGroup.NETHER_GOLD_ORE;
|
||||
case "GILDED_BLACKSTONE" -> BlockSoundGroup.GILDED_BLACKSTONE;
|
||||
case "CANDLE" -> BlockSoundGroup.CANDLE;
|
||||
case "AMETHYST_BLOCK" -> BlockSoundGroup.AMETHYST_BLOCK;
|
||||
case "AMETHYST_CLUSTER" -> BlockSoundGroup.AMETHYST_CLUSTER;
|
||||
case "SMALL_AMETHYST_BUD" -> BlockSoundGroup.SMALL_AMETHYST_BUD;
|
||||
case "MEDIUM_AMETHYST_BUD" -> BlockSoundGroup.MEDIUM_AMETHYST_BUD;
|
||||
case "LARGE_AMETHYST_BUD" -> BlockSoundGroup.LARGE_AMETHYST_BUD;
|
||||
case "TUFF" -> BlockSoundGroup.TUFF;
|
||||
case "TUFF_BRICKS" -> BlockSoundGroup.TUFF_BRICKS;
|
||||
case "POLISHED_TUFF" -> BlockSoundGroup.POLISHED_TUFF;
|
||||
case "CALCITE" -> BlockSoundGroup.CALCITE;
|
||||
case "DRIPSTONE_BLOCK" -> BlockSoundGroup.DRIPSTONE_BLOCK;
|
||||
case "POINTED_DRIPSTONE" -> BlockSoundGroup.POINTED_DRIPSTONE;
|
||||
case "COPPER" -> BlockSoundGroup.COPPER;
|
||||
case "COPPER_BULB" -> BlockSoundGroup.COPPER_BULB;
|
||||
case "COPPER_GRATE" -> BlockSoundGroup.COPPER_GRATE;
|
||||
case "CAVE_VINES" -> BlockSoundGroup.CAVE_VINES;
|
||||
case "SPORE_BLOSSOM" -> BlockSoundGroup.SPORE_BLOSSOM;
|
||||
case "AZALEA" -> BlockSoundGroup.AZALEA;
|
||||
case "FLOWERING_AZALEA" -> BlockSoundGroup.FLOWERING_AZALEA;
|
||||
case "MOSS_CARPET" -> BlockSoundGroup.MOSS_CARPET;
|
||||
case "PINK_PETALS" -> BlockSoundGroup.PINK_PETALS;
|
||||
case "MOSS_BLOCK" -> BlockSoundGroup.MOSS_BLOCK;
|
||||
case "BIG_DRIPLEAF" -> BlockSoundGroup.BIG_DRIPLEAF;
|
||||
case "SMALL_DRIPLEAF" -> BlockSoundGroup.SMALL_DRIPLEAF;
|
||||
case "ROOTED_DIRT" -> BlockSoundGroup.ROOTED_DIRT;
|
||||
case "HANGING_ROOTS" -> BlockSoundGroup.HANGING_ROOTS;
|
||||
case "AZALEA_LEAVES" -> BlockSoundGroup.AZALEA_LEAVES;
|
||||
case "SCULK_SENSOR" -> BlockSoundGroup.SCULK_SENSOR;
|
||||
case "SCULK_CATALYST" -> BlockSoundGroup.SCULK_CATALYST;
|
||||
case "SCULK" -> BlockSoundGroup.SCULK;
|
||||
case "SCULK_VEIN" -> BlockSoundGroup.SCULK_VEIN;
|
||||
case "SCULK_SHRIEKER" -> BlockSoundGroup.SCULK_SHRIEKER;
|
||||
case "GLOW_LICHEN" -> BlockSoundGroup.GLOW_LICHEN;
|
||||
case "DEEPSLATE" -> BlockSoundGroup.DEEPSLATE;
|
||||
case "DEEPSLATE_BRICKS" -> BlockSoundGroup.DEEPSLATE_BRICKS;
|
||||
case "DEEPSLATE_TILES" -> BlockSoundGroup.DEEPSLATE_TILES;
|
||||
case "POLISHED_DEEPSLATE" -> BlockSoundGroup.POLISHED_DEEPSLATE;
|
||||
case "FROGLIGHT" -> BlockSoundGroup.FROGLIGHT;
|
||||
case "FROGSPAWN" -> BlockSoundGroup.FROGSPAWN;
|
||||
case "MANGROVE_ROOTS" -> BlockSoundGroup.MANGROVE_ROOTS;
|
||||
case "MUDDY_MANGROVE_ROOTS" -> BlockSoundGroup.MUDDY_MANGROVE_ROOTS;
|
||||
case "MUD" -> BlockSoundGroup.MUD;
|
||||
case "MUD_BRICKS" -> BlockSoundGroup.MUD_BRICKS;
|
||||
case "PACKED_MUD" -> BlockSoundGroup.PACKED_MUD;
|
||||
case "HANGING_SIGN" -> BlockSoundGroup.HANGING_SIGN;
|
||||
case "NETHER_WOOD_HANGING_SIGN" -> BlockSoundGroup.NETHER_WOOD_HANGING_SIGN;
|
||||
case "BAMBOO_WOOD_HANGING_SIGN" -> BlockSoundGroup.BAMBOO_WOOD_HANGING_SIGN;
|
||||
case "BAMBOO_WOOD" -> BlockSoundGroup.BAMBOO_WOOD;
|
||||
case "NETHER_WOOD" -> BlockSoundGroup.NETHER_WOOD;
|
||||
case "CHERRY_WOOD" -> BlockSoundGroup.CHERRY_WOOD;
|
||||
case "CHERRY_SAPLING" -> BlockSoundGroup.CHERRY_SAPLING;
|
||||
case "CHERRY_LEAVES" -> BlockSoundGroup.CHERRY_LEAVES;
|
||||
case "CHERRY_WOOD_HANGING_SIGN" -> BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN;
|
||||
case "CHISELED_BOOKSHELF" -> BlockSoundGroup.CHISELED_BOOKSHELF;
|
||||
case "SUSPICIOUS_SAND" -> BlockSoundGroup.SUSPICIOUS_SAND;
|
||||
case "SUSPICIOUS_GRAVEL" -> BlockSoundGroup.SUSPICIOUS_GRAVEL;
|
||||
case "DECORATED_POT" -> BlockSoundGroup.DECORATED_POT;
|
||||
case "DECORATED_POT_SHATTER" -> BlockSoundGroup.DECORATED_POT_SHATTER;
|
||||
case "TRIAL_SPAWNER" -> BlockSoundGroup.TRIAL_SPAWNER;
|
||||
case "SPONGE" -> BlockSoundGroup.SPONGE;
|
||||
case "WET_SPONGE" -> BlockSoundGroup.WET_SPONGE;
|
||||
case "VAULT" -> BlockSoundGroup.VAULT;
|
||||
case "HEAVY_CORE" -> BlockSoundGroup.HEAVY_CORE;
|
||||
case "COBWEB" -> BlockSoundGroup.COBWEB;
|
||||
default -> {
|
||||
switch (s.toUpperCase()) {
|
||||
case "INTENTIONALLY_EMPTY":
|
||||
return BlockSoundGroup.INTENTIONALLY_EMPTY;
|
||||
case "WOOD":
|
||||
return BlockSoundGroup.WOOD;
|
||||
case "GRAVEL":
|
||||
return BlockSoundGroup.GRAVEL;
|
||||
case "GRASS":
|
||||
return BlockSoundGroup.GRASS;
|
||||
case "LILY_PAD":
|
||||
return BlockSoundGroup.LILY_PAD;
|
||||
case "STONE":
|
||||
return BlockSoundGroup.STONE;
|
||||
case "METAL":
|
||||
return BlockSoundGroup.METAL;
|
||||
case "GLASS":
|
||||
return BlockSoundGroup.GLASS;
|
||||
case "WOOL":
|
||||
return BlockSoundGroup.WOOL;
|
||||
case "SAND":
|
||||
return BlockSoundGroup.SAND;
|
||||
case "SNOW":
|
||||
return BlockSoundGroup.SNOW;
|
||||
case "POWDER_SNOW":
|
||||
return BlockSoundGroup.POWDER_SNOW;
|
||||
case "LADDER":
|
||||
return BlockSoundGroup.LADDER;
|
||||
case "ANVIL":
|
||||
return BlockSoundGroup.ANVIL;
|
||||
case "SLIME":
|
||||
return BlockSoundGroup.SLIME;
|
||||
case "HONEY":
|
||||
return BlockSoundGroup.HONEY;
|
||||
case "WET_GRASS":
|
||||
return BlockSoundGroup.WET_GRASS;
|
||||
case "CORAL":
|
||||
return BlockSoundGroup.CORAL;
|
||||
case "BAMBOO":
|
||||
return BlockSoundGroup.BAMBOO;
|
||||
case "BAMBOO_SAPLING":
|
||||
return BlockSoundGroup.BAMBOO_SAPLING;
|
||||
case "SCAFFOLDING":
|
||||
return BlockSoundGroup.SCAFFOLDING;
|
||||
case "SWEET_BERRY_BUSH":
|
||||
return BlockSoundGroup.SWEET_BERRY_BUSH;
|
||||
case "CROP":
|
||||
return BlockSoundGroup.CROP;
|
||||
case "STEM":
|
||||
return BlockSoundGroup.STEM;
|
||||
case "VINE":
|
||||
return BlockSoundGroup.VINE;
|
||||
case "NETHER_WART":
|
||||
return BlockSoundGroup.NETHER_WART;
|
||||
case "LANTERN":
|
||||
return BlockSoundGroup.LANTERN;
|
||||
case "NETHER_STEM":
|
||||
return BlockSoundGroup.NETHER_STEM;
|
||||
case "NYLIUM":
|
||||
return BlockSoundGroup.NYLIUM;
|
||||
case "FUNGUS":
|
||||
return BlockSoundGroup.FUNGUS;
|
||||
case "ROOTS":
|
||||
return BlockSoundGroup.ROOTS;
|
||||
case "SHROOMLIGHT":
|
||||
return BlockSoundGroup.SHROOMLIGHT;
|
||||
case "WEEPING_VINES":
|
||||
return BlockSoundGroup.WEEPING_VINES;
|
||||
case "WEEPING_VINES_LOW_PITCH":
|
||||
return BlockSoundGroup.WEEPING_VINES_LOW_PITCH;
|
||||
case "SOUL_SAND":
|
||||
return BlockSoundGroup.SOUL_SAND;
|
||||
case "SOUL_SOIL":
|
||||
return BlockSoundGroup.SOUL_SOIL;
|
||||
case "BASALT":
|
||||
return BlockSoundGroup.BASALT;
|
||||
case "WART_BLOCK":
|
||||
return BlockSoundGroup.WART_BLOCK;
|
||||
case "NETHERRACK":
|
||||
return BlockSoundGroup.NETHERRACK;
|
||||
case "NETHER_BRICKS":
|
||||
return BlockSoundGroup.NETHER_BRICKS;
|
||||
case "NETHER_SPROUTS":
|
||||
return BlockSoundGroup.NETHER_SPROUTS;
|
||||
case "NETHER_ORE":
|
||||
return BlockSoundGroup.NETHER_ORE;
|
||||
case "BONE":
|
||||
return BlockSoundGroup.BONE;
|
||||
case "NETHERITE":
|
||||
return BlockSoundGroup.NETHERITE;
|
||||
case "ANCIENT_DEBRIS":
|
||||
return BlockSoundGroup.ANCIENT_DEBRIS;
|
||||
case "LODESTONE":
|
||||
return BlockSoundGroup.LODESTONE;
|
||||
case "CHAIN":
|
||||
return BlockSoundGroup.CHAIN;
|
||||
case "NETHER_GOLD_ORE":
|
||||
return BlockSoundGroup.NETHER_GOLD_ORE;
|
||||
case "GILDED_BLACKSTONE":
|
||||
return BlockSoundGroup.GILDED_BLACKSTONE;
|
||||
case "CANDLE":
|
||||
return BlockSoundGroup.CANDLE;
|
||||
case "AMETHYST_BLOCK":
|
||||
return BlockSoundGroup.AMETHYST_BLOCK;
|
||||
case "AMETHYST_CLUSTER":
|
||||
return BlockSoundGroup.AMETHYST_CLUSTER;
|
||||
case "SMALL_AMETHYST_BUD":
|
||||
return BlockSoundGroup.SMALL_AMETHYST_BUD;
|
||||
case "MEDIUM_AMETHYST_BUD":
|
||||
return BlockSoundGroup.MEDIUM_AMETHYST_BUD;
|
||||
case "LARGE_AMETHYST_BUD":
|
||||
return BlockSoundGroup.LARGE_AMETHYST_BUD;
|
||||
case "TUFF":
|
||||
return BlockSoundGroup.TUFF;
|
||||
case "CALCITE":
|
||||
return BlockSoundGroup.CALCITE;
|
||||
case "DRIPSTONE_BLOCK":
|
||||
return BlockSoundGroup.DRIPSTONE_BLOCK;
|
||||
case "POINTED_DRIPSTONE":
|
||||
return BlockSoundGroup.POINTED_DRIPSTONE;
|
||||
case "COPPER":
|
||||
return BlockSoundGroup.COPPER;
|
||||
case "CAVE_VINES":
|
||||
return BlockSoundGroup.CAVE_VINES;
|
||||
case "SPORE_BLOSSOM":
|
||||
return BlockSoundGroup.SPORE_BLOSSOM;
|
||||
case "AZALEA":
|
||||
return BlockSoundGroup.AZALEA;
|
||||
case "FLOWERING_AZALEA":
|
||||
return BlockSoundGroup.FLOWERING_AZALEA;
|
||||
case "MOSS_CARPET":
|
||||
return BlockSoundGroup.MOSS_CARPET;
|
||||
case "PINK_PETALS":
|
||||
return BlockSoundGroup.PINK_PETALS;
|
||||
case "MOSS_BLOCK":
|
||||
return BlockSoundGroup.MOSS_BLOCK;
|
||||
case "BIG_DRIPLEAF":
|
||||
return BlockSoundGroup.BIG_DRIPLEAF;
|
||||
case "SMALL_DRIPLEAF":
|
||||
return BlockSoundGroup.SMALL_DRIPLEAF;
|
||||
case "ROOTED_DIRT":
|
||||
return BlockSoundGroup.ROOTED_DIRT;
|
||||
case "HANGING_ROOTS":
|
||||
return BlockSoundGroup.HANGING_ROOTS;
|
||||
case "AZALEA_LEAVES":
|
||||
return BlockSoundGroup.AZALEA_LEAVES;
|
||||
case "SCULK_SENSOR":
|
||||
return BlockSoundGroup.SCULK_SENSOR;
|
||||
case "SCULK_CATALYST":
|
||||
return BlockSoundGroup.SCULK_CATALYST;
|
||||
case "SCULK":
|
||||
return BlockSoundGroup.SCULK;
|
||||
case "SCULK_VEIN":
|
||||
return BlockSoundGroup.SCULK_VEIN;
|
||||
case "SCULK_SHRIEKER":
|
||||
return BlockSoundGroup.SCULK_SHRIEKER;
|
||||
case "GLOW_LICHEN":
|
||||
return BlockSoundGroup.GLOW_LICHEN;
|
||||
case "DEEPSLATE":
|
||||
return BlockSoundGroup.DEEPSLATE;
|
||||
case "DEEPSLATE_BRICKS":
|
||||
return BlockSoundGroup.DEEPSLATE_BRICKS;
|
||||
case "DEEPSLATE_TILES":
|
||||
return BlockSoundGroup.DEEPSLATE_TILES;
|
||||
case "POLISHED_DEEPSLATE":
|
||||
return BlockSoundGroup.POLISHED_DEEPSLATE;
|
||||
case "FROGLIGHT":
|
||||
return BlockSoundGroup.FROGLIGHT;
|
||||
case "FROGSPAWN":
|
||||
return BlockSoundGroup.FROGSPAWN;
|
||||
case "MANGROVE_ROOTS":
|
||||
return BlockSoundGroup.MANGROVE_ROOTS;
|
||||
case "MUDDY_MANGROVE_ROOTS":
|
||||
return BlockSoundGroup.MUDDY_MANGROVE_ROOTS;
|
||||
case "MUD":
|
||||
return BlockSoundGroup.MUD;
|
||||
case "MUD_BRICKS":
|
||||
return BlockSoundGroup.MUD_BRICKS;
|
||||
case "PACKED_MUD":
|
||||
return BlockSoundGroup.PACKED_MUD;
|
||||
case "HANGING_SIGN":
|
||||
return BlockSoundGroup.HANGING_SIGN;
|
||||
case "NETHER_WOOD_HANGING_SIGN":
|
||||
return BlockSoundGroup.NETHER_WOOD_HANGING_SIGN;
|
||||
case "BAMBOO_WOOD_HANGING_SIGN":
|
||||
return BlockSoundGroup.BAMBOO_WOOD_HANGING_SIGN;
|
||||
case "BAMBOO_WOOD":
|
||||
return BlockSoundGroup.BAMBOO_WOOD;
|
||||
case "NETHER_WOOD":
|
||||
return BlockSoundGroup.NETHER_WOOD;
|
||||
case "CHERRY_WOOD":
|
||||
return BlockSoundGroup.CHERRY_WOOD;
|
||||
case "CHERRY_SAPLING":
|
||||
return BlockSoundGroup.CHERRY_SAPLING;
|
||||
case "CHERRY_LEAVES":
|
||||
return BlockSoundGroup.CHERRY_LEAVES;
|
||||
case "CHERRY_WOOD_HANGING_SIGN":
|
||||
return BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN;
|
||||
case "CHISELED_BOOKSHELF":
|
||||
return BlockSoundGroup.CHISELED_BOOKSHELF;
|
||||
case "SUSPICIOUS_SAND":
|
||||
return BlockSoundGroup.SUSPICIOUS_SAND;
|
||||
case "SUSPICIOUS_GRAVEL":
|
||||
return BlockSoundGroup.SUSPICIOUS_GRAVEL;
|
||||
case "DECORATED_POT":
|
||||
return BlockSoundGroup.DECORATED_POT;
|
||||
case "DECORATED_POT_SHATTER":
|
||||
return BlockSoundGroup.DECORATED_POT_SHATTER;
|
||||
default:
|
||||
log(Level.WARN, "Sound group " + s + " not found, using stone");
|
||||
yield BlockSoundGroup.STONE;
|
||||
}
|
||||
};
|
||||
return BlockSoundGroup.STONE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ public class BlockSettingsPojo {
|
||||
public float explosionResistance = 6.0F;
|
||||
public float hardness = 1.5F;
|
||||
public float slipperiness = 0.6F;
|
||||
public float movementVelocityMultiplier = 1.0F;
|
||||
public float slowDownMultiplier = 1.0F;
|
||||
public float jumpVelocityMultiplier = 1.0F;
|
||||
public boolean opaque = true;
|
||||
public boolean allowsSpawning = true;
|
||||
@ -29,6 +29,5 @@ public class BlockSettingsPojo {
|
||||
public boolean noBlockBreakParticles = false;
|
||||
public boolean requiresTool = false;
|
||||
public boolean breaksInstantly = false;
|
||||
public String renderLayer = "solid";
|
||||
public String mapColor = "stone";
|
||||
String mapColor = "stone";
|
||||
}
|
||||
|
||||
@ -2,19 +2,15 @@ package quimufu.simple_creator;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.fabricmc.loader.api.ModContainer;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Pair;
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Optional;
|
||||
|
||||
import static quimufu.simple_creator.SimpleCreatorMod.MOD_ID;
|
||||
import static quimufu.simple_creator.SimpleCreatorMod.log;
|
||||
|
||||
public abstract class GenericManualResourceLoader<T> {
|
||||
@ -47,7 +43,7 @@ public abstract class GenericManualResourceLoader<T> {
|
||||
|
||||
public void load() {
|
||||
|
||||
if (SimpleCreatorConfig.enableTestThings) {
|
||||
if (true) {
|
||||
createFromResource("simple_creator/blocks/test_block.json");
|
||||
createFromResource("simple_creator/items/test_item.json");
|
||||
}
|
||||
@ -88,7 +84,7 @@ public abstract class GenericManualResourceLoader<T> {
|
||||
continue;
|
||||
}
|
||||
String entryName = blockJsonName.substring(0,blockJsonName.length()-5);
|
||||
Identifier identifier = Identifier.of(modId, entryName);
|
||||
Identifier identifier = new Identifier(modId, entryName);
|
||||
|
||||
try (Reader reader = new FileReader(entryJson)) {
|
||||
JsonObject jsonObject = gson.fromJson(reader, JsonObject.class);
|
||||
@ -107,21 +103,10 @@ public abstract class GenericManualResourceLoader<T> {
|
||||
}
|
||||
|
||||
private static void createFromResource(String path) {
|
||||
Optional<ModContainer> modContainerOp = FabricLoader.getInstance().getModContainer(MOD_ID);
|
||||
if(modContainerOp.isEmpty()){
|
||||
log(Level.ERROR,"ModContainer " + MOD_ID + " not Found" );
|
||||
return;
|
||||
}
|
||||
Optional<Path> nioPath = modContainerOp
|
||||
.flatMap(modContainer -> modContainer.findPath("data/" + path));
|
||||
if(nioPath.isEmpty()){
|
||||
log(Level.ERROR,"data/" + path + " Not Found" );
|
||||
return;
|
||||
}
|
||||
try (InputStream blocks = Files.newInputStream(nioPath.get())) {
|
||||
try (InputStream blocks = ClassLoader.getSystemClassLoader().getResourceAsStream("data/" + path)) {
|
||||
|
||||
File file = new File("./simplyCreated/" + path);
|
||||
if (!file.exists()) {
|
||||
if (!file.exists() && blocks != null) {
|
||||
|
||||
File parent = file.getParentFile();
|
||||
if (parent != null && !parent.exists() && !parent.mkdirs()) {
|
||||
|
||||
@ -3,20 +3,15 @@ package quimufu.simple_creator;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.gson.*;
|
||||
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
|
||||
import net.minecraft.component.type.ConsumableComponent;
|
||||
import net.minecraft.component.type.ConsumableComponents;
|
||||
import net.minecraft.component.type.FoodComponent;
|
||||
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.ItemGroups;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.consume.ApplyEffectsConsumeEffect;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.registry.entry.RegistryEntry;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.JsonHelper;
|
||||
import net.minecraft.util.Pair;
|
||||
@ -62,7 +57,7 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
}
|
||||
settings.maxCount(stackSize);
|
||||
JsonObject jsonFoodObject = JsonHelper.getObject(jo, "food");
|
||||
settings.food(deserializeFoodComponent(jsonFoodObject), deserializeEffectComponent(jsonFoodObject));
|
||||
settings.food(deserializeFoodComponent(jsonFoodObject));
|
||||
} else if (durability != 0 && stackSize != 1) {
|
||||
log(Level.WARN, "durability and stackSize do not work together");
|
||||
log(Level.WARN, "ignoring stackSize");
|
||||
@ -75,7 +70,6 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
}
|
||||
}
|
||||
settings.rarity(findRarity(rarity));
|
||||
settings.registryKey(RegistryKey.of(Registries.ITEM.getKey(), e.getLeft()));
|
||||
|
||||
|
||||
Item item = new Item(settings);
|
||||
@ -84,17 +78,6 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
return item;
|
||||
}
|
||||
|
||||
private ConsumableComponent deserializeEffectComponent(JsonObject jo) {
|
||||
ConsumableComponent.Builder ccb = ConsumableComponents.food();
|
||||
if (JsonHelper.getBoolean(jo, "isFast", false))
|
||||
ccb.consumeSeconds(0.8f);
|
||||
if (JsonHelper.hasArray(jo, "effects")) {
|
||||
JsonArray jsonEffectsArray = JsonHelper.getArray(jo, "effects");
|
||||
deserializeEffects(ccb, jsonEffectsArray);
|
||||
}
|
||||
return ccb.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void save(Identifier id, Item item) {
|
||||
items.put(id, item);
|
||||
@ -103,17 +86,25 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
private static FoodComponent deserializeFoodComponent(JsonObject jo) {
|
||||
FoodComponent fc;
|
||||
FoodComponent.Builder fcb = new FoodComponent.Builder();
|
||||
fcb.nutrition(JsonHelper.getInt(jo, "hunger", 4));
|
||||
fcb.hunger(JsonHelper.getInt(jo, "hunger", 4));
|
||||
fcb.saturationModifier(JsonHelper.getFloat(jo, "saturationModifier", 0.3F));
|
||||
if (JsonHelper.getBoolean(jo, "isAlwaysEdible", false))
|
||||
fcb.alwaysEdible();
|
||||
if (JsonHelper.getBoolean(jo, "isWolfFood", false))
|
||||
fcb.meat();
|
||||
if (JsonHelper.getBoolean(jo, "isFast", false))
|
||||
fcb.snack();
|
||||
if (JsonHelper.hasArray(jo, "effects")) {
|
||||
JsonArray jsonEffectsArray = JsonHelper.getArray(jo, "effects");
|
||||
deserializeEffects(fcb, jsonEffectsArray);
|
||||
}
|
||||
fc = fcb.build();
|
||||
return fc;
|
||||
}
|
||||
|
||||
private static void deserializeEffects(ConsumableComponent.Builder ccb, JsonArray ja) {
|
||||
private static void deserializeEffects(FoodComponent.Builder fcb, JsonArray ja) {
|
||||
for (JsonElement e : ja) {
|
||||
RegistryEntry<StatusEffect> type;
|
||||
StatusEffect type;
|
||||
int duration = 0;
|
||||
int amplifier = 0;
|
||||
boolean ambient = false;
|
||||
@ -123,9 +114,9 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
String effect = JsonHelper.getString(jo, "effect");
|
||||
Identifier ei = Identifier.tryParse(effect);
|
||||
if (ei != null) {
|
||||
Optional<RegistryEntry.Reference<StatusEffect>> se = Registries.STATUS_EFFECT.getEntry(ei);
|
||||
if (se.isPresent()) {
|
||||
type = se.get();
|
||||
StatusEffect se = Registries.STATUS_EFFECT.get(ei);
|
||||
if (se != null) {
|
||||
type = se;
|
||||
} else {
|
||||
log(Level.WARN, "Effect " + ei + " not found, skipping");
|
||||
continue;
|
||||
@ -139,13 +130,13 @@ public class ItemResourceLoader extends GenericManualResourceLoader<Item> {
|
||||
ambient = JsonHelper.getBoolean(jo, "ambient", ambient);
|
||||
visible = JsonHelper.getBoolean(jo, "visible", visible);
|
||||
chance = JsonHelper.getFloat(jo, "chance", chance);
|
||||
ccb.consumeEffect(new ApplyEffectsConsumeEffect(new StatusEffectInstance(type, duration, amplifier, ambient, visible), chance));
|
||||
fcb.statusEffect(new StatusEffectInstance(type, duration, amplifier, ambient, visible), chance);
|
||||
}
|
||||
}
|
||||
|
||||
private static Rarity findRarity(String filter) {
|
||||
for (Rarity r : Rarity.values()) {
|
||||
if (r.name().equalsIgnoreCase(filter))
|
||||
if (r.name().toLowerCase().equals(filter.toLowerCase()))
|
||||
return r;
|
||||
}
|
||||
log(Level.WARN, "Rarity " + filter + " not found, using common");
|
||||
|
||||
@ -1,12 +1,19 @@
|
||||
package quimufu.simple_creator;
|
||||
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import com.google.common.base.CaseFormat;
|
||||
import de.siphalor.tweed4.annotated.AConfigEntry;
|
||||
import de.siphalor.tweed4.annotated.ATweedConfig;
|
||||
import de.siphalor.tweed4.config.ConfigEnvironment;
|
||||
import de.siphalor.tweed4.config.ConfigScope;
|
||||
|
||||
public class SimpleCreatorConfig extends MidnightConfig {
|
||||
|
||||
@Comment(category = "text")
|
||||
public static Comment explanation;
|
||||
@ATweedConfig(serializer = "tweed4:hjson", scope = ConfigScope.GAME, environment = ConfigEnvironment.UNIVERSAL, tailors = {"tweed4:lang_json_descriptions", "tweed4:coat", "tweed4:json_schema"}, casing = CaseFormat.LOWER_HYPHEN)
|
||||
//@ClothData(modid = "tweed4_testmod")
|
||||
public class SimpleCreatorConfig {
|
||||
|
||||
@Entry(category = "text", name = "Enables included test Blocks and Items")
|
||||
@AConfigEntry(name = "enableTestThings", comment = "Enables included test Blocks and Items")
|
||||
public static boolean enableTestThings = false;
|
||||
|
||||
|
||||
public static boolean extendedLogging = false;
|
||||
}
|
||||
|
||||
@ -1,21 +1,12 @@
|
||||
package quimufu.simple_creator;
|
||||
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.util.Pair;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SimpleCreatorMod implements ModInitializer {
|
||||
|
||||
public static List<Pair<Block, String>> BLOCKS_RENDER_LAYER = new ArrayList<>();
|
||||
public static Logger LOGGER = LogManager.getLogger();
|
||||
public static ItemResourceLoader irl = new ItemResourceLoader();
|
||||
public static BlockResourceLoader brl = new BlockResourceLoader();
|
||||
@ -25,12 +16,9 @@ public class SimpleCreatorMod implements ModInitializer {
|
||||
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
log(Level.INFO, "Simply creating Blocks and Items");
|
||||
MidnightConfig.init(MOD_ID, SimpleCreatorConfig.class);
|
||||
|
||||
log(Level.INFO, "Initializing");
|
||||
irl.load();
|
||||
brl.load();
|
||||
log(Level.INFO, "Simply created!");
|
||||
}
|
||||
|
||||
public static void log(Level level, String message) {
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
package quimufu.simple_creator;
|
||||
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.util.Pair;
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class SimpleCreatorModClient implements ClientModInitializer {
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
SimpleCreatorMod.log(Level.INFO, "Client init");
|
||||
for (Pair<Block, String> blockRenderLayerPair : SimpleCreatorMod.BLOCKS_RENDER_LAYER) {
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(blockRenderLayerPair.getLeft(), getRenderLayer(blockRenderLayerPair.getRight()));
|
||||
}
|
||||
}
|
||||
|
||||
private net.minecraft.client.render.RenderLayer getRenderLayer(String renderLayer) {
|
||||
return switch (renderLayer.toUpperCase()) {
|
||||
case "SOLID" -> RenderLayer.getSolid();
|
||||
case "CUTOUT_MIPPED" -> RenderLayer.getCutoutMipped();
|
||||
case "CUTOUT" -> RenderLayer.getCutout();
|
||||
case "TRANSLUCENT" -> RenderLayer.getTranslucent();
|
||||
case "TRANSLUCENT_MOVING_BLOCK" -> RenderLayer.getTranslucentMovingBlock();
|
||||
case "LEASH" -> RenderLayer.getLeash();
|
||||
case "WATER_MASK" -> RenderLayer.getWaterMask();
|
||||
case "ARMOR_ENTITY_GLINT" -> RenderLayer.getArmorEntityGlint();
|
||||
case "GLINT_TRANSLUCENT" -> RenderLayer.getGlintTranslucent();
|
||||
case "GLINT" -> RenderLayer.getGlint();
|
||||
case "ENTITY_GLINT" -> RenderLayer.getEntityGlint();
|
||||
case "TEXT_BACKGROUND" -> RenderLayer.getTextBackground();
|
||||
case "TEXT_BACKGROUND_SEE_THROUGH" -> RenderLayer.getTextBackgroundSeeThrough();
|
||||
case "LIGHTNING" -> RenderLayer.getLightning();
|
||||
case "DRAGON_RAYS" -> RenderLayer.getDragonRays();
|
||||
case "DRAGON_RAYS_DEPTH" -> RenderLayer.getDragonRaysDepth();
|
||||
case "TRIPWIRE" -> RenderLayer.getTripwire();
|
||||
case "END_PORTAL" -> RenderLayer.getEndPortal();
|
||||
case "END_GATEWAY" -> RenderLayer.getEndGateway();
|
||||
case "FAST_CLOUDS" -> RenderLayer.getFastClouds();
|
||||
case "FANCY_CLOUDS" -> RenderLayer.getFancyClouds();
|
||||
case "LINES" -> RenderLayer.getLines();
|
||||
case "LINE_STRIP" -> RenderLayer.getLineStrip();
|
||||
case "DEBUG_FILLED_BOX" -> RenderLayer.getDebugFilledBox();
|
||||
case "DEBUG_QUADS" -> RenderLayer.getDebugQuads();
|
||||
case "DEBUG_STRUCTURE_QUADS" -> RenderLayer.getDebugStructureQuads();
|
||||
case "DEBUG_SECTION_QUADS" -> RenderLayer.getDebugSectionQuads();
|
||||
case "GUI" -> RenderLayer.getGui();
|
||||
case "GUI_OVERLAY" -> RenderLayer.getGuiOverlay();
|
||||
case "GUI_TEXT_HIGHLIGHT" -> RenderLayer.getGuiTextHighlight();
|
||||
case "GUI_GHOST_RECIPE_OVERLAY" -> RenderLayer.getGuiGhostRecipeOverlay();
|
||||
default -> {
|
||||
SimpleCreatorMod.log(Level.INFO, "Could not find renderLayer " + renderLayer + " using solid");
|
||||
yield RenderLayer.getSolid();
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
package quimufu.simple_creator.mixin;
|
||||
|
||||
import net.minecraft.block.AbstractBlock;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(AbstractBlock.Settings.class)
|
||||
public interface BlockSettingsAccessor {
|
||||
@Accessor
|
||||
void setCollidable(boolean collidable);
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "simple_creator:item/test_block"
|
||||
}
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "simple_creator:item/test_item"
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"simple_creator.midnightconfig.title": "Simple Item/Block Creator Settings",
|
||||
"simple_creator.midnightconfig.explanation": "Simple Item/Block Creator Settings",
|
||||
"simple_creator.midnightconfig.enableTestThings": "Enable a test item and block",
|
||||
"text.autoconfig.simple_creator.title": "Simple Item/Block Creator Settings",
|
||||
"text.autoconfig.simple_creator.option.enableTestThings": "Enable a test item and block",
|
||||
"item.simple_creator.test_item": "Forbidden Fruit",
|
||||
"block.simple_creator.test_block": "Fast jumpy wooly diamond-dropping block of Eternal Fire"
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"material": "ice",
|
||||
"mapColor": "yellow",
|
||||
"collidable": true,
|
||||
"soundGroup": "wool",
|
||||
@ -9,23 +10,8 @@
|
||||
"explosionResistance": 5.0,
|
||||
"hardness": 0.5,
|
||||
"slipperiness": 0.6,
|
||||
"movementVelocityMultiplier": 2.0,
|
||||
"slowDownMultiplier": 2.0,
|
||||
"jumpVelocityMultiplier": 2.0,
|
||||
"opaque": true,
|
||||
"itemGroup": "minecraft:building_blocks",
|
||||
"allowsSpawning": true,
|
||||
"solidBlock": true,
|
||||
"suffocates": true,
|
||||
"blockVision": true,
|
||||
"postProcess": false,
|
||||
"emissiveLighting": false,
|
||||
"modelOffset": "none",
|
||||
"pistonBehavior": "normal",
|
||||
"instrument": "harp",
|
||||
"burnable": false,
|
||||
"replaceable": false,
|
||||
"noBlockBreakParticles": false,
|
||||
"requiresTool": false,
|
||||
"breaksInstantly": false,
|
||||
"renderLayer": "solid"
|
||||
"itemGroup": "food"
|
||||
}
|
||||
@ -16,18 +16,15 @@
|
||||
"main": [
|
||||
"quimufu.simple_creator.SimpleCreatorMod"
|
||||
],
|
||||
"client": [
|
||||
"quimufu.simple_creator.SimpleCreatorModClient"
|
||||
],
|
||||
"client": [],
|
||||
"server": [],
|
||||
"tweed4:config": [
|
||||
"quimufu.simple_creator.SimpleCreatorConfig"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"simple_creator.mixins.json"
|
||||
],
|
||||
"mixins": [],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.14.21",
|
||||
"fabricloader": ">=0.4.0",
|
||||
"fabric": "*"
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "quimufu.simple_creator.mixin",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"mixins": [
|
||||
"BlockSettingsAccessor"
|
||||
],
|
||||
"client": [],
|
||||
"server": [],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user