diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index e5d8d28..8dfbaea --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,7 @@ # gradle .gradle/ -build/classes/ -build/generated/ -build/libs/ -build/resources/ -build/tmp/ +build/ out/ classes/ @@ -26,4 +22,4 @@ bin/ # fabric -run/ \ No newline at end of file +run/ diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index d6df447..505119f --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = project.mod_version @@ -23,59 +23,53 @@ dependencies { //to change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modCompile("vazkii.patchouli:Patchouli:${project.patchouli_version}"){ - exclude module: "fabric-api" - } +// modImplementation("vazkii.patchouli:Patchouli:${project.patchouli_version}"){ +// exclude module: "fabric-api" +// } - modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"){ - exclude module: "fabric-api" - } - modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}"){ - exclude module: "fabric-api" - } modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}"){ exclude module: "fabric-api" } - modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}" - include "eu.midnightdust:midnight-hats:${midnighthats_version}" + modImplementation "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}" + include "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}" } processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching("fabric.mod.json") { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 16 } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } } // configure the maven publication @@ -92,9 +86,11 @@ publishing { } } - // select the repositories you want to publish to + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // uncomment to publish to the local maven - // mavenLocal() + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. } } diff --git a/build/loom-cache/midnight-hats-2.0.1.jar b/build/loom-cache/midnight-hats-2.0.1.jar old mode 100644 new mode 100755 diff --git a/build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny b/build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny old mode 100644 new mode 100755 index afd84f3..a45443c --- a/build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny +++ b/build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny @@ -1 +1 @@ -v1 named intermediary +v1 named intermediary diff --git a/build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny b/build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny old mode 100644 new mode 100755 index afd84f3..a45443c --- a/build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny +++ b/build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny @@ -1 +1 @@ -v1 named intermediary +v1 named intermediary diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index 97b3a1e..44c5839 --- a/gradle.properties +++ b/gradle.properties @@ -3,21 +3,18 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.4 - yarn_mappings=1.16.4+build.9 - loader_version=0.10.8 + minecraft_version=1.17-pre1 + yarn_mappings=1.17-pre1+build.9 + loader_version=0.11.3 # Mod Properties - mod_version = 4.0.0 + mod_version = 4.1.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.30.0+1.16 - patchouli_version=1.16.4-48-FABRIC - midnighthats_version=2.0.1 - - auto_config_version = 3.3.1 - cloth_config_version = 4.8.3 - mod_menu_version = 1.16.5 + 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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 index 5c2d1cf..e708b1c Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index 4b7e1f3..e5338d3 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 8e25e6c..4f906e0 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ 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 @@ -125,10 +126,11 @@ 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 +# 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 @@ -154,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + 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" ;; + 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 @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# 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 - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 9618d8d..107acd3 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ 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" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ 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 %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java old mode 100644 new mode 100755 index e1ec157..cbdcaf7 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java @@ -1,6 +1,11 @@ package eu.midnightdust.motschen.decorative; import eu.midnightdust.motschen.decorative.block.render.*; +import eu.midnightdust.motschen.decorative.block.render.model.CeilingFanBladesModel; +import eu.midnightdust.motschen.decorative.block.render.model.WallClockHandsModel; +import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; +import eu.midnightdust.motschen.decorative.entity.client.model.BeachBallModel; +import eu.midnightdust.motschen.decorative.entity.client.model.DuckBathTireModel; import eu.midnightdust.motschen.decorative.entity.client.renderer.*; import eu.midnightdust.motschen.decorative.init.BathTires; import eu.midnightdust.motschen.decorative.init.BlockEntities; @@ -9,38 +14,47 @@ 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.ColorProviderRegistry; 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 public void onInitializeClient() { + EntityModelLayerRegistry.registerModelLayer(BathTireModel.BATH_TIRE_MODEL_LAYER, BathTireModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(DuckBathTireModel.DUCK_BATH_TIRE_MODEL_LAYER, DuckBathTireModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(BeachBallModel.BEACH_BALL_MODEL_LAYER, BeachBallModel::getTexturedModelData); - EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, (dispatcher, context) -> new BeachBallRenderer(dispatcher)); + EntityModelLayerRegistry.registerModelLayer(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER, CeilingFanBladesModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER, WallClockHandsModel::getTexturedModelData); - EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (dispatcher, context) -> new WhiteBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.ORANGE_BATH_TIRE, (dispatcher, context) -> new OrangeBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.MAGENTA_BATH_TIRE, (dispatcher, context) -> new MagentaBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_BLUE_BATH_TIRE, (dispatcher, context) -> new LightBlueBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.YELLOW_BATH_TIRE, (dispatcher, context) -> new YellowBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.LIME_BATH_TIRE, (dispatcher, context) -> new LimeBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.PINK_BATH_TIRE, (dispatcher, context) -> new PinkBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.GRAY_BATH_TIRE, (dispatcher, context) -> new GrayBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_GRAY_BATH_TIRE, (dispatcher, context) -> new LightGrayBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.CYAN_BATH_TIRE, (dispatcher, context) -> new CyanBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.PURPLE_BATH_TIRE, (dispatcher, context) -> new PurpleBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.BLUE_BATH_TIRE, (dispatcher, context) -> new BlueBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.BROWN_BATH_TIRE, (dispatcher, context) -> new BrownBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.GREEN_BATH_TIRE, (dispatcher, context) -> new GreenBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.RED_BATH_TIRE, (dispatcher, context) -> new RedBathTireRenderer(dispatcher)); - EntityRendererRegistry.INSTANCE.register(BathTires.BLACK_BATH_TIRE, (dispatcher, context) -> new BlackBathTireRenderer(dispatcher)); + EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, BeachBallRenderer::new); - EntityRendererRegistry.INSTANCE.register(BathTires.DUCK_BATH_TIRE, (dispatcher, context) -> new DuckBathTireRenderer(dispatcher)); + 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.INSTANCE.register(BathTires.DUCK_BATH_TIRE, DuckBathTireRenderer::new); registerBlockColor(DecorativeMain.BirdBath, Blocks.WATER); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java old mode 100644 new mode 100755 index e7ae039..dbbbea4 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java @@ -1,5 +1,6 @@ package eu.midnightdust.motschen.decorative; +import eu.midnightdust.lib.config.MidnightConfig; import eu.midnightdust.motschen.decorative.block.*; import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; import eu.midnightdust.motschen.decorative.blockstates.Part; @@ -10,8 +11,6 @@ import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents; import eu.midnightdust.motschen.decorative.world.OreFeatureInjector; import eu.midnightdust.motschen.decorative.world.OreFeatures; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -22,9 +21,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; + public class DecorativeMain implements ModInitializer { public static final String MOD_ID = "decorative"; - public static DecorativeConfig DECORATIVE_CONFIG; public static final ItemGroup IndoorGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "indoor"), () -> new ItemStack(DecorativeMain.Television)); public static final ItemGroup TrafficGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "traffic"), () -> new ItemStack(DecorativeMain.TrafficCone)); @@ -57,10 +56,10 @@ public class DecorativeMain implements ModInitializer { @Override public void onInitialize() { - AutoConfig.register(DecorativeConfig.class, JanksonConfigSerializer::new); - DECORATIVE_CONFIG = AutoConfig.getConfigHolder(DecorativeConfig.class).getConfig(); + MidnightConfig.init("decorative", DecorativeConfig.class); BlockEntities.init(); + // Traffic // Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"rocky_asphalt"), RockyAsphalt); Registry.register(Registry.ITEM, new Identifier(MOD_ID,"rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup))); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java b/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java old mode 100644 new mode 100755 index ea384fe..4d0c1e8 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java @@ -2,33 +2,72 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; +import net.minecraft.block.cauldron.CauldronBehavior; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.IntProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldView; -public class BirdBath extends CauldronBlock { +import java.util.Objects; + +public class BirdBath extends AbstractCauldronBlock { private static final VoxelShape SHAPE; + public static final IntProperty LEVEL = IntProperty.of("level",0,3); public BirdBath() { - super(FabricBlockSettings.copy(Blocks.CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.copy(Blocks.WATER_CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE), CauldronBehavior.WATER_CAULDRON_BEHAVIOR); + } + @Override + public boolean isFull(BlockState state) { + return state.get(LEVEL) == 3; + } + + @Override + protected boolean canBeFilledByDripstone(Fluid fluid) { + return fluid == Fluids.WATER; + } + @Override + protected double getFluidHeight(BlockState state) { + return (6.0D + (double)state.get(LEVEL) * 3.0D) / 16.0D; + } + + @Override + public int getComparatorOutput(BlockState state, World world, BlockPos pos) { + return state.get(LEVEL); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(LEVEL); + } + @Override + protected void fillFromDripstone(BlockState state, World world, BlockPos pos, Fluid fluid) { + if (!this.isFull(state)) { + world.setBlockState(pos, state.with(LEVEL, state.get(LEVEL) + 1)); + world.syncWorldEvent(1047, pos, 0); + } } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(LEVEL, 0); } + @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { return SHAPE; } static { - VoxelShape shape = createCuboidShape(4, 0, 4, 12, 9, 12); - SHAPE = shape; + SHAPE = createCuboidShape(4, 0, 4, 12, 9, 12); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java b/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java old mode 100644 new mode 100755 index 164f1b8..b05bad1 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java @@ -3,9 +3,13 @@ import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; import eu.midnightdust.motschen.decorative.DecorativeMain; import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.BrewingStandBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; @@ -21,8 +25,9 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; -public class CeilingFan extends Block implements BlockEntityProvider { +public class CeilingFan extends BlockWithEntity implements BlockEntityProvider { private static final VoxelShape SHAPE; private static final EnumProperty STAGE = DecorativeMain.STAGE; @@ -32,8 +37,17 @@ public CeilingFan() { } @Override - public BlockEntity createBlockEntity(BlockView view) { - return new CeilingFanBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new CeilingFanBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.CeilingFanBlockEntity, CeilingFanBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java old mode 100644 new mode 100755 index 2e0b51d..6a09128 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java @@ -1,18 +1,26 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; -public class ChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { +import java.util.Objects; + +public class ChoppingLog extends BlockWithEntity implements BlockEntityProvider { + private static final DirectionProperty FACING = HorizontalFacingBlock.FACING; public ChoppingLog() { super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); @@ -21,7 +29,7 @@ public ChoppingLog() { @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); } @@ -35,8 +43,17 @@ public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { } @Override - public BlockEntity createBlockEntity(BlockView view) { - return new ChoppingLogBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new ChoppingLogBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasTree.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasTree.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java b/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java old mode 100644 new mode 100755 index 329237a..ba6c736 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java @@ -1,20 +1,26 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity; -import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; -public class DigitalClock extends HorizontalFacingBlock implements BlockEntityProvider { +public class DigitalClock extends BlockWithEntity implements BlockEntityProvider { + private static final DirectionProperty FACING = HorizontalFacingBlock.FACING; private static final VoxelShape NORTH_SHAPE; private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; @@ -26,8 +32,17 @@ public DigitalClock() { } @Override - public BlockEntity createBlockEntity(BlockView view) { - return new DigitalClockBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new DigitalClockBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.DigitalClockBlockEntity, DigitalClockBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java b/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/FireHydrant.java b/src/main/java/eu/midnightdust/motschen/decorative/block/FireHydrant.java old mode 100644 new mode 100755 index c4df968..690b8ea --- a/src/main/java/eu/midnightdust/motschen/decorative/block/FireHydrant.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/FireHydrant.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; import net.minecraft.item.Items; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; @@ -36,14 +37,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) { if (itemStack.getItem() == Items.BUCKET) { if (!world.isClient) { - if (!player.abilities.creativeMode) { - itemStack.decrement(1); - if (itemStack.isEmpty()) { - player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET)); - } else if (!player.inventory.insertStack(new ItemStack(Items.WATER_BUCKET))) { - player.dropItem(new ItemStack(Items.WATER_BUCKET), false); - } - } + ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET)); world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); } return ActionResult.SUCCESS; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Guardrail.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Guardrail.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java b/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/PoolSprinkler.java b/src/main/java/eu/midnightdust/motschen/decorative/block/PoolSprinkler.java old mode 100644 new mode 100755 index 60d7748..20a9699 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/PoolSprinkler.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/PoolSprinkler.java @@ -1,9 +1,12 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.block.blockentity.PoolSprinklerBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; @@ -11,6 +14,7 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -21,14 +25,18 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; -public class PoolSprinkler extends HorizontalFacingBlock implements BlockEntityProvider { +import java.util.Objects; +public class PoolSprinkler extends BlockWithEntity implements BlockEntityProvider { + public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; + public static final BooleanProperty POWERED = DoorBlock.POWERED; private static final VoxelShape NORTH_SHAPE; private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; private static final VoxelShape WEST_SHAPE; - public static final BooleanProperty POWERED = DoorBlock.POWERED; + public PoolSprinkler() { super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); @@ -36,14 +44,14 @@ public PoolSprinkler() { } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - world.setBlockState(pos, state.with(POWERED, Boolean.valueOf(!state.get(POWERED)))); + world.setBlockState(pos, state.with(POWERED, !state.get(POWERED))); world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f); return ActionResult.SUCCESS; } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()) .with(POWERED, Boolean.FALSE); } @@ -89,8 +97,17 @@ public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { return !worldView.isAir(pos.down()); } @Override - public BlockEntity createBlockEntity(BlockView world) { - return new PoolSprinklerBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new PoolSprinklerBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.PoolSprinklerBlockEntity, PoolSprinklerBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java b/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/RotatableBlock.java b/src/main/java/eu/midnightdust/motschen/decorative/block/RotatableBlock.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ShowerHead.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ShowerHead.java old mode 100644 new mode 100755 index a41bcdb..f740daa --- a/src/main/java/eu/midnightdust/motschen/decorative/block/ShowerHead.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/ShowerHead.java @@ -1,9 +1,12 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.block.blockentity.ShowerHeadBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; @@ -11,6 +14,7 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -21,14 +25,16 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; -public class ShowerHead extends HorizontalFacingBlock implements BlockEntityProvider { - +public class ShowerHead extends BlockWithEntity implements BlockEntityProvider { + private static final DirectionProperty FACING = HorizontalFacingBlock.FACING; + public static final BooleanProperty POWERED = DoorBlock.POWERED; private static final VoxelShape NORTH_SHAPE; private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; private static final VoxelShape WEST_SHAPE; - public static final BooleanProperty POWERED = DoorBlock.POWERED; + public ShowerHead() { super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); @@ -36,7 +42,7 @@ public ShowerHead() { } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - world.setBlockState(pos, state.with(POWERED, Boolean.valueOf(!state.get(POWERED)))); + world.setBlockState(pos, state.with(POWERED, !state.get(POWERED))); world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f); return ActionResult.SUCCESS; } @@ -91,8 +97,17 @@ public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { return !worldView.isAir(pos.north()) | !worldView.isAir(pos.east()) | !worldView.isAir(pos.south()) | !worldView.isAir(pos.west()); } @Override - public BlockEntity createBlockEntity(BlockView world) { - return new ShowerHeadBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new ShowerHeadBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.ShowerHeadBlockEntity, ShowerHeadBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Sign.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Sign.java old mode 100644 new mode 100755 index 7835372..9899f5f --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Sign.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Sign.java @@ -35,13 +35,13 @@ protected void appendProperties(StateManager.Builder builder) } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return switch (state.get(FACING)) { + case NORTH -> NORTH_SHAPE; + case EAST -> EAST_SHAPE; + case SOUTH -> SOUTH_SHAPE; + case WEST -> WEST_SHAPE; + default -> super.getOutlineShape(state, view, pos, context); + }; } static { VoxelShape shape = createCuboidShape(0, 0, 6.9, 16, 16, 9); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/SignPost.java b/src/main/java/eu/midnightdust/motschen/decorative/block/SignPost.java old mode 100644 new mode 100755 index 2045822..9f05633 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/SignPost.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/SignPost.java @@ -23,9 +23,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos return SHAPE; } static { - VoxelShape shape = createCuboidShape(7, 0, 7, 9, 16, 9); - - SHAPE = shape; + SHAPE = createCuboidShape(7, 0, 7, 9, 16, 9); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/SlidingDoor.java b/src/main/java/eu/midnightdust/motschen/decorative/block/SlidingDoor.java old mode 100644 new mode 100755 index 4a9b705..be3c830 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/SlidingDoor.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/SlidingDoor.java @@ -43,16 +43,12 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po state.get(FACING); boolean bl = !state.get(OPEN); boolean bl2 = state.get(HINGE) == DoorHinge.RIGHT; - switch(state.get(FACING)) { - default: - return bl ? WEST_SHAPE : (bl2 ? EAST_SHAPE_OPEN : WEST_SHAPE_OPEN); - case NORTH: - return bl ? NORTH_SHAPE : (bl2 ? SOUTH_SHAPE_OPEN : NORTH_SHAPE_OPEN); - case EAST: - return bl ? EAST_SHAPE : (bl2 ? WEST_SHAPE_OPEN : EAST_SHAPE_OPEN); - case SOUTH: - return bl ? SOUTH_SHAPE : (bl2 ? NORTH_SHAPE_OPEN : SOUTH_SHAPE_OPEN); - } + return switch (state.get(FACING)) { + default -> bl ? WEST_SHAPE : (bl2 ? EAST_SHAPE_OPEN : WEST_SHAPE_OPEN); + case NORTH -> bl ? NORTH_SHAPE : (bl2 ? SOUTH_SHAPE_OPEN : NORTH_SHAPE_OPEN); + case EAST -> bl ? EAST_SHAPE : (bl2 ? WEST_SHAPE_OPEN : EAST_SHAPE_OPEN); + case SOUTH -> bl ? SOUTH_SHAPE : (bl2 ? NORTH_SHAPE_OPEN : SOUTH_SHAPE_OPEN); + }; } static { VoxelShape shape = createCuboidShape(0, 0, 7, 16, 16, 9); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java old mode 100644 new mode 100755 index fa4784d..9e8468c --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java @@ -24,6 +24,8 @@ import net.minecraft.world.World; import net.minecraft.world.WorldView; +import java.util.Objects; + public class Springboard extends HorizontalFacingBlock { private static final VoxelShape NORTH_SHAPE_FRONT; private static final VoxelShape EAST_SHAPE_FRONT; @@ -43,68 +45,52 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt ItemStack itemStack = player.getStackInHand(hand); if (!world.isClient) { if (itemStack.isEmpty() && hand==Hand.MAIN_HAND) { - switch (state.get(PART)) { - case FRONT: - if (player.getY() >= pos.getY()+0.1 && player.squaredDistanceTo(pos.getX(), pos.getY(), pos.getZ()) <= 1.0) { - player.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 10, 10)); - return ActionResult.SUCCESS; - } - else return ActionResult.FAIL; - default: - return ActionResult.FAIL; + if (state.get(PART) == Part.FRONT) { + if (player.getY() >= pos.getY() + 0.1 && player.squaredDistanceTo(pos.getX(), pos.getY(), pos.getZ()) <= 1.0) { + player.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 10, 10)); + return ActionResult.SUCCESS; + } } } - else return ActionResult.FAIL; } - else return ActionResult.FAIL; + return ActionResult.FAIL; } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing()) .with(PART, Part.BACK); } @Override public void onPlaced(World arg, BlockPos pos, BlockState state, LivingEntity arg4, ItemStack arg5) { - switch (state.get(PART)) { - case BACK: switch (state.get(FACING)) { + if (state.get(PART) == Part.BACK) { + switch (state.get(FACING)) { case NORTH: if (!arg.getBlockState(pos.north()).isAir()) { arg.breakBlock(pos, true); + } else { + arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH)); } - else { - arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH)); - } - return; 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)); } - else { - arg.setBlockState(pos.east(), state.with(PART, Part.FRONT).with(FACING, Direction.EAST)); - } - return; 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)); } - else { - arg.setBlockState(pos.south(), state.with(PART, Part.FRONT).with(FACING, Direction.SOUTH)); - } - return; 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)); } - else { - arg.setBlockState(pos.west(), state.with(PART, Part.FRONT).with(FACING, Direction.WEST)); - } - return; - default: - return; } - default: return; } } @Override @@ -113,37 +99,23 @@ public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity pl case BACK: switch (state.get(FACING)) { case NORTH: if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.north(), true);} - return; case EAST: if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.east(), true);} - return; case SOUTH: if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true);} - - return; case WEST: if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.west(), true);} - return; - default: - return; } case FRONT: switch (state.get(FACING)) { case NORTH: if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true); } - return; case EAST: if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.south(), true); } - return; case SOUTH: if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.south(), true); } - return; case WEST: if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.south(), true); } - return; - default: - return; } - default: return; } } @@ -154,13 +126,25 @@ protected void appendProperties(StateManager.Builder builder) } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: switch (state.get(PART)) { case FRONT: return NORTH_SHAPE_FRONT; case BACK: return NORTH_SHAPE_BACK;} - case EAST: switch (state.get(PART)) { case FRONT: return EAST_SHAPE_FRONT; case BACK: return EAST_SHAPE_BACK;} - case SOUTH: switch (state.get(PART)) { case FRONT: return SOUTH_SHAPE_FRONT; case BACK: return SOUTH_SHAPE_BACK;} - case WEST: switch (state.get(PART)) { case FRONT: return WEST_SHAPE_FRONT; case BACK: return WEST_SHAPE_BACK;} - default: return super.getOutlineShape(state, view, pos, context); - } + return switch (state.get(FACING)) { + case NORTH -> switch (state.get(PART)) { + case FRONT -> NORTH_SHAPE_FRONT; + case BACK -> NORTH_SHAPE_BACK; + }; + case EAST -> switch (state.get(PART)) { + case FRONT -> EAST_SHAPE_FRONT; + case BACK -> EAST_SHAPE_BACK; + }; + case SOUTH -> switch (state.get(PART)) { + case FRONT -> SOUTH_SHAPE_FRONT; + case BACK -> SOUTH_SHAPE_BACK; + }; + case WEST -> switch (state.get(PART)) { + case FRONT -> WEST_SHAPE_FRONT; + case BACK -> WEST_SHAPE_BACK; + }; + default -> super.getOutlineShape(state, view, pos, context); + }; } static { //long_plank diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.java b/src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.java old mode 100644 new mode 100755 index 935304b..64e79ff --- a/src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.java @@ -24,9 +24,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos return SHAPE; } static { - VoxelShape shape = createCuboidShape(0, 0, 0, 16, 1, 16); - - SHAPE = shape; + SHAPE = createCuboidShape(0, 0, 0, 16, 1, 16); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java old mode 100644 new mode 100755 index 5953e29..377165e --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java @@ -23,6 +23,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldView; +import java.util.Objects; import java.util.function.ToIntFunction; public class Television extends HorizontalFacingBlock { @@ -39,29 +40,39 @@ public Television() { } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - switch (state.get(PROGRAM)) { - case OFF: world.setBlockState(pos, state.with(PROGRAM, Program.NYANCAT)); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); - return ActionResult.SUCCESS; - case NYANCAT: world.setBlockState(pos, state.with(PROGRAM, Program.CREEPER)); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); - return ActionResult.SUCCESS; - case CREEPER: world.setBlockState(pos, state.with(PROGRAM, Program.CRABRAVE)); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); - return ActionResult.SUCCESS; - case CRABRAVE: world.setBlockState(pos, state.with(PROGRAM, Program.TATER)); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); - return ActionResult.SUCCESS; - case TATER: world.setBlockState(pos, state.with(PROGRAM, Program.OFF)); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); - return ActionResult.SUCCESS; + switch (state.get(PROGRAM)) { + case OFF -> { + world.setBlockState(pos, state.with(PROGRAM, Program.NYANCAT)); + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); + return ActionResult.SUCCESS; } + case NYANCAT -> { + world.setBlockState(pos, state.with(PROGRAM, Program.CREEPER)); + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); + return ActionResult.SUCCESS; + } + case CREEPER -> { + world.setBlockState(pos, state.with(PROGRAM, Program.CRABRAVE)); + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); + return ActionResult.SUCCESS; + } + case CRABRAVE -> { + world.setBlockState(pos, state.with(PROGRAM, Program.TATER)); + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); + return ActionResult.SUCCESS; + } + case TATER -> { + world.setBlockState(pos, state.with(PROGRAM, Program.OFF)); + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f); + return ActionResult.SUCCESS; + } + } return ActionResult.SUCCESS; } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()) .with(PROGRAM, Program.OFF); } @@ -73,13 +84,13 @@ protected void appendProperties(StateManager.Builder builder) } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return switch (state.get(FACING)) { + case NORTH -> NORTH_SHAPE; + case EAST -> EAST_SHAPE; + case SOUTH -> SOUTH_SHAPE; + case WEST -> WEST_SHAPE; + default -> super.getOutlineShape(state, view, pos, context); + }; } static { VoxelShape shape = createCuboidShape(-7, 4, 7, 22, 22, 9); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/TrafficCone.java b/src/main/java/eu/midnightdust/motschen/decorative/block/TrafficCone.java old mode 100644 new mode 100755 index b0f7ec2..c534219 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/TrafficCone.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/TrafficCone.java @@ -20,9 +20,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos return SHAPE; } static { - VoxelShape shape = createCuboidShape(4, 0, 4, 12, 11.5, 12); - - SHAPE = shape; + SHAPE = createCuboidShape(4, 0, 4, 12, 11.5, 12); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/WallClock.java b/src/main/java/eu/midnightdust/motschen/decorative/block/WallClock.java old mode 100644 new mode 100755 index 7ba02f9..5e1f093 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/WallClock.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/WallClock.java @@ -1,19 +1,28 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; -public class WallClock extends HorizontalFacingBlock implements BlockEntityProvider { +import java.util.Objects; + +public class WallClock extends BlockWithEntity implements BlockEntityProvider { + private static final DirectionProperty FACING = HorizontalFacingBlock.FACING; private static final VoxelShape NORTH_SHAPE; private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; @@ -25,8 +34,17 @@ public WallClock() { } @Override - public BlockEntity createBlockEntity(BlockView view) { - return new WallClockBlockEntity(); + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new WallClockBlockEntity(pos, state); + } + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, BlockEntities.WallClockBlockEntity, WallClockBlockEntity::tick); + } + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; } @Override @@ -36,27 +54,27 @@ protected void appendProperties(StateManager.Builder builder) @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return switch (state.get(FACING)) { + case NORTH -> NORTH_SHAPE; + case EAST -> EAST_SHAPE; + case SOUTH -> SOUTH_SHAPE; + case WEST -> WEST_SHAPE; + default -> super.getOutlineShape(state, view, pos, context); + }; } static { VoxelShape shape = createCuboidShape(0, 0, 15, 16, 16, 16); NORTH_SHAPE = shape; - WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, shape); - EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, shape); - SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, shape); + WEST_SHAPE = rotate(Direction.NORTH, Direction.WEST, shape); + EAST_SHAPE = rotate(Direction.NORTH, Direction.EAST, shape); + SOUTH_SHAPE = rotate(Direction.NORTH, Direction.SOUTH, shape); } private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) { VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() }; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/WaterPump.java b/src/main/java/eu/midnightdust/motschen/decorative/block/WaterPump.java old mode 100644 new mode 100755 index e105103..44416b5 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/WaterPump.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/WaterPump.java @@ -19,6 +19,8 @@ import net.minecraft.world.World; import net.minecraft.world.WorldView; +import java.util.Objects; + public class WaterPump extends HorizontalFacingBlock { private static final VoxelShape NORTH_SHAPE; private static final VoxelShape EAST_SHAPE; @@ -34,30 +36,19 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) { if (itemStack.getItem() == Items.BUCKET) { if (!world.isClient) { - if (!player.abilities.creativeMode) { - itemStack.decrement(1); - if (itemStack.isEmpty()) { - player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET)); - } else if (!player.inventory.insertStack(new ItemStack(Items.WATER_BUCKET))) { - player.dropItem(new ItemStack(Items.WATER_BUCKET), false); - } - } + ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET)); world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); } return ActionResult.SUCCESS; } - else { - return ActionResult.PASS; - } - } - if (itemStack.isEmpty()) { return ActionResult.PASS; - } return ActionResult.PASS; + } + return ActionResult.PASS; } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) + return Objects.requireNonNull(super.getPlacementState(itemPlacementContext)) .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); } @@ -67,13 +58,13 @@ protected void appendProperties(StateManager.Builder builder) } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return switch (state.get(FACING)) { + case NORTH -> NORTH_SHAPE; + case EAST -> EAST_SHAPE; + case SOUTH -> SOUTH_SHAPE; + case WEST -> WEST_SHAPE; + default -> super.getOutlineShape(state, view, pos, context); + }; } static { VoxelShape shape = createCuboidShape(4.25, 0, 0, 11.75, 24, 14); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java old mode 100644 new mode 100755 index 37c0724..500428b --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java @@ -5,55 +5,45 @@ import eu.midnightdust.motschen.decorative.init.BlockEntities; import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents; import net.minecraft.block.BlockState; +import net.minecraft.block.BrewingStandBlock; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BrewingStandBlockEntity; import net.minecraft.sound.SoundCategory; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import java.time.LocalTime; -public class CeilingFanBlockEntity extends BlockEntity implements Tickable { +public class CeilingFanBlockEntity extends BlockEntity { private int rot; private int second; - public CeilingFanBlockEntity() { - super(BlockEntities.CeilingFanBlockEntity); + public CeilingFanBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.CeilingFanBlockEntity, pos, state); } - - - @Override - public void tick() { - - BlockPos pos = this.pos; - BlockState state = this.world.getBlockState(pos); - if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_1) { - if (LocalTime.now().getSecond() != second) { - second = LocalTime.now().getSecond(); + public static void tick(World world, BlockPos pos, BlockState state, CeilingFanBlockEntity blockEntity) { + if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_1) { + if (LocalTime.now().getSecond() != blockEntity.second) { + blockEntity.second = LocalTime.now().getSecond(); world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.1f, 1.0f); } - rot = rot + 6; - return; + blockEntity.rot = blockEntity.rot + 6; } - if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_2) { - if (LocalTime.now().getSecond() != second) { - second = LocalTime.now().getSecond(); + else if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_2) { + if (LocalTime.now().getSecond() != blockEntity.second) { + blockEntity.second = LocalTime.now().getSecond(); world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.2f, 1.0f); } - rot = rot + 10; - return; + blockEntity.rot = blockEntity.rot + 10; } - if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_3) { - if (LocalTime.now().getSecond() != second) { - second = LocalTime.now().getSecond(); + else if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_3) { + if (LocalTime.now().getSecond() != blockEntity.second) { + blockEntity.second = LocalTime.now().getSecond(); world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.3f, 1.0f); } - rot = rot + 14; - return; - } - else { - return; + blockEntity.rot = blockEntity.rot + 14; } } public int getRot() { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java old mode 100644 new mode 100755 index 09fb809..b6eafa4 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java @@ -4,48 +4,40 @@ import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.Tickable; +import net.minecraft.block.entity.JukeboxBlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; -public class ChoppingLogBlockEntity extends BlockEntity implements Tickable { +public class ChoppingLogBlockEntity extends BlockEntity { private int facing; private double axe_x; private double axe_z; - public ChoppingLogBlockEntity() { - super(BlockEntities.ChoppingLogBlockEntity); + public ChoppingLogBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.ChoppingLogBlockEntity, pos, state); } - @Override - public void tick() { - - BlockPos pos = this.pos; - BlockState state = this.world.getBlockState(pos); - - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { - facing = 180; - axe_x = 0.2D; - axe_z = 0.5D; - return; + public static void tick(World world, BlockPos pos, BlockState state, ChoppingLogBlockEntity blockEntity) { + if (state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + blockEntity.facing = 180; + blockEntity.axe_x = 0.2D; + blockEntity.axe_z = 0.5D; } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { - facing = 90; - axe_x = 0.5D; - axe_z = 0.2D; - return; + else if (state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + blockEntity.facing = 90; + blockEntity.axe_x = 0.5D; + blockEntity.axe_z = 0.2D; } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { - facing = 0; - axe_x = 0.8D; - axe_z = 0.5D; - return; + else if (state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + blockEntity.facing = 0; + blockEntity.axe_x = 0.8D; + blockEntity.axe_z = 0.5D; } else { - facing = 270; - axe_x = 0.5D; - axe_z = 0.8D; - return; + blockEntity.facing = 270; + blockEntity.axe_x = 0.5D; + blockEntity.axe_z = 0.8D; } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java old mode 100644 new mode 100755 index 9930fc9..c5ef744 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java @@ -4,57 +4,52 @@ import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; +import net.minecraft.world.World; import java.time.LocalTime; -public class DigitalClockBlockEntity extends BlockEntity implements Tickable { +public class DigitalClockBlockEntity extends BlockEntity { private int facing; private double x; private double z; private int second; - public DigitalClockBlockEntity() { - super(BlockEntities.DigitalClockBlockEntity); + public DigitalClockBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.DigitalClockBlockEntity, pos, state); } - @Override - public void tick() { - if (LocalTime.now().getSecond() != second) { - second = LocalTime.now().getSecond(); + public static void tick(World world, BlockPos pos, BlockState state, DigitalClockBlockEntity blockEntity) { + if (LocalTime.now().getSecond() != blockEntity.second) { + blockEntity.second = LocalTime.now().getSecond(); } - - BlockPos pos = this.pos; - BlockState state = this.world.getBlockState(pos); - - - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { - facing = 270; - x = 0.626; - z = 0.825; - return; - } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { - facing = 180; - x = 0.175; - z = 0.626; - return; + switch (state.get(HorizontalFacingBlock.FACING)) { + case NORTH: { + blockEntity.facing = 0; + blockEntity.x = 0.825; + blockEntity.z = 0.374; + break; + } + case EAST:{ + blockEntity.facing = 270; + blockEntity.x = 0.626; + blockEntity.z = 0.825; + break; + } + case SOUTH:{ + blockEntity.facing = 180; + blockEntity.x = 0.175; + blockEntity.z = 0.626; + break; + } + case WEST:{ + blockEntity.facing = 90; + blockEntity.x = 0.374; + blockEntity.z = 0.175; + break; + } + default: break; } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { - facing = 90; - x = 0.374; - z = 0.175; - return; - } - else { - facing = 0; - x = 0.825; - z = 0.374; - return; - } - } public int getFacing() { return facing; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/PoolSprinklerBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/PoolSprinklerBlockEntity.java old mode 100644 new mode 100755 index b4bdd1d..c81c621 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/PoolSprinklerBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/PoolSprinklerBlockEntity.java @@ -5,37 +5,23 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.particle.ParticleTypes; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; -public class PoolSprinklerBlockEntity extends BlockEntity implements Tickable { +public class PoolSprinklerBlockEntity extends BlockEntity { - public PoolSprinklerBlockEntity() { - super(BlockEntities.PoolSprinklerBlockEntity); + public PoolSprinklerBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.PoolSprinklerBlockEntity, pos, state); } - @Override - public void tick() { - BlockPos pos = this.pos; - if (world != null) { - BlockState state = this.world.getBlockState(pos); - if (state.get(PoolSprinkler.POWERED)) { - switch (state.get(PoolSprinkler.FACING)) { - case NORTH: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - 0.34, 1, 1, 1); - return; - case EAST: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 1.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); - return; - case SOUTH: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 1.34, 1, 1, 1); - return; - case WEST: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() - 0.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); - return; - default: - return; - } + public static void tick(World world, BlockPos pos, BlockState state, PoolSprinklerBlockEntity blockEntity) { + if (state.get(PoolSprinkler.POWERED)) { + switch (state.get(PoolSprinkler.FACING)) { + case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - 0.34, 1, 1, 1); break; + case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 1.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break; + case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 1.34, 1, 1, 1); break; + case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() - 0.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break; + default: break; } } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ShowerHeadBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ShowerHeadBlockEntity.java old mode 100644 new mode 100755 index ef8a25a..8639eae --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ShowerHeadBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ShowerHeadBlockEntity.java @@ -5,38 +5,25 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.particle.ParticleTypes; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; -public class ShowerHeadBlockEntity extends BlockEntity implements Tickable { +public class ShowerHeadBlockEntity extends BlockEntity { - public ShowerHeadBlockEntity() { - super(BlockEntities.ShowerHeadBlockEntity); + public ShowerHeadBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.ShowerHeadBlockEntity, pos, state); } - @Override - public void tick() { - BlockPos pos = this.pos; - if (world != null) { - BlockState state = this.world.getBlockState(pos); - if (state.get(PoolSprinkler.POWERED) == true) { - switch (state.get(PoolSprinkler.FACING)) { - case NORTH: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.625, 1, 1, 1); - return; - case EAST: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.375, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); - return; - case SOUTH: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.375, 1, 1, 1); - return; - case WEST: - world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.625, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); - return; - default: - return; - } + public static void tick(World world, BlockPos pos, BlockState state, ShowerHeadBlockEntity blockEntity) { + if (state.get(PoolSprinkler.POWERED)) { + switch (state.get(PoolSprinkler.FACING)) { + case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.625, 1, 1, 1); break; + case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.375, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break; + case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.375, 1, 1, 1); break; + case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.625, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break; + default: break; } } + } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java old mode 100644 new mode 100755 index 953ca51..22545e2 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java @@ -6,66 +6,54 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; import java.time.LocalTime; -public class WallClockBlockEntity extends BlockEntity implements Tickable { - private int facing; - private double x; - private double z; - private int second; +public class WallClockBlockEntity extends BlockEntity { + public int facing; + public double x; + public double z; + public int second; - public WallClockBlockEntity() { - super(BlockEntities.WallClockBlockEntity); + public WallClockBlockEntity(BlockPos pos, BlockState state) { + super(BlockEntities.WallClockBlockEntity, pos, state); } - @Override - public void tick() { - if (LocalTime.now().getSecond() != second) { - second = LocalTime.now().getSecond(); - world.playSound(null, pos, SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.004f, 1f); + public static void tick(World world, BlockPos pos, BlockState state, WallClockBlockEntity blockEntity) { + if (LocalTime.now().getSecond() != blockEntity.second) { + blockEntity.second = LocalTime.now().getSecond(); + world.playSound(null, pos, SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.04f, 1f); } - BlockPos pos = this.pos; - BlockState state = this.world.getBlockState(pos); - - - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { - facing = 270; - x = 0.05; - z = 0.5; - return; - } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { - facing = 180; - x = 0.5; - z = 0.05; - return; - } - if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { - facing = 90; - x = 0.95; - z = 0.5; - return; - } - else { - facing = 0; - x = 0.5; - z = 0.95; - return; + switch (state.get(HorizontalFacingBlock.FACING)) { + case NORTH: { + blockEntity.facing = 0; + blockEntity.x = 0.5; + blockEntity.z = 0.95; + break; + } + case EAST: { + blockEntity.facing = 270; + blockEntity.x = 0.05; + blockEntity.z = 0.5; + break; + } + case SOUTH: { + blockEntity.facing = 180; + blockEntity.x = 0.5; + blockEntity.z = 0.05; + break; + } + case WEST: { + blockEntity.facing = 90; + blockEntity.x = 0.95; + blockEntity.z = 0.5; + break; + } + default: break; } - - } - public int getFacing() { - return facing; - } - public double getX() { - return x; - } - public double getZ() { - return z; } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java old mode 100644 new mode 100755 index d1e0d30..ee5ffc4 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java @@ -1,50 +1,40 @@ -package eu.midnightdust.motschen.decorative.block.render; - -import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.model.ModelPart; -import net.minecraft.client.render.OverlayTexture; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class CeilingFanRenderer extends BlockEntityRenderer { - private final ModelPart blades; - private final ModelPart point; - - public CeilingFanRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { - super(blockEntityRenderDispatcher); - blades = new ModelPart(64, 64, 0, 0); - blades.setPivot(0.0F, 0.0F, 0.0F); - blades.addCuboid(-1.0F, 0.0F, 1.0F, 2.0F, 1.0F, 10.0F, 0.0F); - blades.addCuboid(-1.0F, 0.0F, -11.0F, 2.0F, 1.0F, 10.0F, 0.0F); - blades.addCuboid(1.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F); - blades.addCuboid(-11.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F); - point = new ModelPart(32, 32, 16, 0); - point.addCuboid(-1.0F, -1.0F, -1.0F, 2.0F, 2.0F, 2.0F, 0.0F); - blades.addChild(point); - } - - @Override - public boolean rendersOutsideBoundingBox(CeilingFanBlockEntity blockEntity) { - return true; - } - - - @Override - public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - matrices.push(); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("decorative:textures/block/ceilingfan.png"))); - matrices.translate(0.5,0.31,0.5); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getRot())); - blades.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); - matrices.pop(); - } -} +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity; +import eu.midnightdust.motschen.decorative.block.render.model.CeilingFanBladesModel; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Vec3f; + +@Environment(EnvType.CLIENT) +public class CeilingFanRenderer implements BlockEntityRenderer { + private final CeilingFanBladesModel blades; + + public CeilingFanRenderer(BlockEntityRendererFactory.Context ctx) { + blades = new CeilingFanBladesModel(ctx.getLayerModelPart(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER)); + } + + @Override + public boolean rendersOutsideBoundingBox(CeilingFanBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + matrices.push(); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("decorative:textures/block/ceilingfan.png"))); + matrices.translate(0.5,0.31,0.5); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getRot())); + blades.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java old mode 100644 new mode 100755 index df38e30..28aa1ac --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java @@ -1,40 +1,40 @@ -package eu.midnightdust.motschen.decorative.block.render; - -import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.*; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.render.model.json.ModelTransformation; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; - -@Environment(EnvType.CLIENT) -public class ChoppingLogBlockEntityRenderer extends BlockEntityRenderer { - - public ChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { - super(blockEntityRenderDispatcher); - } - - @Override - public boolean rendersOutsideBoundingBox(ChoppingLogBlockEntity blockEntity) { - return true; - } - - - @Override - public void render(ChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - matrices.push(); - int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); - matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); - matrices.scale(2.5f,2.5f,2.5f); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); - matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); - MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); - matrices.pop(); - } -} +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.*; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.Vec3f; + +import java.util.Objects; + +@Environment(EnvType.CLIENT) +public class ChoppingLogBlockEntityRenderer implements BlockEntityRenderer { + + public ChoppingLogBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) { + } + + @Override + public boolean rendersOutsideBoundingBox(ChoppingLogBlockEntity blockEntity) { + return true; + } + + @Override + public void render(ChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up()); + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers, 0); + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java old mode 100644 new mode 100755 index 8121789..a196992 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java @@ -1,77 +1,77 @@ -package eu.midnightdust.motschen.decorative.block.render; - -import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity; -import eu.midnightdust.motschen.decorative.config.DecorativeConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.render.*; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import java.time.LocalTime; - -@Environment(EnvType.CLIENT) -public class DigitalClockRenderer extends BlockEntityRenderer { - - public DigitalClockRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { - super(blockEntityRenderDispatcher); - } - - private int getHour12hFormat() { - int hour; - hour = LocalTime.now().getHour(); - if (hour > 12) { - hour = hour - 12; - } - return hour; - } - private String getTime() { - String hour; - String minute; - - // Hour - if (DecorativeMain.DECORATIVE_CONFIG.timeFormat.equals(DecorativeConfig.TimeFormat.h12)) { - if (getHour12hFormat() <= 9) { - hour = "0" + getHour12hFormat(); - } else { - hour = "" + getHour12hFormat(); - } - } - else { - if (LocalTime.now().getHour() <= 9) { - hour = "0" + LocalTime.now().getHour(); - } else { - hour = "" + LocalTime.now().getHour(); - } - } - - // Minute - if (LocalTime.now().getMinute() <= 9) { - minute = "0" + LocalTime.now().getMinute(); - } - else { - minute = "" + LocalTime.now().getMinute(); - } - - String time = hour +":"+ minute; - return time; - } - - - @Override - public void render(DigitalClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - matrices.push(); - TextRenderer textRenderer = dispatcher.getTextRenderer(); - matrices.translate(blockEntity.getX(),0.35,blockEntity.getZ()); - - matrices.scale(0.025f, 0.025f, 0.025f); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); - matrices.translate(0,0,-0.1); - matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getModel(), vertexConsumers, false, 0, 15); - matrices.pop(); - } +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.DecorativeMain; +import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity; +import eu.midnightdust.motschen.decorative.config.DecorativeConfig; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.render.*; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.Vec3f; + +import java.time.LocalTime; + +@Environment(EnvType.CLIENT) +public class DigitalClockRenderer implements BlockEntityRenderer { + private final TextRenderer textRenderer; + + public DigitalClockRenderer(BlockEntityRendererFactory.Context ctx) { + textRenderer = ctx.getTextRenderer(); + } + + private int getHour12hFormat() { + int hour; + hour = LocalTime.now().getHour(); + if (hour > 12) { + hour = hour - 12; + } + return hour; + } + private String getTime() { + String hour; + String minute; + + // Hour + if (DecorativeConfig.timeFormat.equals(DecorativeConfig.TimeFormat.h12)) { + if (getHour12hFormat() <= 9) { + hour = "0" + getHour12hFormat(); + } else { + hour = "" + getHour12hFormat(); + } + } + else { + if (LocalTime.now().getHour() <= 9) { + hour = "0" + LocalTime.now().getHour(); + } else { + hour = "" + LocalTime.now().getHour(); + } + } + + // Minute + if (LocalTime.now().getMinute() <= 9) { + minute = "0" + LocalTime.now().getMinute(); + } + else { + minute = "" + LocalTime.now().getMinute(); + } + + return hour +":"+ minute; + } + + + @Override + public void render(DigitalClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + matrices.push(); + matrices.translate(blockEntity.getX(),0.35,blockEntity.getZ()); + + matrices.scale(0.025f, 0.025f, 0.025f); + 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); + matrices.pop(); + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java old mode 100644 new mode 100755 index dfbc70a..7cdbd37 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java @@ -1,77 +1,58 @@ -package eu.midnightdust.motschen.decorative.block.render; - -import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.model.ModelPart; -import net.minecraft.client.render.*; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.Identifier; - -import java.time.LocalTime; - -@Environment(EnvType.CLIENT) -public class WallClockRenderer extends BlockEntityRenderer { - private final ModelPart blades; - private final ModelPart seconds; - private final ModelPart minutes; - private final ModelPart hours; - - public WallClockRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { - super(blockEntityRenderDispatcher); - blades = new ModelPart(16, 16, 0, 0); - blades.setPivot(0.0F, 0.0F, 0.0F); - - seconds = new ModelPart(16, 16, 8, 0); - seconds.addCuboid(-0.175F, 0.0F, 0.01F, 0.25F, 7.0F, 0.2F, 0.0F); - blades.addChild(seconds); - - minutes = new ModelPart(16, 16, 0, 0); - minutes.addCuboid(-0.25F, 0.0F, 0.0F, 0.5F, 6.0F, 0.2F, 0.0F); - blades.addChild(minutes); - - hours = new ModelPart(16, 16, 0, 0); - hours.addCuboid(-0.25F, 0.0F, 0.0F, 0.5F, 4.0F, 0.2F, 0.0F); - blades.addChild(hours); - } - - private int getHour12hFormat() { - int hour; - hour = LocalTime.now().getHour(); - if (hour >= 12) { - hour = hour - 12; - } - return hour; - } - - - @Override - public void render(WallClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - VertexConsumer blackVertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/black_concrete.png"))); - VertexConsumer redVertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/red_concrete.png"))); - - matrices.push(); - matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ()); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); - matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getSecond() * 6)); - seconds.render(matrices, redVertex, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); - matrices.pop(); - - matrices.push(); - matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ()); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); - matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getMinute() * 6)); - minutes.render(matrices, blackVertex, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); - matrices.pop(); - - matrices.push(); - matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ()); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); - matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(getHour12hFormat() * 30)); - hours.render(matrices, blackVertex, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); - matrices.pop(); - } -} +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity; +import eu.midnightdust.motschen.decorative.block.render.model.WallClockHandsModel; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.*; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Vec3f; + +import java.time.LocalTime; + +@Environment(EnvType.CLIENT) +public class WallClockRenderer implements BlockEntityRenderer { + private final WallClockHandsModel handsModel; + + public WallClockRenderer(BlockEntityRendererFactory.Context ctx) { + handsModel = new WallClockHandsModel(ctx.getLayerModelPart(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER)); + } + + private int getHour12hFormat() { + int hour; + hour = LocalTime.now().getHour(); + if (hour >= 12) { + hour = hour - 12; + } + return hour; + } + + @Override + public void render(WallClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + VertexConsumer vertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/red_concrete.png"))); + + matrices.push(); + matrices.translate(blockEntity.x,0.5,blockEntity.z); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing)); + matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getSecond() * 6)); + handsModel.seconds.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + matrices.pop(); + + matrices.push(); + matrices.translate(blockEntity.x,0.5,blockEntity.z); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing)); + matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getMinute() * 6)); + handsModel.minutes.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 0.0F, 0.0F, 0.0F, 1.0F); + matrices.pop(); + + matrices.push(); + matrices.translate(blockEntity.x,0.5,blockEntity.z); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing)); + matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(getHour12hFormat() * 30)); + handsModel.hours.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 0.0F, 0.0F, 0.0F, 1.0F); + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/CeilingFanBladesModel.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/CeilingFanBladesModel.java new file mode 100755 index 0000000..ee31d8a --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/CeilingFanBladesModel.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block.render.model; + +import net.minecraft.client.model.*; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.entity.model.EntityModelLayer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; + +public class CeilingFanBladesModel extends Model { + private final ModelPart blades; + public static final EntityModelLayer CEILING_FAN_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "ceiling_fan"), "main"); + + public CeilingFanBladesModel(ModelPart root) { + super(RenderLayer::getEntitySolid); + blades = root; + blades.setPivot(0.0F, 0.0F, 0.0F); + } + public ModelPart getPart() { + return blades; + } + + public static TexturedModelData getTexturedModelData() { + return TexturedModelData.of(getModelData(), 64, 64); + } + + public static ModelData getModelData() { + ModelData modelData = new ModelData(); + ModelPartData modelPartData = modelData.getRoot(); + modelPartData.addChild("blade1", ModelPartBuilder.create().cuboid(-1.0F, 0.0F, 1.0F, 2.0F, 1.0F, 10.0F), ModelTransform.NONE); + modelPartData.addChild("blade2", ModelPartBuilder.create().cuboid(-1.0F, 0.0F, -11.0F, 2.0F, 1.0F, 10.0F), ModelTransform.NONE); + modelPartData.addChild("blade3", ModelPartBuilder.create().cuboid(1.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F), ModelTransform.NONE); + modelPartData.addChild("blade4", ModelPartBuilder.create().cuboid(-11.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F), ModelTransform.NONE); + modelPartData.addChild("point", ModelPartBuilder.create().uv(32,0).cuboid(-1.0F, -1.0F, -1.0F, 2.0F, 2.0F, 2.0F), ModelTransform.NONE); + return modelData; + } + + @Override + public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { + blades.render(matrices, vertices, light, overlay, red, green, blue, alpha); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/WallClockHandsModel.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/WallClockHandsModel.java new file mode 100755 index 0000000..a0bbf51 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/model/WallClockHandsModel.java @@ -0,0 +1,47 @@ +package eu.midnightdust.motschen.decorative.block.render.model; + +import net.minecraft.client.model.*; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.entity.model.EntityModelLayer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; + +public class WallClockHandsModel extends Model { + private final ModelPart hands; + public final ModelPart seconds; + public final ModelPart minutes; + public final ModelPart hours; + public static final EntityModelLayer CLOCK_HANDS_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "clock_hands"), "main"); + + public WallClockHandsModel(ModelPart root) { + super(RenderLayer::getEntitySolid); + hands = root; + hands.setPivot(0.0F, 0.0F, 0.0F); + + seconds = hands.getChild("seconds");//new ModelPart(16, 16, 8, 0); + minutes = hands.getChild("minutes");//new ModelPart(16, 16, 0, 0); + hours = hands.getChild("hours");//new ModelPart(16, 16, 0, 0); + } + public ModelPart getPart() { + return hands; + } + + public static TexturedModelData getTexturedModelData() { + return TexturedModelData.of(getModelData(), 16, 16); + } + + public static ModelData getModelData(){ + ModelData modelData = new ModelData(); + ModelPartData modelPartData = modelData.getRoot(); + modelPartData.addChild("seconds", ModelPartBuilder.create().uv(0, 0).cuboid(-0.175F, 0.0F, 0.01F, 0.25F, 7.0F, 0.2F), ModelTransform.NONE); + modelPartData.addChild("minutes", ModelPartBuilder.create().uv(0, 0).cuboid(-0.25F, 0.0F, 0.0F, 0.5F, 6.0F, 0.2F), ModelTransform.NONE); + modelPartData.addChild("hours", ModelPartBuilder.create().uv(0, 0).cuboid(-0.25F, 0.0F, 0.0F, 0.5F, 4.0F, 0.2F), ModelTransform.NONE); + return modelData; + } + + @Override + public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { + hands.render(matrices, vertices, light, overlay, red, green, blue, alpha); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/config/DecorativeConfig.java b/src/main/java/eu/midnightdust/motschen/decorative/config/DecorativeConfig.java old mode 100644 new mode 100755 index 4f8ff6f..fccc999 --- a/src/main/java/eu/midnightdust/motschen/decorative/config/DecorativeConfig.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/config/DecorativeConfig.java @@ -1,17 +1,13 @@ -package eu.midnightdust.motschen.decorative.config; - -import me.sargunvohra.mcmods.autoconfig1u.ConfigData; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; -import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; - -@Config(name = "decorative") -public class DecorativeConfig implements ConfigData { - @Comment(value = "Change the time format") - @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) - public TimeFormat timeFormat = TimeFormat.h12; - - public enum TimeFormat { - h12, h24 - } -} +package eu.midnightdust.motschen.decorative.config; + +import eu.midnightdust.lib.config.MidnightConfig; + +import java.util.TimeZone; + +public class DecorativeConfig extends MidnightConfig { + @Entry public static TimeFormat timeFormat = TimeZone.getDefault().useDaylightTime() ? TimeFormat.h12 : TimeFormat.h24; + + public enum TimeFormat { + h12, h24 + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/motschen/decorative/config/ModMenuIntegration.java old mode 100644 new mode 100755 index 31098c5..b03bbdc --- a/src/main/java/eu/midnightdust/motschen/decorative/config/ModMenuIntegration.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/config/ModMenuIntegration.java @@ -1,16 +1,16 @@ -package eu.midnightdust.motschen.decorative.config; - -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> AutoConfig.getConfigScreen(DecorativeConfig.class, parent).get(); - } +package eu.midnightdust.motschen.decorative.config; + +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; +import eu.midnightdust.lib.config.MidnightConfig; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class ModMenuIntegration implements ModMenuApi { + + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> MidnightConfig.getScreen(parent,"decorative"); + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java old mode 100644 new mode 100755 index f02a6ed..d75d8a8 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java @@ -21,11 +21,6 @@ public BathTireEntity(EntityType entityType, World world) { super(entityType, world); } - @Override - protected int getCurrentExperience(PlayerEntity player) { - return 0; - } - @Override protected SoundEvent getAmbientSound() { return null; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java old mode 100644 new mode 100755 index 0daf59b..326708b --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java @@ -22,11 +22,6 @@ public BeachBallEntity(EntityType entityType, World world) super(entityType, world); } - @Override - protected int getCurrentExperience(PlayerEntity player) { - return 0; - } - @Override protected SoundEvent getAmbientSound() { return null; @@ -107,7 +102,7 @@ public boolean canBeControlledByRider() { public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) { if(!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND && player.isSneaking()) { - remove(); + this.remove(RemovalReason.DISCARDED); player.setStackInHand(hand, new ItemStack(Pool.BEACH_BALL_ITEM)); return ActionResult.SUCCESS; } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BathTireModel.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BathTireModel.java old mode 100644 new mode 100755 index 7041214..f1d91e3 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BathTireModel.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BathTireModel.java @@ -1,39 +1,44 @@ package eu.midnightdust.motschen.decorative.entity.client.model; import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import net.minecraft.client.model.ModelPart; +import net.minecraft.client.model.*; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; public class BathTireModel extends EntityModel { private final ModelPart body; + public static final EntityModelLayer BATH_TIRE_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "bath_tire"), "main"); - public BathTireModel() { - textureWidth = 16; - textureHeight = 16; - - body = new ModelPart(this); + public BathTireModel(ModelPart root) { + super(RenderLayer::getEntitySolid); + body = root; body.setPivot(0.0F, 24.0F, 0.0F); - body.setTextureOffset(0, 0).addCuboid(6.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F, 0.0F, false); - body.setTextureOffset(0, 0).addCuboid(-10.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F, 0.0F, false); - body.setTextureOffset(0, 0).addCuboid(-8.0F, -8.99F, -13.0F, 16.0F, 4.0F, 4.0F, 0.0F, false); - body.setTextureOffset(0, 0).addCuboid(-8.0F, -8.99F, 3.0F, 16.0F, 4.0F, 4.0F, 0.0F, false); + } + + public static TexturedModelData getTexturedModelData() { + return TexturedModelData.of(getModelData(), 16, 16); + } + + public static ModelData getModelData(){ + ModelData modelData = new ModelData(); + ModelPartData modelPartData = modelData.getRoot(); + modelPartData.addChild("cube1", ModelPartBuilder.create().cuboid(6.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F), ModelTransform.NONE); + modelPartData.addChild("cube2", ModelPartBuilder.create().cuboid(-10.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F), ModelTransform.NONE); + modelPartData.addChild("cube3", ModelPartBuilder.create().cuboid(-8.0F, -8.99F, -13.0F, 16.0F, 4.0F, 4.0F), ModelTransform.NONE); + modelPartData.addChild("cube4", ModelPartBuilder.create().cuboid(-8.0F, -8.99F, 3.0F, 16.0F, 4.0F, 4.0F), ModelTransform.NONE); + return modelData; } @Override public void setAngles(BathTireEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){ - //previously the render function, render code was moved to a method below } @Override public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ body.render(matrixStack, buffer, packedLight, packedOverlay); } - - public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) { - modelRenderer.pivotX = x; - modelRenderer.pivotY = y; - modelRenderer.pivotZ = z; - } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BeachBallModel.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BeachBallModel.java old mode 100644 new mode 100755 index 32a683c..79b93e9 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BeachBallModel.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BeachBallModel.java @@ -1,27 +1,39 @@ package eu.midnightdust.motschen.decorative.entity.client.model; import eu.midnightdust.motschen.decorative.entity.BeachBallEntity; -import net.minecraft.client.model.ModelPart; +import net.minecraft.client.model.*; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; public class BeachBallModel extends EntityModel { private final ModelPart body; + public static final EntityModelLayer BEACH_BALL_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "beach_ball"), "main"); - public BeachBallModel() { - textureWidth = 64; - textureHeight = 64; + public BeachBallModel(ModelPart root) { + super(RenderLayer::getEntitySolid); + body = root; + body.setPivot(0.0F, 20.0F, 0.0F); + } + + public static TexturedModelData getTexturedModelData() { + return TexturedModelData.of(getModelData(), 64, 64); + } - body = new ModelPart(this); - body.setPivot(0.0F, 24.0F, 0.0F); - body.setTextureOffset(0, 22).addCuboid(-4.0F, -1.0F, -4.0F, 8.0F, 1.0F, 8.0F, 0.0F, false); - body.setTextureOffset(0, 22).addCuboid(-4.0F, -12.0F, -4.0F, 8.0F, 1.0F, 8.0F, 0.0F, false); - body.setTextureOffset(0, 48).addCuboid(-6.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F, 0.0F, false); - body.setTextureOffset(20, 48).addCuboid(5.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F, 0.0F, false); - body.setTextureOffset(0, 33).addCuboid(-4.0F, -10.0F, -6.0F, 8.0F, 8.0F, 1.0F, 0.0F, false); - body.setTextureOffset(20, 33).addCuboid(-4.0F, -10.0F, 5.0F, 8.0F, 8.0F, 1.0F, 0.0F, false); - body.setTextureOffset(0, 0).addCuboid(-5.0F, -11.0F, -5.0F, 10.0F, 10.0F, 10.0F, 0.0F, false); + public static ModelData getModelData(){ + ModelData modelData = new ModelData(); + ModelPartData modelPartData = modelData.getRoot(); + modelPartData.addChild("cube1", ModelPartBuilder.create().uv(0, 22).cuboid(-4.0F, -1.0F, -4.0F, 8.0F, 1.0F, 8.0F), ModelTransform.NONE); + modelPartData.addChild("cube2", ModelPartBuilder.create().uv(0, 22).cuboid(-4.0F, -12.0F, -4.0F, 8.0F, 1.0F, 8.0F), ModelTransform.NONE); + modelPartData.addChild("cube3", ModelPartBuilder.create().uv(0, 48).cuboid(-6.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F), ModelTransform.NONE); + modelPartData.addChild("cube4", ModelPartBuilder.create().uv(20, 48).cuboid(5.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F), ModelTransform.NONE); + modelPartData.addChild("cube5", ModelPartBuilder.create().uv(0, 33).cuboid(-4.0F, -10.0F, -6.0F, 8.0F, 8.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube6", ModelPartBuilder.create().uv(20, 33).cuboid(-4.0F, -10.0F, 5.0F, 8.0F, 8.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube7", ModelPartBuilder.create().uv(0,0).cuboid(-5.0F, -11.0F, -5.0F, 10.0F, 10.0F, 10.0F), ModelTransform.NONE); + return modelData; } @Override @@ -33,10 +45,4 @@ public void setAngles(BeachBallEntity entity, float limbSwing, float limbSwingAm public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ body.render(matrixStack, buffer, packedLight, packedOverlay); } - - public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) { - modelRenderer.pivotX = x; - modelRenderer.pivotY = y; - modelRenderer.pivotZ = z; - } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/DuckBathTireModel.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/DuckBathTireModel.java old mode 100644 new mode 100755 index 1252300..6560209 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/DuckBathTireModel.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/DuckBathTireModel.java @@ -1,47 +1,53 @@ package eu.midnightdust.motschen.decorative.entity.client.model; import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import net.minecraft.client.model.ModelPart; +import net.minecraft.client.model.*; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; public class DuckBathTireModel extends EntityModel { private final ModelPart body; + public static final EntityModelLayer DUCK_BATH_TIRE_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "duck_bath_tire"), "main"); - public DuckBathTireModel() { - textureWidth = 64; - textureHeight = 64; + public DuckBathTireModel(ModelPart root) { + super(RenderLayer::getEntitySolid); + body = root; + body.setPivot(0.0F, 20.0F, 0.0F); + } + + public static TexturedModelData getTexturedModelData() { + return TexturedModelData.of(getModelData(), 64, 64); + } - body = new ModelPart(this); - body.setPivot(0.0F, 19.0F, 0.0F); - body.setTextureOffset(0, 9).addCuboid(6.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F, 0.0F, false); - body.setTextureOffset(0, 37).addCuboid(-10.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F, 0.0F, false); - body.setTextureOffset(0, 57).addCuboid(-8.0F, -2.99F, -10.0F, 16.0F, 3.0F, 4.0F, 0.0F, false); - body.setTextureOffset(0, 29).addCuboid(-8.0F, -2.99F, 6.0F, 16.0F, 3.0F, 4.0F, 0.0F, false); - body.setTextureOffset(50, 0).addCuboid(-2.0F, -8.0F, -10.0F, 4.0F, 5.0F, 3.0F, 0.0F, false); - body.setTextureOffset(46, 11).addCuboid(-2.999F, -10.0F, -12.0F, 6.0F, 5.0F, 3.0F, 0.0F, false); - body.setTextureOffset(15, 31).addCuboid(-2.499F, -10.5F, -12.001F, 5.0F, 1.0F, 3.0F, 0.0F, false); - body.setTextureOffset(58, 20).addCuboid(-0.999F, -8.0F, -13.0F, 2.0F, 2.0F, 1.0F, 0.0F, false); - body.setTextureOffset(58, 20).addCuboid(-1.999F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F, 0.0F, false); - body.setTextureOffset(53, 21).addCuboid(-1.999F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F, 0.0F, false); - body.setTextureOffset(53, 21).addCuboid(1.001F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F, 0.0F, false); - body.setTextureOffset(58, 20).addCuboid(1.001F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F, 0.0F, false); + public static ModelData getModelData(){ + ModelData modelData = new ModelData(); + ModelPartData modelPartData = modelData.getRoot(); + modelPartData.addChild("cube1", ModelPartBuilder.create().uv(0, 9).cuboid(6.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F), ModelTransform.NONE); + modelPartData.addChild("cube2", ModelPartBuilder.create().uv(0, 37).cuboid(-10.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F), ModelTransform.NONE); + modelPartData.addChild("cube3", ModelPartBuilder.create().uv(0, 57).cuboid(-8.0F, -2.99F, -10.0F, 16.0F, 3.0F, 4.0F), ModelTransform.NONE); + modelPartData.addChild("cube4", ModelPartBuilder.create().uv(0, 29).cuboid(-8.0F, -2.99F, 6.0F, 16.0F, 3.0F, 4.0F), ModelTransform.NONE); + modelPartData.addChild("cube5", ModelPartBuilder.create().uv(50, 0).cuboid(-2.0F, -8.0F, -10.0F, 4.0F, 5.0F, 3.0F), ModelTransform.NONE); + modelPartData.addChild("cube6", ModelPartBuilder.create().uv(46, 11).cuboid(-2.999F, -10.0F, -12.0F, 6.0F, 5.0F, 3.0F), ModelTransform.NONE); + modelPartData.addChild("cube7", ModelPartBuilder.create().uv(15, 31).cuboid(-2.499F, -10.5F, -12.001F, 5.0F, 1.0F, 3.0F), ModelTransform.NONE); + modelPartData.addChild("cube8", ModelPartBuilder.create().uv(58, 20).cuboid(-0.999F, -8.0F, -13.0F, 2.0F, 2.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube9", ModelPartBuilder.create().uv(58, 20).cuboid(-1.999F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube10", ModelPartBuilder.create().uv(53, 21).cuboid(-1.999F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube11", ModelPartBuilder.create().uv(53, 21).cuboid(1.001F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE); + modelPartData.addChild("cube12", ModelPartBuilder.create().uv(58, 20).cuboid(1.001F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE); + return modelData; } @Override - public void setAngles(BathTireEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){ + public void setAngles(BathTireEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { //previously the render function, render code was moved to a method below } @Override - public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ + public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { body.render(matrixStack, buffer, packedLight, packedOverlay); } - - public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) { - modelRenderer.pivotX = x; - modelRenderer.pivotY = y; - modelRenderer.pivotZ = z; - } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java new file mode 100755 index 0000000..69fee08 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java @@ -0,0 +1,24 @@ +package eu.midnightdust.motschen.decorative.entity.client.renderer; + +import eu.midnightdust.motschen.decorative.entity.BathTireEntity; +import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.entity.MobEntityRenderer; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; + +@Environment(EnvType.CLIENT) +public class BathTireRenderer extends MobEntityRenderer { + private static 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"); + } + + @Override + public Identifier getTexture(BathTireEntity entity) { + return TEXTURE; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BeachBallRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BeachBallRenderer.java old mode 100644 new mode 100755 index 9fe3bac..bea6831 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BeachBallRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BeachBallRenderer.java @@ -5,15 +5,17 @@ import eu.midnightdust.motschen.decorative.entity.client.model.BeachBallModel; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; +import net.minecraft.client.render.entity.*; +import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer; +import net.minecraft.client.render.entity.feature.SlimeOverlayFeatureRenderer; +import net.minecraft.client.render.entity.model.*; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class BeachBallRenderer extends MobEntityRenderer { - public BeachBallRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BeachBallModel(), 0.5F); + public BeachBallRenderer(EntityRendererFactory.Context context) { + super(context, new BeachBallModel(context.getPart(BeachBallModel.BEACH_BALL_MODEL_LAYER)), 0.5F); } @Override diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlackBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlackBathTireRenderer.java deleted file mode 100644 index 1b8ceab..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlackBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class BlackBathTireRenderer extends MobEntityRenderer { - - public BlackBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/black_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlueBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlueBathTireRenderer.java deleted file mode 100644 index d19a4ab..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BlueBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class BlueBathTireRenderer extends MobEntityRenderer { - - public BlueBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/blue_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BrownBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BrownBathTireRenderer.java deleted file mode 100644 index f688226..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BrownBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class BrownBathTireRenderer extends MobEntityRenderer { - - public BrownBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/brown_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/CyanBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/CyanBathTireRenderer.java deleted file mode 100644 index d231fd7..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/CyanBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class CyanBathTireRenderer extends MobEntityRenderer { - - public CyanBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/cyan_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/DuckBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/DuckBathTireRenderer.java old mode 100644 new mode 100755 index 1075baf..4bc55a6 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/DuckBathTireRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/DuckBathTireRenderer.java @@ -8,13 +8,15 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class DuckBathTireRenderer extends MobEntityRenderer { - - public DuckBathTireRenderer(EntityRenderDispatcher dispatcher) { super(dispatcher, new DuckBathTireModel(), 0.5F); } + public DuckBathTireRenderer(EntityRendererFactory.Context context) { + super(context, new DuckBathTireModel(context.getPart(DuckBathTireModel.DUCK_BATH_TIRE_MODEL_LAYER)), 0.5F); + } @Override public Identifier getTexture(BathTireEntity entity) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GrayBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GrayBathTireRenderer.java deleted file mode 100644 index 9008586..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GrayBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class GrayBathTireRenderer extends MobEntityRenderer { - - public GrayBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/gray_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GreenBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GreenBathTireRenderer.java deleted file mode 100644 index 1385fc8..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/GreenBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class GreenBathTireRenderer extends MobEntityRenderer { - - public GreenBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/green_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightBlueBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightBlueBathTireRenderer.java deleted file mode 100644 index 5fb3024..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightBlueBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class LightBlueBathTireRenderer extends MobEntityRenderer { - - public LightBlueBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/light_blue_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightGrayBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightGrayBathTireRenderer.java deleted file mode 100644 index 576f221..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LightGrayBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class LightGrayBathTireRenderer extends MobEntityRenderer { - - public LightGrayBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/light_gray_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LimeBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LimeBathTireRenderer.java deleted file mode 100644 index 6fbe6c2..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/LimeBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class LimeBathTireRenderer extends MobEntityRenderer { - - public LimeBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/lime_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/MagentaBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/MagentaBathTireRenderer.java deleted file mode 100644 index b42548c..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/MagentaBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class MagentaBathTireRenderer extends MobEntityRenderer { - - public MagentaBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/magenta_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/OrangeBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/OrangeBathTireRenderer.java deleted file mode 100644 index 1a5be8e..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/OrangeBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class OrangeBathTireRenderer extends MobEntityRenderer { - - public OrangeBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/orange_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PinkBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PinkBathTireRenderer.java deleted file mode 100644 index d296d82..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PinkBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class PinkBathTireRenderer extends MobEntityRenderer { - - public PinkBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/pink_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PurpleBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PurpleBathTireRenderer.java deleted file mode 100644 index 271d0e3..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/PurpleBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class PurpleBathTireRenderer extends MobEntityRenderer { - - public PurpleBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/purple_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/RedBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/RedBathTireRenderer.java deleted file mode 100644 index f68bd04..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/RedBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class RedBathTireRenderer extends MobEntityRenderer { - - public RedBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/red_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/WhiteBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/WhiteBathTireRenderer.java deleted file mode 100644 index 6b6ca38..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/WhiteBathTireRenderer.java +++ /dev/null @@ -1,23 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class WhiteBathTireRenderer extends MobEntityRenderer { - - public WhiteBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/white_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/YellowBathTireRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/YellowBathTireRenderer.java deleted file mode 100644 index af5770c..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/YellowBathTireRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.midnightdust.motschen.decorative.entity.client.renderer; - -import eu.midnightdust.motschen.decorative.entity.BathTireEntity; -import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.util.Identifier; - -@Environment(EnvType.CLIENT) -public class YellowBathTireRenderer extends MobEntityRenderer { - - public YellowBathTireRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new BathTireModel(), 0.5F); - } - - @Override - public Identifier getTexture(BathTireEntity entity) { - return new Identifier("minecraft", "textures/block/yellow_concrete.png"); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java b/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java b/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java old mode 100644 new mode 100755 index f9891d8..b392cdf --- a/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java @@ -2,6 +2,7 @@ import eu.midnightdust.motschen.decorative.DecorativeMain; import eu.midnightdust.motschen.decorative.block.blockentity.*; +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.Identifier; @@ -17,11 +18,11 @@ public class BlockEntities { public static BlockEntityType DigitalClockBlockEntity; public static void init() { - PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler_blockentity"), BlockEntityType.Builder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null)); - ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"shower_head_blockentity"), BlockEntityType.Builder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null)); - CeilingFanBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"ceiling_fan_blockentity"), BlockEntityType.Builder.create(CeilingFanBlockEntity::new, DecorativeMain.CeilingFan).build(null)); - ChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"chopping_log_blockentity"), BlockEntityType.Builder.create(ChoppingLogBlockEntity::new, LogsWithAxes.OakChoppingLog, LogsWithAxes.BirchChoppingLog, LogsWithAxes.AcaciaChoppingLog, LogsWithAxes.DarkOakChoppingLog, LogsWithAxes.JungleChoppingLog, LogsWithAxes.SpruceChoppingLog).build(null)); - WallClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"wall_clock_blockentity"), BlockEntityType.Builder.create(WallClockBlockEntity::new, DecorativeMain.WallClock).build(null)); - DigitalClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"digital_clock_blockentity"), BlockEntityType.Builder.create(DigitalClockBlockEntity::new, Clocks.RedDigitalClock, Clocks.BlackDigitalClock, Clocks.BlueDigitalClock, Clocks.BrownDigitalClock, Clocks.CyanDigitalClock, Clocks.GrayDigitalClock, Clocks.GreenDigitalClock, Clocks.LightBlueDigitalClock, Clocks.LightGrayDigitalClock, Clocks.LimeDigitalClock, Clocks.MagentaDigitalClock, Clocks.OrangeDigitalClock, Clocks.PinkDigitalClock, Clocks.PurpleDigitalClock, Clocks.WhiteDigitalClock, Clocks.YellowDigitalClock).build(null)); + PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler_blockentity"), FabricBlockEntityTypeBuilder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null)); + ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"shower_head_blockentity"), FabricBlockEntityTypeBuilder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null)); + CeilingFanBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"ceiling_fan_blockentity"), FabricBlockEntityTypeBuilder.create(CeilingFanBlockEntity::new, DecorativeMain.CeilingFan).build(null)); + ChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"chopping_log_blockentity"), FabricBlockEntityTypeBuilder.create(ChoppingLogBlockEntity::new, LogsWithAxes.OakChoppingLog, LogsWithAxes.BirchChoppingLog, LogsWithAxes.AcaciaChoppingLog, LogsWithAxes.DarkOakChoppingLog, LogsWithAxes.JungleChoppingLog, LogsWithAxes.SpruceChoppingLog).build(null)); + WallClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"wall_clock_blockentity"), FabricBlockEntityTypeBuilder.create(WallClockBlockEntity::new, DecorativeMain.WallClock).build(null)); + DigitalClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"digital_clock_blockentity"), FabricBlockEntityTypeBuilder.create(DigitalClockBlockEntity::new, Clocks.RedDigitalClock, Clocks.BlackDigitalClock, Clocks.BlueDigitalClock, Clocks.BrownDigitalClock, Clocks.CyanDigitalClock, Clocks.GrayDigitalClock, Clocks.GreenDigitalClock, Clocks.LightBlueDigitalClock, Clocks.LightGrayDigitalClock, Clocks.LimeDigitalClock, Clocks.MagentaDigitalClock, Clocks.OrangeDigitalClock, Clocks.PinkDigitalClock, Clocks.PurpleDigitalClock, Clocks.WhiteDigitalClock, Clocks.YellowDigitalClock).build(null)); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Clocks.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Clocks.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java b/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java b/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java b/src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java old mode 100644 new mode 100755 index 8e4813f..b1c0ce9 --- a/src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java @@ -6,7 +6,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.item.SpawnEggItem; +import net.minecraft.nbt.NbtCompound; import net.minecraft.server.world.ServerWorld; import net.minecraft.stat.Stats; import net.minecraft.util.Hand; @@ -42,7 +43,7 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han if (entityType.spawnFromItemStack((ServerWorld) world, itemStack, user, blockPos.up(1), SpawnReason.SPAWN_EGG, false, false) == null) { return TypedActionResult.pass(itemStack); } else { - if (!user.abilities.creativeMode) { + if (!user.getAbilities().creativeMode) { itemStack.decrement(1); } @@ -55,9 +56,9 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han } } - public EntityType getEntityType(CompoundTag tag) { + public EntityType getEntityType(NbtCompound tag) { if (tag != null && tag.contains("EntityTag", 10)) { - CompoundTag compoundTag = tag.getCompound("EntityTag"); + NbtCompound compoundTag = tag.getCompound("EntityTag"); if (compoundTag.contains("id", 8)) { return EntityType.get(compoundTag.getString("id")).orElse(this.type); } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java b/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java old mode 100644 new mode 100755 index 4b9d27a..ab01368 --- a/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java @@ -1,19 +1,19 @@ -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>>> getFeatures(); - - @Accessor - void setFeatures(List>>> features); -} +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>>> getFeatures(); + + @Accessor + void setFeatures(List>>> features); +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java old mode 100644 new mode 100755 index dbdbbd8..d941607 --- a/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java @@ -1,13 +1,13 @@ -package eu.midnightdust.motschen.decorative.sound; - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class DecorativeSoundEvents { - public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient"); - - private static SoundEvent register(String id) { - return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(new Identifier(id))); - } +package eu.midnightdust.motschen.decorative.sound; + +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class DecorativeSoundEvents { + public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient"); + + private static SoundEvent register(String id) { + return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(new Identifier(id))); + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java old mode 100644 new mode 100755 index f33b0ce..b928711 --- a/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java @@ -1,44 +1,44 @@ -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>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures()); - while (featuresByStep.size() <= stepIndex) { - featuresByStep.add(Lists.newArrayList()); - } - List>> features = new ArrayList<>(featuresByStep.get(stepIndex)); - features.add(() -> feature); - featuresByStep.set(stepIndex, features); - generationSettingsAccessor.setFeatures(featuresByStep); - } +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>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures()); + while (featuresByStep.size() <= stepIndex) { + featuresByStep.add(Lists.newArrayList()); + } + List>> features = new ArrayList<>(featuresByStep.get(stepIndex)); + features.add(() -> feature); + featuresByStep.set(stepIndex, features); + generationSettingsAccessor.setFeatures(featuresByStep); + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/bird_bath.json b/src/main/resources/assets/decorative/blockstates/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/black_digital_clock.json b/src/main/resources/assets/decorative/blockstates/black_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/black_double_lamp.json b/src/main/resources/assets/decorative/blockstates/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/black_lamp.json b/src/main/resources/assets/decorative/blockstates/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/blue_digital_clock.json b/src/main/resources/assets/decorative/blockstates/blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/blue_double_lamp.json b/src/main/resources/assets/decorative/blockstates/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/blue_lamp.json b/src/main/resources/assets/decorative/blockstates/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/brown_digital_clock.json b/src/main/resources/assets/decorative/blockstates/brown_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/brown_double_lamp.json b/src/main/resources/assets/decorative/blockstates/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/brown_lamp.json b/src/main/resources/assets/decorative/blockstates/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/ceilingfan.json b/src/main/resources/assets/decorative/blockstates/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/christmas_lights.json b/src/main/resources/assets/decorative/blockstates/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/christmas_tree.json b/src/main/resources/assets/decorative/blockstates/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/cyan_digital_clock.json b/src/main/resources/assets/decorative/blockstates/cyan_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/cyan_double_lamp.json b/src/main/resources/assets/decorative/blockstates/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/cyan_lamp.json b/src/main/resources/assets/decorative/blockstates/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/eighty_sign.json b/src/main/resources/assets/decorative/blockstates/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/empty_sign.json b/src/main/resources/assets/decorative/blockstates/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/fifty_sign.json b/src/main/resources/assets/decorative/blockstates/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/fire_hydrant.json b/src/main/resources/assets/decorative/blockstates/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/five_sign.json b/src/main/resources/assets/decorative/blockstates/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/forty_sign.json b/src/main/resources/assets/decorative/blockstates/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/gray_digital_clock.json b/src/main/resources/assets/decorative/blockstates/gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/gray_double_lamp.json b/src/main/resources/assets/decorative/blockstates/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/gray_lamp.json b/src/main/resources/assets/decorative/blockstates/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/green_digital_clock.json b/src/main/resources/assets/decorative/blockstates/green_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/green_double_lamp.json b/src/main/resources/assets/decorative/blockstates/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/green_lamp.json b/src/main/resources/assets/decorative/blockstates/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/guardrail.json b/src/main/resources/assets/decorative/blockstates/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/kitchen_counter.json b/src/main/resources/assets/decorative/blockstates/kitchen_counter.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/kitchen_tiles.json b/src/main/resources/assets/decorative/blockstates/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_blue_digital_clock.json b/src/main/resources/assets/decorative/blockstates/light_blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_blue_double_lamp.json b/src/main/resources/assets/decorative/blockstates/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_blue_lamp.json b/src/main/resources/assets/decorative/blockstates/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_gray_digital_clock.json b/src/main/resources/assets/decorative/blockstates/light_gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_gray_double_lamp.json b/src/main/resources/assets/decorative/blockstates/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/light_gray_lamp.json b/src/main/resources/assets/decorative/blockstates/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/lime_digital_clock.json b/src/main/resources/assets/decorative/blockstates/lime_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/lime_double_lamp.json b/src/main/resources/assets/decorative/blockstates/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/lime_lamp.json b/src/main/resources/assets/decorative/blockstates/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/magenta_digital_clock.json b/src/main/resources/assets/decorative/blockstates/magenta_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/magenta_double_lamp.json b/src/main/resources/assets/decorative/blockstates/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/magenta_lamp.json b/src/main/resources/assets/decorative/blockstates/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/ninety_sign.json b/src/main/resources/assets/decorative/blockstates/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/old_television.json b/src/main/resources/assets/decorative/blockstates/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/onehundred_sign.json b/src/main/resources/assets/decorative/blockstates/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/onehundredten_sign.json b/src/main/resources/assets/decorative/blockstates/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/orange_digital_clock.json b/src/main/resources/assets/decorative/blockstates/orange_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/orange_double_lamp.json b/src/main/resources/assets/decorative/blockstates/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/orange_lamp.json b/src/main/resources/assets/decorative/blockstates/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pennant_chain.json b/src/main/resources/assets/decorative/blockstates/pennant_chain.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pink_digital_clock.json b/src/main/resources/assets/decorative/blockstates/pink_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pink_double_lamp.json b/src/main/resources/assets/decorative/blockstates/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pink_lamp.json b/src/main/resources/assets/decorative/blockstates/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pool_sprinkler.json b/src/main/resources/assets/decorative/blockstates/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/pool_wall.json b/src/main/resources/assets/decorative/blockstates/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/purple_digital_clock.json b/src/main/resources/assets/decorative/blockstates/purple_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/purple_double_lamp.json b/src/main/resources/assets/decorative/blockstates/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/purple_lamp.json b/src/main/resources/assets/decorative/blockstates/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/red_digital_clock.json b/src/main/resources/assets/decorative/blockstates/red_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/red_double_lamp.json b/src/main/resources/assets/decorative/blockstates/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/red_lamp.json b/src/main/resources/assets/decorative/blockstates/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/road.json b/src/main/resources/assets/decorative/blockstates/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/road_white_long.json b/src/main/resources/assets/decorative/blockstates/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/road_white_short.json b/src/main/resources/assets/decorative/blockstates/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/rocky_asphalt.json b/src/main/resources/assets/decorative/blockstates/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/seventy_sign.json b/src/main/resources/assets/decorative/blockstates/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/shower_head.json b/src/main/resources/assets/decorative/blockstates/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/sign_post.json b/src/main/resources/assets/decorative/blockstates/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/sixty_sign.json b/src/main/resources/assets/decorative/blockstates/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/sliding_door.json b/src/main/resources/assets/decorative/blockstates/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/smoke_detector.json b/src/main/resources/assets/decorative/blockstates/smoke_detector.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/springboard.json b/src/main/resources/assets/decorative/blockstates/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/stone_path.json b/src/main/resources/assets/decorative/blockstates/stone_path.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/stop_sign.json b/src/main/resources/assets/decorative/blockstates/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/television.json b/src/main/resources/assets/decorative/blockstates/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/ten_sign.json b/src/main/resources/assets/decorative/blockstates/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/thirty_sign.json b/src/main/resources/assets/decorative/blockstates/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/traffic_cone.json b/src/main/resources/assets/decorative/blockstates/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/twenty_sign.json b/src/main/resources/assets/decorative/blockstates/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/wall_clock.json b/src/main/resources/assets/decorative/blockstates/wall_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/water_pump.json b/src/main/resources/assets/decorative/blockstates/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/white_digital_clock.json b/src/main/resources/assets/decorative/blockstates/white_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/white_double_lamp.json b/src/main/resources/assets/decorative/blockstates/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/white_lamp.json b/src/main/resources/assets/decorative/blockstates/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/yellow_digital_clock.json b/src/main/resources/assets/decorative/blockstates/yellow_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/yellow_double_lamp.json b/src/main/resources/assets/decorative/blockstates/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/blockstates/yellow_lamp.json b/src/main/resources/assets/decorative/blockstates/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/icon.png b/src/main/resources/assets/decorative/icon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/lang/de_de.json b/src/main/resources/assets/decorative/lang/de_de.json old mode 100644 new mode 100755 index 1a39920..cfae4f2 --- a/src/main/resources/assets/decorative/lang/de_de.json +++ b/src/main/resources/assets/decorative/lang/de_de.json @@ -1,4 +1,8 @@ { + // Config // + "decorative.midnightconfig.title":"Decorative Konfiguration", + "decorative.midnightconfig.timeFormat":"Zeitformat", + // ItemGroups // "itemGroup.decorative.indoor":"Decorative - Innen", "itemGroup.decorative.traffic":"Decorative - Verkehr", diff --git a/src/main/resources/assets/decorative/lang/en_us.json b/src/main/resources/assets/decorative/lang/en_us.json old mode 100644 new mode 100755 index b182880..516b6bd --- a/src/main/resources/assets/decorative/lang/en_us.json +++ b/src/main/resources/assets/decorative/lang/en_us.json @@ -1,7 +1,9 @@ { // Config // - "text.autoconfig.decorative.title":"Decorative Config", - "text.autoconfig.decorative.option.timeFormat":"Time Format", + "decorative.midnightconfig.title":"Decorative Config", + "decorative.midnightconfig.timeFormat":"Time Format", + "decorative.midnightconfig.enum.TimeFormat.h12":"12h", + "decorative.midnightconfig.enum.TimeFormat.h24":"24h", // ItemGroups // "itemGroup.decorative.indoor":"Decorative - Indoor", diff --git a/src/main/resources/assets/decorative/lang/ru_ru.json b/src/main/resources/assets/decorative/lang/ru_ru.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/materialmaps/block/black_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/black_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/black_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/black_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/black_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/black_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/black_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/black_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/blue_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/blue_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/blue_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/blue_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/blue_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/blue_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/blue_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/blue_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/brown_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/brown_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/brown_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/brown_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/brown_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/brown_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/brown_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/brown_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/christmas_lights.json b/src/main/resources/assets/decorative/materialmaps/block/christmas_lights.json old mode 100644 new mode 100755 index 26d17e2..11195f3 --- a/src/main/resources/assets/decorative/materialmaps/block/christmas_lights.json +++ b/src/main/resources/assets/decorative/materialmaps/block/christmas_lights.json @@ -1,14 +1,14 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "decorative:block/red_lamp", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:block/green_lamp", - "material": "canvas:emissive_no_diffuse" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "decorative:block/red_lamp", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:block/green_lamp", + "material": "canvas:emissive_no_diffuse" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/cyan_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/cyan_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/cyan_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/cyan_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/cyan_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/cyan_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/cyan_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/cyan_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/gray_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/gray_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/gray_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/gray_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/gray_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/gray_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/gray_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/gray_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/green_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/green_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/green_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/green_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/green_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/green_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/green_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/green_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/light_blue_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/light_blue_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/light_blue_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/light_blue_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/light_blue_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/light_blue_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/light_blue_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/light_blue_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/light_gray_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/light_gray_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/light_gray_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/light_gray_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/light_gray_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/light_gray_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/light_gray_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/light_gray_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/lime_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/lime_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/lime_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/lime_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/lime_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/lime_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/lime_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/lime_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/magenta_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/magenta_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/magenta_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/magenta_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/magenta_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/magenta_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/magenta_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/magenta_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/old_television.json b/src/main/resources/assets/decorative/materialmaps/block/old_television.json old mode 100644 new mode 100755 index 3e5e7c1..c19a4ed --- a/src/main/resources/assets/decorative/materialmaps/block/old_television.json +++ b/src/main/resources/assets/decorative/materialmaps/block/old_television.json @@ -1,26 +1,26 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "decorative:tv/nyancat", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/creeper", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/crabrave", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/tater", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "minecraft:block/lime_terracotta", - "material": "canvas:emissive_no_diffuse" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "decorative:tv/nyancat", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/creeper", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/crabrave", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/tater", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "minecraft:block/lime_terracotta", + "material": "canvas:emissive_no_diffuse" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/orange_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/orange_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/orange_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/orange_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/orange_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/orange_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/orange_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/orange_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/pink_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/pink_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/pink_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/pink_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/pink_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/pink_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/pink_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/pink_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/purple_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/purple_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/purple_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/purple_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/purple_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/purple_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/purple_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/purple_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/red_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/red_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/red_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/red_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/red_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/red_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/red_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/red_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/television.json b/src/main/resources/assets/decorative/materialmaps/block/television.json old mode 100644 new mode 100755 index 17d2869..f5fae3c --- a/src/main/resources/assets/decorative/materialmaps/block/television.json +++ b/src/main/resources/assets/decorative/materialmaps/block/television.json @@ -1,22 +1,22 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "decorative:tv/nyancat", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/creeper", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/crabrave", - "material": "canvas:emissive_no_diffuse" - }, - { - "sprite": "decorative:tv/tater", - "material": "canvas:emissive_no_diffuse" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "decorative:tv/nyancat", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/creeper", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/crabrave", + "material": "canvas:emissive_no_diffuse" + }, + { + "sprite": "decorative:tv/tater", + "material": "canvas:emissive_no_diffuse" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/white_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/white_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/white_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/white_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/white_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/white_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/white_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/white_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/yellow_double_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/yellow_double_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/yellow_double_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/yellow_double_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block/yellow_lamp.json b/src/main/resources/assets/decorative/materialmaps/block/yellow_lamp.json old mode 100644 new mode 100755 index 7cec135..43b79f6 --- a/src/main/resources/assets/decorative/materialmaps/block/yellow_lamp.json +++ b/src/main/resources/assets/decorative/materialmaps/block/yellow_lamp.json @@ -1,10 +1,10 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "minecraft:block/redstone_lamp_on", - "material": "canvas:warm_glow" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "minecraft:block/redstone_lamp_on", + "material": "canvas:warm_glow" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/materialmaps/block_entity/digital_clock_blockentity.json b/src/main/resources/assets/decorative/materialmaps/block_entity/digital_clock_blockentity.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/acacia_log_with_axe.json b/src/main/resources/assets/decorative/models/block/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/birch_log_with_axe.json b/src/main/resources/assets/decorative/models/block/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/bird_bath.json b/src/main/resources/assets/decorative/models/block/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/bird_bath_level1.json b/src/main/resources/assets/decorative/models/block/bird_bath_level1.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/bird_bath_level2.json b/src/main/resources/assets/decorative/models/block/bird_bath_level2.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/bird_bath_level3.json b/src/main/resources/assets/decorative/models/block/bird_bath_level3.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/black_digital_clock.json b/src/main/resources/assets/decorative/models/block/black_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/black_lamp_off.json b/src/main/resources/assets/decorative/models/block/black_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/black_lamp_on.json b/src/main/resources/assets/decorative/models/block/black_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/blue_digital_clock.json b/src/main/resources/assets/decorative/models/block/blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/blue_lamp_off.json b/src/main/resources/assets/decorative/models/block/blue_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/blue_lamp_on.json b/src/main/resources/assets/decorative/models/block/blue_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/brown_digital_clock.json b/src/main/resources/assets/decorative/models/block/brown_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/brown_lamp_off.json b/src/main/resources/assets/decorative/models/block/brown_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/brown_lamp_on.json b/src/main/resources/assets/decorative/models/block/brown_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/ceilingfan.json b/src/main/resources/assets/decorative/models/block/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/christmas_lights_off.json b/src/main/resources/assets/decorative/models/block/christmas_lights_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/christmas_lights_on.json b/src/main/resources/assets/decorative/models/block/christmas_lights_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/christmas_tree.json b/src/main/resources/assets/decorative/models/block/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/cyan_digital_clock.json b/src/main/resources/assets/decorative/models/block/cyan_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json b/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json b/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/models/block/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/digital_clock.json b/src/main/resources/assets/decorative/models/block/digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/double_lamp_bottom.json b/src/main/resources/assets/decorative/models/block/double_lamp_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/eighty_sign.json b/src/main/resources/assets/decorative/models/block/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/empty_sign.json b/src/main/resources/assets/decorative/models/block/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/fifty_sign.json b/src/main/resources/assets/decorative/models/block/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/fire_hydrant.json b/src/main/resources/assets/decorative/models/block/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/five_sign.json b/src/main/resources/assets/decorative/models/block/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/forty_sign.json b/src/main/resources/assets/decorative/models/block/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/gray_digital_clock.json b/src/main/resources/assets/decorative/models/block/gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/gray_lamp_off.json b/src/main/resources/assets/decorative/models/block/gray_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/gray_lamp_on.json b/src/main/resources/assets/decorative/models/block/gray_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/green_digital_clock.json b/src/main/resources/assets/decorative/models/block/green_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/green_lamp_off.json b/src/main/resources/assets/decorative/models/block/green_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/green_lamp_on.json b/src/main/resources/assets/decorative/models/block/green_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/guardrail.json b/src/main/resources/assets/decorative/models/block/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/jungle_log_with_axe.json b/src/main/resources/assets/decorative/models/block/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/kitchen_counter.json b/src/main/resources/assets/decorative/models/block/kitchen_counter.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/kitchen_counter_open.json b/src/main/resources/assets/decorative/models/block/kitchen_counter_open.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/kitchen_tiles.json b/src/main/resources/assets/decorative/models/block/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_blue_digital_clock.json b/src/main/resources/assets/decorative/models/block/light_blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json b/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json b/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_gray_digital_clock.json b/src/main/resources/assets/decorative/models/block/light_gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json b/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json b/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/lime_digital_clock.json b/src/main/resources/assets/decorative/models/block/lime_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/lime_lamp_off.json b/src/main/resources/assets/decorative/models/block/lime_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/lime_lamp_on.json b/src/main/resources/assets/decorative/models/block/lime_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/magenta_digital_clock.json b/src/main/resources/assets/decorative/models/block/magenta_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json b/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json b/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/ninety_sign.json b/src/main/resources/assets/decorative/models/block/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/oak_log_with_axe.json b/src/main/resources/assets/decorative/models/block/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/old_television_crabrave.json b/src/main/resources/assets/decorative/models/block/old_television_crabrave.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/old_television_creeper.json b/src/main/resources/assets/decorative/models/block/old_television_creeper.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/old_television_nyancat.json b/src/main/resources/assets/decorative/models/block/old_television_nyancat.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/old_television_off.json b/src/main/resources/assets/decorative/models/block/old_television_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/old_television_tater.json b/src/main/resources/assets/decorative/models/block/old_television_tater.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/onehundred_sign.json b/src/main/resources/assets/decorative/models/block/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/onehundredten_sign.json b/src/main/resources/assets/decorative/models/block/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/orange_digital_clock.json b/src/main/resources/assets/decorative/models/block/orange_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/orange_lamp_off.json b/src/main/resources/assets/decorative/models/block/orange_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/orange_lamp_on.json b/src/main/resources/assets/decorative/models/block/orange_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pennant_chain.json b/src/main/resources/assets/decorative/models/block/pennant_chain.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pink_digital_clock.json b/src/main/resources/assets/decorative/models/block/pink_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pink_lamp_off.json b/src/main/resources/assets/decorative/models/block/pink_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pink_lamp_on.json b/src/main/resources/assets/decorative/models/block/pink_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pool_sprinkler.json b/src/main/resources/assets/decorative/models/block/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pool_wall.json b/src/main/resources/assets/decorative/models/block/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/pool_wall_corner.json b/src/main/resources/assets/decorative/models/block/pool_wall_corner.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/purple_digital_clock.json b/src/main/resources/assets/decorative/models/block/purple_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/purple_lamp_off.json b/src/main/resources/assets/decorative/models/block/purple_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/purple_lamp_on.json b/src/main/resources/assets/decorative/models/block/purple_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/red_digital_clock.json b/src/main/resources/assets/decorative/models/block/red_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/red_lamp_off.json b/src/main/resources/assets/decorative/models/block/red_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/red_lamp_on.json b/src/main/resources/assets/decorative/models/block/red_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/road.json b/src/main/resources/assets/decorative/models/block/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/road_white_long.json b/src/main/resources/assets/decorative/models/block/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/road_white_short.json b/src/main/resources/assets/decorative/models/block/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/rocky_asphalt.json b/src/main/resources/assets/decorative/models/block/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/seventy_sign.json b/src/main/resources/assets/decorative/models/block/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/shower_head.json b/src/main/resources/assets/decorative/models/block/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sign_post.json b/src/main/resources/assets/decorative/models/block/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sixty_sign.json b/src/main/resources/assets/decorative/models/block/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sliding_door_bottom.json b/src/main/resources/assets/decorative/models/block/sliding_door_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sliding_door_bottom_open.json b/src/main/resources/assets/decorative/models/block/sliding_door_bottom_open.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sliding_door_top.json b/src/main/resources/assets/decorative/models/block/sliding_door_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/sliding_door_top_open.json b/src/main/resources/assets/decorative/models/block/sliding_door_top_open.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/smoke_detector_off.json b/src/main/resources/assets/decorative/models/block/smoke_detector_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/smoke_detector_on.json b/src/main/resources/assets/decorative/models/block/smoke_detector_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/springboard_back.json b/src/main/resources/assets/decorative/models/block/springboard_back.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/springboard_front.json b/src/main/resources/assets/decorative/models/block/springboard_front.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/spruce_log_with_axe.json b/src/main/resources/assets/decorative/models/block/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/stone_path.json b/src/main/resources/assets/decorative/models/block/stone_path.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/stop_sign.json b/src/main/resources/assets/decorative/models/block/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/television_crabrave.json b/src/main/resources/assets/decorative/models/block/television_crabrave.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/television_creeper.json b/src/main/resources/assets/decorative/models/block/television_creeper.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/television_nyancat.json b/src/main/resources/assets/decorative/models/block/television_nyancat.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/television_off.json b/src/main/resources/assets/decorative/models/block/television_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/television_tater.json b/src/main/resources/assets/decorative/models/block/television_tater.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/ten_sign.json b/src/main/resources/assets/decorative/models/block/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/thirty_sign.json b/src/main/resources/assets/decorative/models/block/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/traffic_cone.json b/src/main/resources/assets/decorative/models/block/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/twenty_sign.json b/src/main/resources/assets/decorative/models/block/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/wall_clock.json b/src/main/resources/assets/decorative/models/block/wall_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/water_pump.json b/src/main/resources/assets/decorative/models/block/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/white_digital_clock.json b/src/main/resources/assets/decorative/models/block/white_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/white_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/white_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/white_lamp_off.json b/src/main/resources/assets/decorative/models/block/white_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/white_lamp_on.json b/src/main/resources/assets/decorative/models/block/white_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/yellow_digital_clock.json b/src/main/resources/assets/decorative/models/block/yellow_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json b/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json b/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json b/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/bath_tire.json b/src/main/resources/assets/decorative/models/item/bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/beach_ball.json b/src/main/resources/assets/decorative/models/item/beach_ball.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json b/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/bird_bath.json b/src/main/resources/assets/decorative/models/item/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/black_bath_tire.json b/src/main/resources/assets/decorative/models/item/black_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/black_digital_clock.json b/src/main/resources/assets/decorative/models/item/black_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/black_double_lamp.json b/src/main/resources/assets/decorative/models/item/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/black_lamp.json b/src/main/resources/assets/decorative/models/item/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/blue_bath_tire.json b/src/main/resources/assets/decorative/models/item/blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/blue_digital_clock.json b/src/main/resources/assets/decorative/models/item/blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/blue_double_lamp.json b/src/main/resources/assets/decorative/models/item/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/blue_lamp.json b/src/main/resources/assets/decorative/models/item/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/brown_bath_tire.json b/src/main/resources/assets/decorative/models/item/brown_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/brown_digital_clock.json b/src/main/resources/assets/decorative/models/item/brown_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/brown_double_lamp.json b/src/main/resources/assets/decorative/models/item/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/brown_lamp.json b/src/main/resources/assets/decorative/models/item/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/ceilingfan.json b/src/main/resources/assets/decorative/models/item/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/christmas_lights.json b/src/main/resources/assets/decorative/models/item/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/christmas_tree.json b/src/main/resources/assets/decorative/models/item/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/cyan_bath_tire.json b/src/main/resources/assets/decorative/models/item/cyan_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/cyan_digital_clock.json b/src/main/resources/assets/decorative/models/item/cyan_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json b/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/cyan_lamp.json b/src/main/resources/assets/decorative/models/item/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/duck_bath_tire.json b/src/main/resources/assets/decorative/models/item/duck_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/eighty_sign.json b/src/main/resources/assets/decorative/models/item/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/empty_sign.json b/src/main/resources/assets/decorative/models/item/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/fifty_sign.json b/src/main/resources/assets/decorative/models/item/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/fire_hydrant.json b/src/main/resources/assets/decorative/models/item/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/five_sign.json b/src/main/resources/assets/decorative/models/item/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/forty_sign.json b/src/main/resources/assets/decorative/models/item/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/gray_bath_tire.json b/src/main/resources/assets/decorative/models/item/gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/gray_digital_clock.json b/src/main/resources/assets/decorative/models/item/gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/gray_double_lamp.json b/src/main/resources/assets/decorative/models/item/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/gray_lamp.json b/src/main/resources/assets/decorative/models/item/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/green_bath_tire.json b/src/main/resources/assets/decorative/models/item/green_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/green_digital_clock.json b/src/main/resources/assets/decorative/models/item/green_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/green_double_lamp.json b/src/main/resources/assets/decorative/models/item/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/green_lamp.json b/src/main/resources/assets/decorative/models/item/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/guardrail.json b/src/main/resources/assets/decorative/models/item/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json b/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/kitchen_tiles.json b/src/main/resources/assets/decorative/models/item/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_blue_bath_tire.json b/src/main/resources/assets/decorative/models/item/light_blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_blue_digital_clock.json b/src/main/resources/assets/decorative/models/item/light_blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json b/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_blue_lamp.json b/src/main/resources/assets/decorative/models/item/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_gray_bath_tire.json b/src/main/resources/assets/decorative/models/item/light_gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_gray_digital_clock.json b/src/main/resources/assets/decorative/models/item/light_gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json b/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/light_gray_lamp.json b/src/main/resources/assets/decorative/models/item/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/lime_bath_tire.json b/src/main/resources/assets/decorative/models/item/lime_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/lime_digital_clock.json b/src/main/resources/assets/decorative/models/item/lime_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/lime_double_lamp.json b/src/main/resources/assets/decorative/models/item/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/lime_lamp.json b/src/main/resources/assets/decorative/models/item/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/magenta_bath_tire.json b/src/main/resources/assets/decorative/models/item/magenta_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/magenta_digital_clock.json b/src/main/resources/assets/decorative/models/item/magenta_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json b/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/magenta_lamp.json b/src/main/resources/assets/decorative/models/item/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/ninety_sign.json b/src/main/resources/assets/decorative/models/item/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json b/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/old_television.json b/src/main/resources/assets/decorative/models/item/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/onehundred_sign.json b/src/main/resources/assets/decorative/models/item/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/onehundredten_sign.json b/src/main/resources/assets/decorative/models/item/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/orange_bath_tire.json b/src/main/resources/assets/decorative/models/item/orange_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/orange_digital_clock.json b/src/main/resources/assets/decorative/models/item/orange_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/orange_double_lamp.json b/src/main/resources/assets/decorative/models/item/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/orange_lamp.json b/src/main/resources/assets/decorative/models/item/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pink_bath_tire.json b/src/main/resources/assets/decorative/models/item/pink_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pink_digital_clock.json b/src/main/resources/assets/decorative/models/item/pink_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pink_double_lamp.json b/src/main/resources/assets/decorative/models/item/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pink_lamp.json b/src/main/resources/assets/decorative/models/item/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pool_sprinkler.json b/src/main/resources/assets/decorative/models/item/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/pool_wall.json b/src/main/resources/assets/decorative/models/item/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/purple_bath_tire.json b/src/main/resources/assets/decorative/models/item/purple_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/purple_digital_clock.json b/src/main/resources/assets/decorative/models/item/purple_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/purple_double_lamp.json b/src/main/resources/assets/decorative/models/item/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/purple_lamp.json b/src/main/resources/assets/decorative/models/item/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/red_bath_tire.json b/src/main/resources/assets/decorative/models/item/red_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/red_digital_clock.json b/src/main/resources/assets/decorative/models/item/red_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/red_double_lamp.json b/src/main/resources/assets/decorative/models/item/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/red_lamp.json b/src/main/resources/assets/decorative/models/item/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/road.json b/src/main/resources/assets/decorative/models/item/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/road_white_long.json b/src/main/resources/assets/decorative/models/item/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/road_white_short.json b/src/main/resources/assets/decorative/models/item/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/rocky_asphalt.json b/src/main/resources/assets/decorative/models/item/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/seventy_sign.json b/src/main/resources/assets/decorative/models/item/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/shower_head.json b/src/main/resources/assets/decorative/models/item/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/sign_post.json b/src/main/resources/assets/decorative/models/item/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/sixty_sign.json b/src/main/resources/assets/decorative/models/item/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/sliding_door.json b/src/main/resources/assets/decorative/models/item/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/smoke_detector.json b/src/main/resources/assets/decorative/models/item/smoke_detector.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/springboard.json b/src/main/resources/assets/decorative/models/item/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json b/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/stone_path.json b/src/main/resources/assets/decorative/models/item/stone_path.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/stop_sign.json b/src/main/resources/assets/decorative/models/item/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/television.json b/src/main/resources/assets/decorative/models/item/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/ten_sign.json b/src/main/resources/assets/decorative/models/item/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/thirty_sign.json b/src/main/resources/assets/decorative/models/item/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/traffic_cone.json b/src/main/resources/assets/decorative/models/item/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/twenty_sign.json b/src/main/resources/assets/decorative/models/item/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/wall_clock.json b/src/main/resources/assets/decorative/models/item/wall_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/water_pump.json b/src/main/resources/assets/decorative/models/item/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/white_bath_tire.json b/src/main/resources/assets/decorative/models/item/white_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/white_digital_clock.json b/src/main/resources/assets/decorative/models/item/white_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/white_double_lamp.json b/src/main/resources/assets/decorative/models/item/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/white_lamp.json b/src/main/resources/assets/decorative/models/item/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/yellow_bath_tire.json b/src/main/resources/assets/decorative/models/item/yellow_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/yellow_digital_clock.json b/src/main/resources/assets/decorative/models/item/yellow_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json b/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/models/item/yellow_lamp.json b/src/main/resources/assets/decorative/models/item/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/sounds.json b/src/main/resources/assets/decorative/sounds.json old mode 100644 new mode 100755 index 9bf9a5c..29c55c6 --- a/src/main/resources/assets/decorative/sounds.json +++ b/src/main/resources/assets/decorative/sounds.json @@ -1,18 +1,18 @@ -{ - "ceiling_fan.ambient": { - "sounds": [ - { - "name": "decorative:block/ceiling_fan_ambient", - "stream": false - } - ] - }, - "smoke_detector.beep": { - "sounds": [ - { - "name": "decorative:block/smoke_detector_beep", - "stream": false - } - ] - } +{ + "ceiling_fan.ambient": { + "sounds": [ + { + "name": "decorative:block/ceiling_fan_ambient", + "stream": false + } + ] + }, + "smoke_detector.beep": { + "sounds": [ + { + "name": "decorative:block/smoke_detector_beep", + "stream": false + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg b/src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/sounds/block/smoke_detector_beep.ogg b/src/main/resources/assets/decorative/sounds/block/smoke_detector_beep.ogg old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/alarm_light_off.png b/src/main/resources/assets/decorative/textures/block/alarm_light_off.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/alarm_light_on.png b/src/main/resources/assets/decorative/textures/block/alarm_light_on.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/alarm_light_on.png.mcmeta b/src/main/resources/assets/decorative/textures/block/alarm_light_on.png.mcmeta old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/ceilingfan.png b/src/main/resources/assets/decorative/textures/block/ceilingfan.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/clock.png b/src/main/resources/assets/decorative/textures/block/clock.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/green_lamp.png b/src/main/resources/assets/decorative/textures/block/green_lamp.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/green_lamp_off.png b/src/main/resources/assets/decorative/textures/block/green_lamp_off.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/kitchen_tiles.png b/src/main/resources/assets/decorative/textures/block/kitchen_tiles.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/leaves_spruce_color.png b/src/main/resources/assets/decorative/textures/block/leaves_spruce_color.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/red_lamp.png b/src/main/resources/assets/decorative/textures/block/red_lamp.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/red_lamp_off.png b/src/main/resources/assets/decorative/textures/block/red_lamp_off.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/road.png b/src/main/resources/assets/decorative/textures/block/road.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/road_white_long.png b/src/main/resources/assets/decorative/textures/block/road_white_long.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/road_white_short.png b/src/main/resources/assets/decorative/textures/block/road_white_short.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/rocky_asphalt.png b/src/main/resources/assets/decorative/textures/block/rocky_asphalt.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/shower_head.png b/src/main/resources/assets/decorative/textures/block/shower_head.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/10.png b/src/main/resources/assets/decorative/textures/block/sign/10.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/100.png b/src/main/resources/assets/decorative/textures/block/sign/100.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/110.png b/src/main/resources/assets/decorative/textures/block/sign/110.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/20.png b/src/main/resources/assets/decorative/textures/block/sign/20.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/30.png b/src/main/resources/assets/decorative/textures/block/sign/30.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/40.png b/src/main/resources/assets/decorative/textures/block/sign/40.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/5.png b/src/main/resources/assets/decorative/textures/block/sign/5.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/50.png b/src/main/resources/assets/decorative/textures/block/sign/50.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/60.png b/src/main/resources/assets/decorative/textures/block/sign/60.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/70.png b/src/main/resources/assets/decorative/textures/block/sign/70.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/80.png b/src/main/resources/assets/decorative/textures/block/sign/80.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/90.png b/src/main/resources/assets/decorative/textures/block/sign/90.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/circle.png b/src/main/resources/assets/decorative/textures/block/sign/circle.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/empty.png b/src/main/resources/assets/decorative/textures/block/sign/empty.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/hexagon.png b/src/main/resources/assets/decorative/textures/block/sign/hexagon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/block/sign/stop.png b/src/main/resources/assets/decorative/textures/block/sign/stop.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/entity/beach_ball.png b/src/main/resources/assets/decorative/textures/entity/beach_ball.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/entity/duck_bath_tire.png b/src/main/resources/assets/decorative/textures/entity/duck_bath_tire.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/item/sliding_door.png b/src/main/resources/assets/decorative/textures/item/sliding_door.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/black.png b/src/main/resources/assets/decorative/textures/tv/black.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave.png b/src/main/resources/assets/decorative/textures/tv/crabrave.png old mode 100644 new mode 100755 index 5ee67b7..93156cc Binary files a/src/main/resources/assets/decorative/textures/tv/crabrave.png and b/src/main/resources/assets/decorative/textures/tv/crabrave.png differ diff --git a/src/main/resources/assets/decorative/textures/tv/crabrave.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/crabrave.png.mcmeta old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/creeper.png b/src/main/resources/assets/decorative/textures/tv/creeper.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/creeper.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/creeper.png.mcmeta old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat.png b/src/main/resources/assets/decorative/textures/tv/nyancat.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/nyancat.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/nyancat.png.mcmeta old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/tater.png b/src/main/resources/assets/decorative/textures/tv/tater.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/decorative/textures/tv/tater.png.mcmeta b/src/main/resources/assets/decorative/textures/tv/tater.png.mcmeta old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/acacia_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/birch_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/bird_bath.json b/src/main/resources/data/decorative/loot_tables/blocks/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/black_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/black_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/blue_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/blue_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/brown_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/brown_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/ceilingfan.json b/src/main/resources/data/decorative/loot_tables/blocks/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/christmas_lights.json b/src/main/resources/data/decorative/loot_tables/blocks/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/christmas_tree.json b/src/main/resources/data/decorative/loot_tables/blocks/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/cyan_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/cyan_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/dark_oak_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/eighty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/empty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/fifty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/fire_hydrant.json b/src/main/resources/data/decorative/loot_tables/blocks/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/five_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/forty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/gray_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/gray_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/green_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/green_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/guardrail.json b/src/main/resources/data/decorative/loot_tables/blocks/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/jungle_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/kitchen_tiles.json b/src/main/resources/data/decorative/loot_tables/blocks/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/light_blue_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/light_blue_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/light_gray_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/light_gray_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/lime_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/lime_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/magenta_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/magenta_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/ninety_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/oak_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/old_television.json b/src/main/resources/data/decorative/loot_tables/blocks/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/onehundred_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/onehundredten_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/orange_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/orange_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/pink_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/pink_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/pool_sprinkler.json b/src/main/resources/data/decorative/loot_tables/blocks/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/pool_wall.json b/src/main/resources/data/decorative/loot_tables/blocks/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/purple_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/purple_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/red_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/red_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/road.json b/src/main/resources/data/decorative/loot_tables/blocks/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/road_white_long.json b/src/main/resources/data/decorative/loot_tables/blocks/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/road_white_short.json b/src/main/resources/data/decorative/loot_tables/blocks/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/rocky_asphalt.json b/src/main/resources/data/decorative/loot_tables/blocks/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/seventy_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/shower_head.json b/src/main/resources/data/decorative/loot_tables/blocks/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/sign_post.json b/src/main/resources/data/decorative/loot_tables/blocks/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/sixty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/sliding_door.json b/src/main/resources/data/decorative/loot_tables/blocks/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/springboard.json b/src/main/resources/data/decorative/loot_tables/blocks/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/spruce_log_with_axe.json b/src/main/resources/data/decorative/loot_tables/blocks/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/stop_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/television.json b/src/main/resources/data/decorative/loot_tables/blocks/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/ten_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/thirty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/traffic_cone.json b/src/main/resources/data/decorative/loot_tables/blocks/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/twenty_sign.json b/src/main/resources/data/decorative/loot_tables/blocks/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/water_pump.json b/src/main/resources/data/decorative/loot_tables/blocks/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/white_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/white_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/yellow_double_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/blocks/yellow_lamp.json b/src/main/resources/data/decorative/loot_tables/blocks/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/black_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/black_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/blue_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/brown_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/brown_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/cyan_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/cyan_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/duck_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/duck_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/gray_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/green_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/green_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/light_blue_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/light_blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/light_gray_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/light_gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/lime_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/lime_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/magenta_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/magenta_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/orange_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/orange_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/pink_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/pink_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/purple_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/purple_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/red_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/red_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/white_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/white_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/loot_tables/entities/yellow_bath_tire.json b/src/main/resources/data/decorative/loot_tables/entities/yellow_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/book.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/book.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/garden.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/garden.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/indoor.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/indoor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/pool.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/pool.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/traffic.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/categories/traffic.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/acacia_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/beach_ball.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/beach_ball.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/birch_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/bird_bath.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ceilingfan.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/christmas_lights.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/christmas_tree.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/dark_oak_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/duck_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/duck_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/eighty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/empty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/fifty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/fire_hydrant.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/five_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/forty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/guardrail.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/jungle_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/kitchen_tiles.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ninety_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/oak_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/old_television.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/onehundred_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/onehundredten_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pool_sprinkler.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pool_wall.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road_white_long.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road_white_short.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/rocky_asphalt.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/seventy_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/shower_head.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sign_post.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sixty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sliding_door.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/springboard.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/spruce_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/stop_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/television.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ten_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/thirty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/traffic_cone.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/twenty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/water_pump.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/de_de/entries/decoration_guide/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/garden.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/garden.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/indoor.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/indoor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/pool.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/pool.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/traffic.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/categories/traffic.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/acacia_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/beach_ball.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/beach_ball.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/birch_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/bird_bath.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ceilingfan.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/christmas_lights.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/christmas_tree.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dark_oak_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/black_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/black_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/blue_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/brown_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/brown_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/cyan_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/cyan_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/gray_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/green_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/green_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/light_blue_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/light_blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/light_gray_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/light_gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/magenta_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/magenta_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/orange_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/orange_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/pink_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/pink_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/purple_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/purple_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/red_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/red_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/white_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/white_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/yellow_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/dc/yellow_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/duck_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/duck_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/eighty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/eighty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/empty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/fifty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/fifty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/fire_hydrant.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/five_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/five_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/forty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/forty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/guardrail.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/jungle_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/kitchen_tiles.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_digital_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ninety_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ninety_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/oak_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/old_television.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/onehundred_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/onehundred_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/onehundredten_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/onehundredten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pool_sprinkler.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pool_wall.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road_white_long.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road_white_long.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road_white_short.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/road_white_short.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/rocky_asphalt.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/rocky_asphalt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/seventy_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/seventy_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/shower_head.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sign_post.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sixty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sixty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sliding_door.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/springboard.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/spruce_log_with_axe.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/stone_path.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/stone_path.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/stop_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/stop_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/television.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ten_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/ten_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/thirty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/thirty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/traffic_cone.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/twenty_sign.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/twenty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/wall_clock.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/wall_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/water_pump.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_bath_tire.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_double_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_lamp.json b/src/main/resources/data/decorative/patchouli_books/decoration_guide/en_us/entries/decoration_guide/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/acacia_log_with_axe.json b/src/main/resources/data/decorative/recipes/acacia_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/beach_ball.json b/src/main/resources/data/decorative/recipes/beach_ball.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/birch_log_with_axe.json b/src/main/resources/data/decorative/recipes/birch_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/bird_bath.json b/src/main/resources/data/decorative/recipes/bird_bath.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/black_bath_tire.json b/src/main/resources/data/decorative/recipes/black_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/black_digital_clock.json b/src/main/resources/data/decorative/recipes/black_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/black_double_lamp.json b/src/main/resources/data/decorative/recipes/black_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/black_lamp.json b/src/main/resources/data/decorative/recipes/black_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/blue_bath_tire.json b/src/main/resources/data/decorative/recipes/blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/blue_digital_clock.json b/src/main/resources/data/decorative/recipes/blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/blue_double_lamp.json b/src/main/resources/data/decorative/recipes/blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/blue_lamp.json b/src/main/resources/data/decorative/recipes/blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/brown_bath_tire.json b/src/main/resources/data/decorative/recipes/brown_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/brown_digital_clock.json b/src/main/resources/data/decorative/recipes/brown_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/brown_double_lamp.json b/src/main/resources/data/decorative/recipes/brown_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/brown_lamp.json b/src/main/resources/data/decorative/recipes/brown_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/ceilingfan.json b/src/main/resources/data/decorative/recipes/ceilingfan.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/christmas_lights.json b/src/main/resources/data/decorative/recipes/christmas_lights.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/christmas_tree.json b/src/main/resources/data/decorative/recipes/christmas_tree.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/cyan_bath_tire.json b/src/main/resources/data/decorative/recipes/cyan_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/cyan_digital_clock.json b/src/main/resources/data/decorative/recipes/cyan_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/cyan_double_lamp.json b/src/main/resources/data/decorative/recipes/cyan_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/cyan_lamp.json b/src/main/resources/data/decorative/recipes/cyan_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/dark_oak_log_with_axe.json b/src/main/resources/data/decorative/recipes/dark_oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign.json b/src/main/resources/data/decorative/recipes/empty_sign.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_eighty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_eighty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_fifty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_fifty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_five_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_five_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_forty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_forty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_ninety_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_ninety_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_onehundred_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_onehundred_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_onehundredten_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_onehundredten_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_seventy_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_seventy_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_sixty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_sixty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_stop_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_stop_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_ten_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_ten_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_thirty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_thirty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/empty_sign_to_twenty_sign_stonecutting.json b/src/main/resources/data/decorative/recipes/empty_sign_to_twenty_sign_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/fire_hydrant.json b/src/main/resources/data/decorative/recipes/fire_hydrant.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/gray_bath_tire.json b/src/main/resources/data/decorative/recipes/gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/gray_digital_clock.json b/src/main/resources/data/decorative/recipes/gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/gray_double_lamp.json b/src/main/resources/data/decorative/recipes/gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/gray_lamp.json b/src/main/resources/data/decorative/recipes/gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/green_bath_tire.json b/src/main/resources/data/decorative/recipes/green_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/green_digital_clock.json b/src/main/resources/data/decorative/recipes/green_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/green_double_lamp.json b/src/main/resources/data/decorative/recipes/green_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/green_lamp.json b/src/main/resources/data/decorative/recipes/green_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/guardrail.json b/src/main/resources/data/decorative/recipes/guardrail.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/jungle_log_with_axe.json b/src/main/resources/data/decorative/recipes/jungle_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/kitchen_tiles.json b/src/main/resources/data/decorative/recipes/kitchen_tiles.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_blue_bath_tire.json b/src/main/resources/data/decorative/recipes/light_blue_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_blue_digital_clock.json b/src/main/resources/data/decorative/recipes/light_blue_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_blue_double_lamp.json b/src/main/resources/data/decorative/recipes/light_blue_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_blue_lamp.json b/src/main/resources/data/decorative/recipes/light_blue_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_gray_bath_tire.json b/src/main/resources/data/decorative/recipes/light_gray_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_gray_digital_clock.json b/src/main/resources/data/decorative/recipes/light_gray_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_gray_double_lamp.json b/src/main/resources/data/decorative/recipes/light_gray_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/light_gray_lamp.json b/src/main/resources/data/decorative/recipes/light_gray_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/lime_bath_tire.json b/src/main/resources/data/decorative/recipes/lime_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/lime_digital_clock.json b/src/main/resources/data/decorative/recipes/lime_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/lime_double_lamp.json b/src/main/resources/data/decorative/recipes/lime_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/lime_lamp.json b/src/main/resources/data/decorative/recipes/lime_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/magenta_bath_tire.json b/src/main/resources/data/decorative/recipes/magenta_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/magenta_digital_clock.json b/src/main/resources/data/decorative/recipes/magenta_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/magenta_double_lamp.json b/src/main/resources/data/decorative/recipes/magenta_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/magenta_lamp.json b/src/main/resources/data/decorative/recipes/magenta_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/oak_log_with_axe.json b/src/main/resources/data/decorative/recipes/oak_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/old_television.json b/src/main/resources/data/decorative/recipes/old_television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/orange_bath_tire.json b/src/main/resources/data/decorative/recipes/orange_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/orange_digital_clock.json b/src/main/resources/data/decorative/recipes/orange_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/orange_double_lamp.json b/src/main/resources/data/decorative/recipes/orange_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/orange_lamp.json b/src/main/resources/data/decorative/recipes/orange_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pink_bath_tire.json b/src/main/resources/data/decorative/recipes/pink_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pink_digital_clock.json b/src/main/resources/data/decorative/recipes/pink_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pink_double_lamp.json b/src/main/resources/data/decorative/recipes/pink_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pink_lamp.json b/src/main/resources/data/decorative/recipes/pink_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pool_sprinkler.json b/src/main/resources/data/decorative/recipes/pool_sprinkler.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/pool_wall.json b/src/main/resources/data/decorative/recipes/pool_wall.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/purple_bath_tire.json b/src/main/resources/data/decorative/recipes/purple_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/purple_digital_clock.json b/src/main/resources/data/decorative/recipes/purple_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/purple_double_lamp.json b/src/main/resources/data/decorative/recipes/purple_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/purple_lamp.json b/src/main/resources/data/decorative/recipes/purple_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/red_bath_tire.json b/src/main/resources/data/decorative/recipes/red_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/red_digital_clock.json b/src/main/resources/data/decorative/recipes/red_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/red_double_lamp.json b/src/main/resources/data/decorative/recipes/red_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/red_lamp.json b/src/main/resources/data/decorative/recipes/red_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/road_to_road_white_long_stonecutting.json b/src/main/resources/data/decorative/recipes/road_to_road_white_long_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/road_to_road_white_short_stonecutting.json b/src/main/resources/data/decorative/recipes/road_to_road_white_short_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_stonecutting.json b/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_white_long_stonecutting.json b/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_white_long_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_white_short_stonecutting.json b/src/main/resources/data/decorative/recipes/rocky_asphalt_to_road_white_short_stonecutting.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/shower_head.json b/src/main/resources/data/decorative/recipes/shower_head.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/sign_post.json b/src/main/resources/data/decorative/recipes/sign_post.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/sliding_door.json b/src/main/resources/data/decorative/recipes/sliding_door.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/springboard.json b/src/main/resources/data/decorative/recipes/springboard.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/spruce_log_with_axe.json b/src/main/resources/data/decorative/recipes/spruce_log_with_axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/stone_path.json b/src/main/resources/data/decorative/recipes/stone_path.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/television.json b/src/main/resources/data/decorative/recipes/television.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/traffic_cone.json b/src/main/resources/data/decorative/recipes/traffic_cone.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/wall_clock.json b/src/main/resources/data/decorative/recipes/wall_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/water_pump.json b/src/main/resources/data/decorative/recipes/water_pump.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/white_bath_tire.json b/src/main/resources/data/decorative/recipes/white_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/white_digital_clock.json b/src/main/resources/data/decorative/recipes/white_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/white_double_lamp.json b/src/main/resources/data/decorative/recipes/white_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/white_lamp.json b/src/main/resources/data/decorative/recipes/white_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/yellow_bath_tire.json b/src/main/resources/data/decorative/recipes/yellow_bath_tire.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/yellow_digital_clock.json b/src/main/resources/data/decorative/recipes/yellow_digital_clock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/yellow_double_lamp.json b/src/main/resources/data/decorative/recipes/yellow_double_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/decorative/recipes/yellow_lamp.json b/src/main/resources/data/decorative/recipes/yellow_lamp.json old mode 100644 new mode 100755 diff --git a/src/main/resources/decorative.mixins.json b/src/main/resources/decorative.mixins.json old mode 100644 new mode 100755 index baa1df2..ed21d1f --- a/src/main/resources/decorative.mixins.json +++ b/src/main/resources/decorative.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "eu.midnightdust.motschen.decorative.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_16", "mixins": [ "GenerationSettingsAccessorMixin" ], diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json old mode 100644 new mode 100755 index b6e5789..8c44f61 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,8 +37,7 @@ "depends": { "fabric": "*", - "autoconfig1u": "*", - "cloth-config2": "*" + "midnightlib": "*" }, "suggests": { "patchouli": "*"