Decorative 420 - Update to 1.18.2, Fix Bugs

Fix the recipe to make it work

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -17,6 +17,9 @@ repositories {
 	maven { url "https://jitpack.io" }
 	maven { url "https://maven.blamejared.com" }
 	maven { url "https://maven.terraformersmc.com/releases" }
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
 }
 
 dependencies {
@@ -28,16 +31,16 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-// 	modImplementation("vazkii.patchouli:Patchouli:${project.patchouli_version}"){
-//         exclude module: "fabric-api"
-//     }
+ 	modImplementation("vazkii.patchouli:Patchouli:${project.patchouli_version}"){
+        exclude module: "fabric-api"
+    }
 	
 	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}"){
         exclude module: "fabric-api"
     }
 	
-	modImplementation "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
-    include "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
+	modImplementation "maven.modrinth:midnightlib:${midnightlib_version}"
+	include "maven.modrinth:midnightlib:${midnightlib_version}"
 }
 
 processResources {
@@ -56,7 +59,7 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
 
 	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+	it.options.release = 17
 }
 
 java {

build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny

@@ -1 +0,0 @@
-v1	named	intermediary

build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny

@@ -1 +0,0 @@
-v1	named	intermediary

gradle.properties

@@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-pre1
-    yarn_mappings=1.17-pre1+build.9
-    loader_version=0.11.3
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.2
+	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = 4.1.0
+	mod_version = 4.2.0
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = decorative
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.34.8+1.17
-	mod_menu_version = 2.0.0-beta.5
-	midnightlib_version=v0.2.2
-	patchouli_version=1.16.4-50-FABRIC
+	fabric_version=0.48.0+1.18.2
+	mod_menu_version = 2.0.0-beta.7
+	midnightlib_version=0.4.0
+	patchouli_version=1.18.2-67-FABRIC

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+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,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# 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, 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.
 
-# 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"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java

@@ -13,17 +13,16 @@ import eu.midnightdust.motschen.decorative.init.Pool;
 import eu.midnightdust.motschen.decorative.init.Signs;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.color.block.BlockColorProvider;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.DyeColor;
 
-@SuppressWarnings({"deprecation", "UnstableApiUsage"})
 public class DecorativeClient implements ClientModInitializer {
 
     @Override
@@ -35,26 +34,26 @@ public class DecorativeClient implements ClientModInitializer {
         EntityModelLayerRegistry.registerModelLayer(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER, CeilingFanBladesModel::getTexturedModelData);
         EntityModelLayerRegistry.registerModelLayer(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER, WallClockHandsModel::getTexturedModelData);
 
-        EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, BeachBallRenderer::new);
+        EntityRendererRegistry.register(Pool.BEACH_BALL, BeachBallRenderer::new);
 
-        EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.WHITE));
-        EntityRendererRegistry.INSTANCE.register(BathTires.ORANGE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.ORANGE));
-        EntityRendererRegistry.INSTANCE.register(BathTires.MAGENTA_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.MAGENTA));
-        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_BLUE));
-        EntityRendererRegistry.INSTANCE.register(BathTires.YELLOW_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.YELLOW));
-        EntityRendererRegistry.INSTANCE.register(BathTires.LIME_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIME));
-        EntityRendererRegistry.INSTANCE.register(BathTires.PINK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PINK));
-        EntityRendererRegistry.INSTANCE.register(BathTires.GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GRAY));
-        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_GRAY));
-        EntityRendererRegistry.INSTANCE.register(BathTires.CYAN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.CYAN));
-        EntityRendererRegistry.INSTANCE.register(BathTires.PURPLE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PURPLE));
-        EntityRendererRegistry.INSTANCE.register(BathTires.BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLUE));
-        EntityRendererRegistry.INSTANCE.register(BathTires.BROWN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BROWN));
-        EntityRendererRegistry.INSTANCE.register(BathTires.GREEN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GREEN));
-        EntityRendererRegistry.INSTANCE.register(BathTires.RED_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.RED));
-        EntityRendererRegistry.INSTANCE.register(BathTires.BLACK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLACK));
+        EntityRendererRegistry.register(BathTires.WHITE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.WHITE));
+        EntityRendererRegistry.register(BathTires.ORANGE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.ORANGE));
+        EntityRendererRegistry.register(BathTires.MAGENTA_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.MAGENTA));
+        EntityRendererRegistry.register(BathTires.LIGHT_BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_BLUE));
+        EntityRendererRegistry.register(BathTires.YELLOW_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.YELLOW));
+        EntityRendererRegistry.register(BathTires.LIME_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIME));
+        EntityRendererRegistry.register(BathTires.PINK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PINK));
+        EntityRendererRegistry.register(BathTires.GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GRAY));
+        EntityRendererRegistry.register(BathTires.LIGHT_GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_GRAY));
+        EntityRendererRegistry.register(BathTires.CYAN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.CYAN));
+        EntityRendererRegistry.register(BathTires.PURPLE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PURPLE));
+        EntityRendererRegistry.register(BathTires.BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLUE));
+        EntityRendererRegistry.register(BathTires.BROWN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BROWN));
+        EntityRendererRegistry.register(BathTires.GREEN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GREEN));
+        EntityRendererRegistry.register(BathTires.RED_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.RED));
+        EntityRendererRegistry.register(BathTires.BLACK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLACK));
 
-        EntityRendererRegistry.INSTANCE.register(BathTires.DUCK_BATH_TIRE, DuckBathTireRenderer::new);
+        EntityRendererRegistry.register(BathTires.DUCK_BATH_TIRE, DuckBathTireRenderer::new);
 
 
         registerBlockColor(DecorativeMain.BirdBath, Blocks.WATER);
@@ -81,12 +80,12 @@ public class DecorativeClient implements ClientModInitializer {
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.WallClock);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),DecorativeMain.BirdBath);
 
-        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.CeilingFanBlockEntity, CeilingFanRenderer::new);
+        BlockEntityRendererRegistry.register(BlockEntities.CeilingFanBlockEntity, CeilingFanRenderer::new);
 
-        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntityRenderer::new);
+        BlockEntityRendererRegistry.register(BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntityRenderer::new);
 
-        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.WallClockBlockEntity, WallClockRenderer::new);
-        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.DigitalClockBlockEntity, DigitalClockRenderer::new);
+        BlockEntityRendererRegistry.register(BlockEntities.WallClockBlockEntity, WallClockRenderer::new);
+        BlockEntityRendererRegistry.register(BlockEntities.DigitalClockBlockEntity, DigitalClockRenderer::new);
     }
     public void registerBlockColor(Block block, Block templateBlock) {
         ColorProviderRegistry.BLOCK.register((type, pos, world, layer) -> {
@@ -94,5 +93,4 @@ public class DecorativeClient implements ClientModInitializer {
             return provider == null ? -1 : provider.getColor(type, pos, world, layer);
         }, block);
     }
-
 }

src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java

@@ -9,7 +9,6 @@ import eu.midnightdust.motschen.decorative.blockstates.Program;
 import eu.midnightdust.motschen.decorative.config.DecorativeConfig;
 import eu.midnightdust.motschen.decorative.init.*;
 import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
-import eu.midnightdust.motschen.decorative.world.OreFeatureInjector;
 import eu.midnightdust.motschen.decorative.world.OreFeatures;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
@@ -113,7 +112,6 @@ public class DecorativeMain implements ModInitializer {
         DoubleLamps.init();
         Clocks.init();
         OreFeatures.init();
-        OreFeatureInjector.init();
         new DecorativeSoundEvents();
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java

@@ -3,12 +3,20 @@ package eu.midnightdust.motschen.decorative.block;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.block.cauldron.CauldronBehavior;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.potion.PotionUtil;
+import net.minecraft.potion.Potions;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
@@ -25,6 +33,35 @@ public class BirdBath extends AbstractCauldronBlock {
         super(FabricBlockSettings.copy(Blocks.WATER_CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE), CauldronBehavior.WATER_CAULDRON_BEHAVIOR);
     }
     @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ItemStack itemStack = player.getStackInHand(hand);
+        if (itemStack.getItem().equals(Items.WATER_BUCKET) || (itemStack.getItem().equals(Items.POTION) && PotionUtil.getPotion(itemStack).equals(Potions.WATER))) {
+            if (itemStack.getItem().equals(Items.WATER_BUCKET)) {
+                world.setBlockState(pos, state.with(LEVEL, 3));
+                if (!player.isCreative()) player.setStackInHand(hand, new ItemStack(Items.BUCKET));
+                return ActionResult.SUCCESS;
+            }
+            else if (!state.get(LEVEL).equals(3)) {
+                world.setBlockState(pos, state.with(LEVEL, state.get(LEVEL) + 1));
+                if (!player.isCreative()) player.setStackInHand(hand, new ItemStack(Items.GLASS_BOTTLE));
+                return ActionResult.SUCCESS;
+            }
+        }
+        if (itemStack.getItem().equals(Items.BUCKET) || (itemStack.getItem().equals(Items.GLASS_BOTTLE))) {
+            if (itemStack.getItem().equals(Items.BUCKET) && state.get(LEVEL).equals(3)) {
+                world.setBlockState(pos, state.with(LEVEL, 0));
+                if (!player.isCreative()) player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET));
+                return ActionResult.SUCCESS;
+            }
+            else if (!itemStack.getItem().equals(Items.BUCKET) && !state.get(LEVEL).equals(0)) {
+                world.setBlockState(pos, state.with(LEVEL, state.get(LEVEL) - 1));
+                if (!player.isCreative()) player.setStackInHand(hand, PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER));
+                return ActionResult.SUCCESS;
+            }
+        }
+        return ActionResult.FAIL;
+    }
+    @Override
     public boolean isFull(BlockState state) {
         return state.get(LEVEL) == 3;
     }

src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java

@@ -72,24 +72,28 @@ public class Springboard extends HorizontalFacingBlock {
                     } else {
                         arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH));
                     }
+                    break;
                 case EAST:
                     if (!arg.getBlockState(pos.east()).isAir()) {
                         arg.breakBlock(pos, true);
                     } else {
                         arg.setBlockState(pos.east(), state.with(PART, Part.FRONT).with(FACING, Direction.EAST));
                     }
+                    break;
                 case SOUTH:
                     if (!arg.getBlockState(pos.south()).isAir()) {
                         arg.breakBlock(pos, true);
                     } else {
                         arg.setBlockState(pos.south(), state.with(PART, Part.FRONT).with(FACING, Direction.SOUTH));
                     }
+                    break;
                 case WEST:
                     if (!arg.getBlockState(pos.west()).isAir()) {
                         arg.breakBlock(pos, true);
                     } else {
                         arg.setBlockState(pos.west(), state.with(PART, Part.FRONT).with(FACING, Direction.WEST));
                     }
+                    break;
             }
         }
     }
@@ -98,23 +102,47 @@ public class Springboard extends HorizontalFacingBlock {
         switch (state.get(PART)) {
             case BACK: switch (state.get(FACING)) {
                 case NORTH:
-                    if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.north(), true);}
+                    if (world.getBlockState(pos.north()).contains(PART)) {
+                        world.breakBlock(pos.north(), true);
+                        break;
+                    }
                 case EAST:
-                    if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.east(), true);}
+                    if (world.getBlockState(pos.east()).contains(PART)) {
+                        world.breakBlock(pos.east(), true);
+                        break;
+                    }
                 case SOUTH:
-                    if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true);}
+                    if (world.getBlockState(pos.south()).contains(PART)) {
+                        world.breakBlock(pos.south(), true);
+                        break;
+                    }
                 case WEST:
-                    if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.west(), true);}
+                    if (world.getBlockState(pos.west()).contains(PART)) {
+                        world.breakBlock(pos.west(), true);
+                        break;
+                    }
             }
             case FRONT: switch (state.get(FACING)) {
                 case NORTH:
-                    if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    if (world.getBlockState(pos.south()).contains(PART)) {
+                        world.breakBlock(pos.south(), true);
+                        break;
+                    }
                 case EAST:
-                    if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    if (world.getBlockState(pos.west()).contains(PART)) {
+                        world.breakBlock(pos.west(), true);
+                        break;
+                    }
                 case SOUTH:
-                    if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    if (world.getBlockState(pos.north()).contains(PART)) {
+                        world.breakBlock(pos.north(), true);
+                        break;
+                    }
                 case WEST:
-                    if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    if (world.getBlockState(pos.east()).contains(PART)) {
+                        world.breakBlock(pos.east(), true);
+                        break;
+                    }
             }
         }
     }
@@ -213,7 +241,7 @@ public class Springboard extends HorizontalFacingBlock {
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
-        return !worldView.isAir(pos.down());
+        return !worldView.isAir(pos.down()) && worldView.getBlockState(pos.offset(state.get(FACING))) == Blocks.AIR.getDefaultState();
     }
 
 }

src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java

@@ -71,7 +71,7 @@ public class DigitalClockRenderer implements BlockEntityRenderer<DigitalClockBlo
         matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
         matrices.translate(0,0,-0.1);
         matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(180));
-        textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getModel(), vertexConsumers, false, 0, light);
+        textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getPositionMatrix(), vertexConsumers, false, 0, light);
         matrices.pop();
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java

@@ -7,13 +7,16 @@ import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.fluid.FluidState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagKey;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 
 public class BathTireEntity extends PigEntity {
@@ -45,7 +48,7 @@ public class BathTireEntity extends PigEntity {
     }
 
     @Override
-    protected void swimUpward(Tag<Fluid> fluid) {
+    protected void swimUpward(TagKey<Fluid> fluid) {
         if (this.getNavigation().canSwim()) {
             super.swimUpward(fluid);
         } else {
@@ -60,7 +63,7 @@ public class BathTireEntity extends PigEntity {
     }
 
     @Override
-    public boolean canWalkOnFluid(Fluid fluid) {
+    public boolean canWalkOnFluid(FluidState fluid) {
         return true;
     }
 
@@ -104,7 +107,14 @@ public class BathTireEntity extends PigEntity {
 
     @Override
     public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) {
-        if(!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND)
+        if (!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND && player.isSneaking())
+        {
+            this.remove(RemovalReason.DISCARDED);
+            System.out.println(Identifier.tryParse(this.getType().getUntranslatedName()));
+            player.setStackInHand(hand, new ItemStack(Registry.ITEM.get(Identifier.tryParse("decorative:"+this.getType().getUntranslatedName()))));
+            return ActionResult.SUCCESS;
+        }
+        else if (!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND && !player.isSneaking())
         {
             player.startRiding(this,true);
             return ActionResult.SUCCESS;
@@ -120,5 +130,8 @@ public class BathTireEntity extends PigEntity {
         }
     }
 
-
+    @Override
+    protected int getXpToDrop(PlayerEntity player) {
+        return 0;
+    }
 }

src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java

@@ -8,9 +8,10 @@ import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.fluid.FluidState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagKey;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -46,7 +47,7 @@ public class BeachBallEntity extends PigEntity {
     }
 
     @Override
-    protected void swimUpward(Tag<Fluid> fluid) {
+    protected void swimUpward(TagKey<Fluid> fluid) {
             this.setVelocity(this.getVelocity().add(0.0D, 1.0D, 0.0D));
     }
 
@@ -56,7 +57,7 @@ public class BeachBallEntity extends PigEntity {
     }
 
     @Override
-    public boolean canWalkOnFluid(Fluid fluid) {
+    public boolean canWalkOnFluid(FluidState fluid) {
         return true;
     }
 

src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java

@@ -11,7 +11,7 @@ import net.minecraft.util.Identifier;
 
 @Environment(EnvType.CLIENT)
 public class BathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
-    private static Identifier TEXTURE;
+    private final Identifier TEXTURE;
     public BathTireRenderer(EntityRendererFactory.Context context, DyeColor color) {
         super(context, new BathTireModel(context.getPart(BathTireModel.BATH_TIRE_MODEL_LAYER)), 0.5F);
         TEXTURE = Identifier.tryParse("textures/block/"+color.getName()+"_concrete.png");

src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java

@@ -39,7 +39,7 @@ public class BathTireItem extends Item {
             if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) {
                 return TypedActionResult.pass(itemStack);
             } else if (world.canPlayerModifyAt(user, blockPos) && user.canPlaceOn(blockPos, blockHitResult.getSide(), itemStack)) {
-                EntityType<?> entityType = this.getEntityType(itemStack.getTag());
+                EntityType<?> entityType = this.getEntityType(itemStack.getNbt());
                 if (entityType.spawnFromItemStack((ServerWorld) world, itemStack, user, blockPos.up(1), SpawnReason.SPAWN_EGG, false, false) == null) {
                     return TypedActionResult.pass(itemStack);
                 } else {

src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java

@@ -1,19 +0,0 @@
-package eu.midnightdust.motschen.decorative.mixin;
-
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-@Mixin(GenerationSettings.class)
-public interface GenerationSettingsAccessorMixin {
-
-    @Accessor
-    List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
-
-    @Accessor
-    void setFeatures(List<List<Supplier<ConfiguredFeature<?, ?>>>> features);
-}

src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java

@@ -1,44 +0,0 @@
-package eu.midnightdust.motschen.decorative.world;
-
-import com.google.common.collect.Lists;
-import eu.midnightdust.motschen.decorative.mixin.GenerationSettingsAccessorMixin;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
-
-public class OreFeatureInjector {
-
-    public static void init() {
-        BuiltinRegistries.BIOME.forEach(OreFeatureInjector::addToBiome);
-        RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, identifier, biome) -> addToBiome(biome));
-    }
-
-    private static void addToBiome(Biome biome) {
-        addSaltOre(biome);
-    }
-
-    private static void addSaltOre(Biome biome) {
-            if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) {
-                addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, OreFeatures.ROCKY_ASPHALT_FEATURE);
-        }
-    }
-
-    public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
-        GenerationSettingsAccessorMixin generationSettingsAccessor  = (GenerationSettingsAccessorMixin) biome.getGenerationSettings();
-        int stepIndex = step.ordinal();
-        List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures());
-        while (featuresByStep.size() <= stepIndex) {
-            featuresByStep.add(Lists.newArrayList());
-        }
-        List<Supplier<ConfiguredFeature<?, ?>>> features = new ArrayList<>(featuresByStep.get(stepIndex));
-        features.add(() -> feature);
-        featuresByStep.set(stepIndex, features);
-        generationSettingsAccessor.setFeatures(featuresByStep);
-    }
-}

src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java

@@ -1,17 +1,36 @@
 package eu.midnightdust.motschen.decorative.world;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
+import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
+import net.minecraft.tag.BiomeTags;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.OreFeatureConfig;
+import net.minecraft.util.registry.RegistryEntry;
+import net.minecraft.world.gen.GenerationStep;
+import net.minecraft.world.gen.YOffset;
+import net.minecraft.world.gen.feature.*;
+import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
+import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
+import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
+
+import java.util.List;
 
 public class OreFeatures {
-    public static final ConfiguredFeature<?, ?> ROCKY_ASPHALT_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, DecorativeMain.RockyAsphalt.getDefaultState(), 7)).applyChance(200).spreadHorizontally().repeat(20);
+    private static final ConfiguredFeature<?, ?> ROCKY_ASPHALT_FEATURE = new ConfiguredFeature<>(Feature.ORE, new OreFeatureConfig(
+                    OreConfiguredFeatures.STONE_ORE_REPLACEABLES, DecorativeMain.RockyAsphalt.getDefaultState(),10));
+    public static PlacedFeature ROCKY_ASPHALT_PLACED_FEATURE = new PlacedFeature(
+            RegistryEntry.of(ROCKY_ASPHALT_FEATURE),
+            List.of(
+                    CountPlacementModifier.of(40),
+                    SquarePlacementModifier.of(),
+                    HeightRangePlacementModifier.uniform(YOffset.BOTTOM, YOffset.TOP)
+            ));
 
     public static void init() {
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(DecorativeMain.MOD_ID, "rocky_asphalt"), ROCKY_ASPHALT_FEATURE);
+        Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier(DecorativeMain.MOD_ID, "placed_rocky_asphalt"), ROCKY_ASPHALT_PLACED_FEATURE);
+        BiomeModifications.addFeature(biome -> (!biome.hasTag(BiomeTags.IS_NETHER) && !biome.hasTag(BiomeTags.END_CITY_HAS_STRUCTURE)),
+                GenerationStep.Feature.UNDERGROUND_ORES, BuiltinRegistries.PLACED_FEATURE.getKey(OreFeatures.ROCKY_ASPHALT_PLACED_FEATURE).get());
     }
 }

src/main/resources/data/decorative/recipes/black_lamp.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "#": {
-            "item": "minecraft:white_wool"
+            "item": "minecraft:black_wool"
         },
         "R": {
             "item": "minecraft:redstone_lamp"
@@ -17,7 +17,7 @@
         }
     },
     "result": {
-        "item": "minecraft:white_concrete_powder",
+        "item": "decorative:black_lamp",
         "count": 1
     }
-}
+}

src/main/resources/decorative.mixins.json

@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "eu.midnightdust.motschen.decorative.mixin",
-  "compatibilityLevel": "JAVA_16",
-  "mixins": [
-    "GenerationSettingsAccessorMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

src/main/resources/fabric.mod.json

@@ -25,16 +25,9 @@
     ],
     "client": [
       "eu.midnightdust.motschen.decorative.DecorativeClient"
-    ],
-    "modmenu": [
-      "eu.midnightdust.motschen.decorative.config.ModMenuIntegration"
     ]
   },
 
-  "mixins": [
-    "decorative.mixins.json"
-  ],
-
   "depends": {
     "fabric": "*",
     "midnightlib": "*"