From 328e15d4d5d0911bba1cf22beae1f49a0b6dd7ca Mon Sep 17 00:00:00 2001 From: Malte Reents Date: Wed, 13 Mar 2024 22:57:45 +0100 Subject: [PATCH 1/4] Block gets placed, when clicked on Guardian es gibt ein Item, wenn man mit dem auf einen Elder Guardian rechtsklickt, stirbt der Guardian und ein Block spawnt --- gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ .../modchest/block/custom/denkMalBlock.java | 30 +++ .../block/custom/steeringWheelBlock.java | 2 +- src/main/java/modchest/block/modBlocks.java | 6 + .../modchest/item/custom/denkMalItem.java | 56 ++++ src/main/java/modchest/item/modItems.java | 10 +- .../modchest/models/block/senk_mal_block.json | 6 + 9 files changed, 454 insertions(+), 4 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 src/main/java/modchest/block/custom/denkMalBlock.java create mode 100644 src/main/java/modchest/item/custom/denkMalItem.java create mode 100644 src/main/resources/assets/modchest/models/block/senk_mal_block.json diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/modchest/block/custom/denkMalBlock.java b/src/main/java/modchest/block/custom/denkMalBlock.java new file mode 100644 index 0000000..2ee23f2 --- /dev/null +++ b/src/main/java/modchest/block/custom/denkMalBlock.java @@ -0,0 +1,30 @@ +package modchest.block.custom; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.explosion.Explosion; +import org.jetbrains.annotations.Nullable; + +public class denkMalBlock extends BlockWithEntity { //Item soll nciht craftable sein + public denkMalBlock(FabricBlockSettings fabricBlockSettings) { + super(fabricBlockSettings); + } + + @Nullable + @Override //Später relevant für das Interface + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return null; + } + + @Override //Block soll nicht gedroped werden; Nur mit Silktouch + public boolean shouldDropItemsOnExplosion(Explosion explosion) { + return false; + } +} diff --git a/src/main/java/modchest/block/custom/steeringWheelBlock.java b/src/main/java/modchest/block/custom/steeringWheelBlock.java index af19f07..35b1e25 100644 --- a/src/main/java/modchest/block/custom/steeringWheelBlock.java +++ b/src/main/java/modchest/block/custom/steeringWheelBlock.java @@ -33,7 +33,7 @@ public class steeringWheelBlock extends BlockWithEntity implements BlockEntityPr } @Override - public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { + public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { //Aufgerufen bei blockstate veraenderung, z.B. restonestaerke if (state.getBlock() != newState.getBlock()) { BlockEntity blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof steeringWheelEntity) { diff --git a/src/main/java/modchest/block/modBlocks.java b/src/main/java/modchest/block/modBlocks.java index c31f7f3..36ecdae 100644 --- a/src/main/java/modchest/block/modBlocks.java +++ b/src/main/java/modchest/block/modBlocks.java @@ -1,5 +1,6 @@ package modchest.block; +import modchest.block.custom.denkMalBlock; import modchest.block.custom.steeringWheelBlock; import modchest.item.modItemGroup; import modchest.REServerMod; @@ -15,12 +16,17 @@ import net.minecraft.util.registry.Registry; //setzt die blöcke auf public class modBlocks { public static Block steering_wheel; // Block wird erstellt + public static Block denk_mal_block; public static void setBlocks() {// Block wird definiert steering_wheel = registerBlock("steering_wheel", new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()), modItemGroup.modchest); + denk_mal_block = registerBlock("denk_mal_block", + new denkMalBlock(FabricBlockSettings.of(Material.METAL).strength(1.0f).requiresTool()), + modItemGroup.modchest); + } private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben diff --git a/src/main/java/modchest/item/custom/denkMalItem.java b/src/main/java/modchest/item/custom/denkMalItem.java new file mode 100644 index 0000000..94c1df4 --- /dev/null +++ b/src/main/java/modchest/item/custom/denkMalItem.java @@ -0,0 +1,56 @@ +package modchest.item.custom; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; +import oshi.annotation.concurrent.ThreadSafe; + +import static modchest.block.modBlocks.denk_mal_block; + +public class denkMalItem extends Item { + World thisWorld; + boolean used = false; + + public denkMalItem(FabricItemSettings fabricItemSettings) { + super(fabricItemSettings); + } + + public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { + if (thisWorld != null) { + if (entity.getType().toString().equals("entity.minecraft.elder_guardian")) { + user.sendMessage(Text.of(String.valueOf(Registry.BLOCK.getId(denk_mal_block)))); + entity.kill(); + if (!entity.isAlive()) { + BlockPos pos = new BlockPos((int) entity.getPos().getX(), ((int) entity.getPos().getY()), (int) entity.getPos().getZ()); + try { + BlockState state = denk_mal_block.getDefaultState(); + thisWorld.setBlockState(pos, state, Block.NOTIFY_ALL); + } catch (Exception e) { + user.sendMessage((Text) e); + } + } + return ActionResult.SUCCESS; + + } + } + return ActionResult.PASS; + } + + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { //wird vor useOnEntity aufgerufen + thisWorld = world; + return TypedActionResult.pass(user.getStackInHand(hand)); + } +} diff --git a/src/main/java/modchest/item/modItems.java b/src/main/java/modchest/item/modItems.java index 92e9596..f84cef3 100644 --- a/src/main/java/modchest/item/modItems.java +++ b/src/main/java/modchest/item/modItems.java @@ -1,6 +1,7 @@ package modchest.item; import modchest.REServerMod; +import modchest.item.custom.denkMalItem; import modchest.item.custom.piratesCoinItem; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; @@ -10,18 +11,21 @@ import net.minecraft.util.registry.Registry; //Liste der Items die hinzugefügt werden, ausgenommen Blöcke public class modItems { public static Item shipblock; // shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für - // das steering_wheel braucht zum craften, mehr macht es bisher nicht + // das steering_wheel braucht zum craften, mehr macht es bisher nicht public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist - // im detail erklärt was das Item machen soll + // im detail erklärt was das Item machen soll + public static Item denk_mal_item; public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest))); pirates_coin = registerItem("pirates_coin", new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16))); + denk_mal_item = registerItem("denk_mal_item", + new denkMalItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(1))); } private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt; - // nicht bearbeiten ist eine generische MEthode + // nicht bearbeiten ist eine generische MEthode return Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), item); } diff --git a/src/main/resources/assets/modchest/models/block/senk_mal_block.json b/src/main/resources/assets/modchest/models/block/senk_mal_block.json new file mode 100644 index 0000000..9f0a582 --- /dev/null +++ b/src/main/resources/assets/modchest/models/block/senk_mal_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "modchest:block/denk_mal_block" + } +} \ No newline at end of file From e6acd9460d77935bfcea981ee5dc146ed88b96c0 Mon Sep 17 00:00:00 2001 From: Malte Reents Date: Thu, 14 Mar 2024 15:17:01 +0100 Subject: [PATCH 2/4] basic functions for replacing work Es wird ein Block platziert wenn man auf einen Guardian rechtsklicked. Grafiken laden auch --- .../java/modchest/REServerModClient.java | 4 +- .../java/modchest/util/initializer.java | 33 ++ .../modchest/block/custom/denkMalBlock.java | 15 + .../block/custom/steeringWheelBlock.java | 5 +- src/main/java/modchest/block/modBlocks.java | 3 +- .../modchest/blockstates/denk_mal_block.json | 5 + .../models/block/denk_mal_block_an.json | 87 +++++ .../models/block/denk_mal_block_aus.json | 324 ++++++++++++++++++ .../modchest/models/block/senk_mal_block.json | 6 - .../modchest/models/item/denk_mal_block.json | 3 + .../textures/block/denk_mal_block.png | Bin 0 -> 2218 bytes .../textures/block/denk_mal_block_basis.png | Bin 0 -> 2610 bytes .../textures/block/denk_mal_block_kern_an.png | Bin 0 -> 1864 bytes .../block/denk_mal_block_kern_aus.png | Bin 0 -> 1847 bytes 14 files changed, 474 insertions(+), 11 deletions(-) create mode 100644 src/client/java/modchest/util/initializer.java create mode 100644 src/main/resources/assets/modchest/blockstates/denk_mal_block.json create mode 100644 src/main/resources/assets/modchest/models/block/denk_mal_block_an.json create mode 100644 src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json delete mode 100644 src/main/resources/assets/modchest/models/block/senk_mal_block.json create mode 100644 src/main/resources/assets/modchest/models/item/denk_mal_block.json create mode 100644 src/main/resources/assets/modchest/textures/block/denk_mal_block.png create mode 100644 src/main/resources/assets/modchest/textures/block/denk_mal_block_basis.png create mode 100644 src/main/resources/assets/modchest/textures/block/denk_mal_block_kern_an.png create mode 100644 src/main/resources/assets/modchest/textures/block/denk_mal_block_kern_aus.png diff --git a/src/client/java/modchest/REServerModClient.java b/src/client/java/modchest/REServerModClient.java index 0d18944..2012197 100644 --- a/src/client/java/modchest/REServerModClient.java +++ b/src/client/java/modchest/REServerModClient.java @@ -4,14 +4,16 @@ import modchest.networking.modNetworkingClient; import net.fabricmc.api.ClientModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import modchest.util.initializer; public class REServerModClient implements ClientModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); // Erster Error Logger @Override public void onInitializeClient() { // This entrypoint is suitable for setting up client-specific logic, such as rendering. + initializer.networking(); + initializer.renderer(); - modNetworkingClient.registerC2SPackets(); //Identifier unter denen der Client zuhoert werden registriert LOGGER.info("Modchest-Client successfully loaded!"); } diff --git a/src/client/java/modchest/util/initializer.java b/src/client/java/modchest/util/initializer.java new file mode 100644 index 0000000..186c79a --- /dev/null +++ b/src/client/java/modchest/util/initializer.java @@ -0,0 +1,33 @@ +package modchest.util; + +import modchest.block.entity.modBlockEntities; +import modchest.block.modBlocks; +import modchest.item.modItemGroup; +import modchest.item.modItems; +import modchest.networking.modNetworkingClient; +import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.minecraft.client.render.RenderLayer; + +public class initializer { + public static void itemGroups() { + //modItemGroup.modchest(); // Item Gruppe fürs Creative-Inventar wird erstellt; In dieser Gruppe sollen + // dann alle Items und Blöcke dieser Mod angezeigt werden + } + + public static void itemsAndBlocks() { + //modItems.setItems(); // die Items werden erstellt + //modBlocks.setBlocks(); // Hier werden die Blöcke erstellt + //modBlockEntities.registerBlockEntities(); // Die Interaktionsmenüs für die Blöcke werden erstellt + } + + public static void events() { //Events, bei denen custom Code ausgefuehrt wird, werden eingefuehrt + } + + public static void networking() { //Identifier unter denen der Server zuhoert werden registriert + modNetworkingClient.registerC2SPackets(); //Identifier unter denen der Client zuhoert werden registriert + } + + public static void renderer() { //Grafikrenderer werden aufgerufen + BlockRenderLayerMap.INSTANCE.putBlock(modBlocks.denk_mal_block, RenderLayer.getTranslucent()); //denk_mal_block bekommt die Faehigkeit, transparente Grafiken zu haben + } +} diff --git a/src/main/java/modchest/block/custom/denkMalBlock.java b/src/main/java/modchest/block/custom/denkMalBlock.java index 2ee23f2..000de6d 100644 --- a/src/main/java/modchest/block/custom/denkMalBlock.java +++ b/src/main/java/modchest/block/custom/denkMalBlock.java @@ -1,13 +1,17 @@ package modchest.block.custom; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.ShapeContext; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; 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.explosion.Explosion; import org.jetbrains.annotations.Nullable; @@ -16,6 +20,17 @@ public class denkMalBlock extends BlockWithEntity { //Item soll nciht crafta public denkMalBlock(FabricBlockSettings fabricBlockSettings) { super(fabricBlockSettings); } + @Override + public BlockRenderType getRenderType(BlockState state) { //ruft auf, die Grafik zu rendern + return BlockRenderType.MODEL; + } + + private static VoxelShape SHAPE = BlockWithEntity.createCuboidShape(0, 0, 0, 16, 32, 16); //Erstellt eine approximation des Koerpers; braucht weniger Leistung als ein Volles Rendern + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { //Beschreibt die tatsaechlichen Konturen + return SHAPE; + } @Nullable @Override //Später relevant für das Interface diff --git a/src/main/java/modchest/block/custom/steeringWheelBlock.java b/src/main/java/modchest/block/custom/steeringWheelBlock.java index 35b1e25..c814823 100644 --- a/src/main/java/modchest/block/custom/steeringWheelBlock.java +++ b/src/main/java/modchest/block/custom/steeringWheelBlock.java @@ -25,10 +25,8 @@ public class steeringWheelBlock extends BlockWithEntity implements BlockEntityPr super(settings); } - - /* stuff benötigt um das Interaktionsmenü zu laden!*/ @Override - public BlockRenderType getRenderType(BlockState state) { + public BlockRenderType getRenderType(BlockState state) {//ruft auf, die Grafik zu rendern return BlockRenderType.MODEL; } @@ -44,6 +42,7 @@ public class steeringWheelBlock extends BlockWithEntity implements BlockEntityPr } } + /* stuff benötigt um das Interaktionsmenü zu laden!*/ @Override //wird bei einem rechtsklick aufgerufen (ersellt das Blockentity) public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (!world.isClient) { diff --git a/src/main/java/modchest/block/modBlocks.java b/src/main/java/modchest/block/modBlocks.java index 36ecdae..5e7a1a4 100644 --- a/src/main/java/modchest/block/modBlocks.java +++ b/src/main/java/modchest/block/modBlocks.java @@ -7,6 +7,7 @@ import modchest.REServerMod; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.block.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -24,7 +25,7 @@ public class modBlocks { modItemGroup.modchest); denk_mal_block = registerBlock("denk_mal_block", - new denkMalBlock(FabricBlockSettings.of(Material.METAL).strength(1.0f).requiresTool()), + new denkMalBlock(FabricBlockSettings.copyOf(Blocks.GLASS).nonOpaque()), modItemGroup.modchest); } diff --git a/src/main/resources/assets/modchest/blockstates/denk_mal_block.json b/src/main/resources/assets/modchest/blockstates/denk_mal_block.json new file mode 100644 index 0000000..49bafc0 --- /dev/null +++ b/src/main/resources/assets/modchest/blockstates/denk_mal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "modchest:block/denk_mal_block_aus"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json b/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json new file mode 100644 index 0000000..b765d7f --- /dev/null +++ b/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json @@ -0,0 +1,87 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "modchest:block/denk_mal_block", + "3": "modchest:block/denk_mal_block_basis", + "particle": "modchest:block/denk_mal_block_kern_an" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#3"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#3"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#3"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#3"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#3"} + } + }, + { + "from": [0, 16, 0], + "to": [16, 32, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#1"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#1"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#1"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#1"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#1"} + } + }, + { + "from": [3, 18, 3], + "to": [13, 29, 13], + "faces": { + "north": {"uv": [0, 0, 5, 5.5], "texture": "#missing"}, + "east": {"uv": [5, 0, 10, 5.5], "texture": "#missing"}, + "south": {"uv": [0, 5.5, 5, 11], "texture": "#missing"}, + "west": {"uv": [5, 5.5, 10, 11], "texture": "#missing"}, + "up": {"uv": [15, 5, 10, 0], "texture": "#missing"}, + "down": {"uv": [15, 5, 10, 10], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [1, 0, 0], + "translation": [2.5, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "translation": [2.5, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 11.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "translation": [0, -1.75, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json b/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json new file mode 100644 index 0000000..62440df --- /dev/null +++ b/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json @@ -0,0 +1,324 @@ +{ + "parent": "block/cube_all", + "credit": "Made with Blockbench", + "texture_size": [ + 64, + 64 + ], + "textures": { + "1": "modchest:block/denk_mal_block", + "2": "modchest:block/denk_mal_block_kern_aus", + "3": "modchest:block/denk_mal_block_basis", + "particles": "modchest:block/denk_mal_block_basis" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#3" + }, + "east": { + "uv": [ + 0, + 4, + 4, + 8 + ], + "texture": "#3" + }, + "south": { + "uv": [ + 4, + 0, + 8, + 4 + ], + "texture": "#3" + }, + "west": { + "uv": [ + 4, + 4, + 8, + 8 + ], + "texture": "#3" + }, + "up": { + "uv": [ + 4, + 12, + 0, + 8 + ], + "texture": "#3" + }, + "down": { + "uv": [ + 12, + 0, + 8, + 4 + ], + "texture": "#3" + } + } + }, + { + "from": [ + 0, + 16, + 0 + ], + "to": [ + 16, + 32, + 16 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 4, + 4, + 8 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 4, + 0, + 8, + 4 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 4, + 4, + 8, + 8 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 4, + 12, + 0, + 8 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 12, + 0, + 8, + 4 + ], + "texture": "#1" + } + } + }, + { + "from": [ + 3, + 18, + 3 + ], + "to": [ + 13, + 29, + 13 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 0, + 10, + 5.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 0, + 5.5, + 5, + 11 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 5.5, + 10, + 11 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 15, + 5, + 10, + 0 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 15, + 5, + 10, + 10 + ], + "texture": "#2" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "firstperson_righthand": { + "rotation": [ + 1, + 0, + 0 + ], + "translation": [ + 2.5, + -1.5, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "firstperson_lefthand": { + "translation": [ + 2.5, + -1.5, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "ground": { + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "gui": { + "translation": [ + 0, + -3.25, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "head": { + "translation": [ + 0, + 11.5, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "fixed": { + "translation": [ + 0, + -1.75, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + } + }, + "groups": [ + { + "name": "VoxelShapes", + "origin": [ + 8, + 8, + 8 + ], + "color": 0, + "children": [ + 0, + 1, + 2 + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/block/senk_mal_block.json b/src/main/resources/assets/modchest/models/block/senk_mal_block.json deleted file mode 100644 index 9f0a582..0000000 --- a/src/main/resources/assets/modchest/models/block/senk_mal_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "modchest:block/denk_mal_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/item/denk_mal_block.json b/src/main/resources/assets/modchest/models/item/denk_mal_block.json new file mode 100644 index 0000000..c9b0e8c --- /dev/null +++ b/src/main/resources/assets/modchest/models/item/denk_mal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "modchest:block/denk_mal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/textures/block/denk_mal_block.png b/src/main/resources/assets/modchest/textures/block/denk_mal_block.png new file mode 100644 index 0000000000000000000000000000000000000000..8db9cf07a650b2564f1b8255db9f93fe424df946 GIT binary patch literal 2218 zcmV;b2vzrqP)Coq8EKf$=8`Y{-1DKk)Gt<}?=+V%Cfp^u|A&RPW^no##Rv z^JNM!n-R;6IO2W?4qD&dCbQ_VrhgK}K9p{4Qud>u#I2kL{^|0-WysR@zwO=T2q+FhyY+BT~h?FmP! zuWfH#@VdgPK{Q%pUb80bI$!8tVX=Lqqb>1^sm?hIhSFkou>ll|lU(yuMin)4zw1JN z7>raMGVCV+QR}>8=85G905*2@-s@v~$YhCJ9RFz5f+36X#dW`UoSDCJDkI@uSFAlj z%yQr>$!&cP0R#@i*bg9u4HDOT=by;cxk7do-18FQOpHXEc2`bjw7#|Rt@bsI53IjE zu_u7Lak?JBuo#g7K=z*EcxANu!Xr6*_k2`L=SxB8%syziWQpY}Sl`-s@UfoW-vbEs z8de3+(bCwRw|C>Jyfr1pc_~x-etys5hL(kY1~8-9nI^q^CPm5=tSu2v-pzZf?!$_F zg=Qw1%`?x;LY)h{u25~MaL8Y=;g*X>0XB9Gd^Or(VJ^bQw)fV0afpEWd>nRe-PiQw zi$^X1Fvxr0ON|2-NiqQE?8;y`^)rCZ?R^(cCJeGcgV3Ovavp$W_x?*Q3?3fMjI9`N znp0@UOGOCOOdPbgG;ZG5-Iq#srT&IzZ?dOvj+v|WI~Uv)MLK<+Fy?_R$l064k&R`3 zuCVfM;6<>pQUp;94$!9?9&K%UwWBR@lbJ?3TAJ>w8VkR3rr=}ej{|dXWOH$p>`vW< zxQU9Y$0Qy&*{Z|Ehfo|&XxEwYfR5J2bpVgtS$F)5%Fuhn35-c+ax+u1C)I;lZS3N2 zIobX=<}v`G{UwN@C_=-IE@4TWudu>bn^$JgyoRF4+!-GcK$1l}4y=uCtv@l|^n;1t z%s5nFze|Ra-Kkdq6M7r`Uhf!|(Tu6V;6}j!@OR9zh615ul9!oQf*nCxDl{Om$4rY2 zKOf^m97BS)y=k_vD#7grGl9Lp)xa=txT7_(Y&r)Z1kEUo-PB8EzRj<0PB*OfZymEK@tH5*V4vczmW$f2Pswgk{{pDYdIFd>8oM z_~DDu*3?V_D|{hUB3vvt68KC(laWL$xr&N(W$rbA3EpT-8>*Sw@a*CYs~XDqoa+If z#*BaC;;Yhi*}U_JD3Uk(Y!*5lIA^xFN@G=ph~;cHUKcDmSU2V4^9AIz@;sY3p`|}= zYaT2_?7eCYEnd5}u;QkqX}<$P%-)-L$LEXSV(^(<^_|`QFX0)@&Pv}C-MT0(&u}4r zONql3UYHcrLhdE8?Edr`lQjn;6>CnOVESK!&OE&U(T)Q(8@Khp)7jIz_K9tSwYi8r z>=HUv+V1R0txI;Nc14l7GucP?FG?%42W4uDc6=}c_;yL6C<5nX8Gz{4`V$K5pO}7` zb;JG1uGAkox9)42Ogvr{?w>fejBN)R!W9GCCfYtf811W?Ucaj~Pt_Hf1-)97)&U}4rZob1pNfm}&f@tVyNi3hv z0SFDdTvEMoI}JZ7uQ?b8&3sC7dvLm3(C@uf$@yBv!6M|-UJOdOj@HD==?tJ~l0AI| z@6ji_`yMG}U#0_RXtYrAc!}#vjgx7pP_azY{s)I*ab{L{J}xHRJ^C`>@enwgT@ z2NpfPWq$(zvT1*f6^k>koR_4Jccs2g*8eo?;yVB^<-RR;p5mO8^Zs1>nx@yxF<;K# zcCtm&zL+T%XV~re2)yHWl5+r(O?xU^ETPaR`3PLBIq}W~_W@w~_^kBm91?>41)#Gl zb&->X*S9uKTH$@Pwei`B@1FSRWVT-h9A57L1Wxrame)R=l;7QRKH^Na3SbOdhFJQ< zwvTcuh5(ps;Ouqn+~ANc1qh@*JWFF&@np2)Ku+~~7rTP9$n%8|(}_)+EVy^Ix`3{H z#1`n{v(&G1Mkq;pYx;L4yZc|2*~=bV4!Q=BcIYVZUt}3)!5gvpYr$?r)PseJEw2G9 sQ>ILrGG)q?DO09QnKEU{lsO;xAFaHR?ZF5rD*ylh07*qoM6N<$f&eE-n*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modchest/textures/block/denk_mal_block_basis.png b/src/main/resources/assets/modchest/textures/block/denk_mal_block_basis.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdf5b43a0b25b4e99b8835f84b3e9309728742d GIT binary patch literal 2610 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modchest/textures/block/denk_mal_block_kern_an.png b/src/main/resources/assets/modchest/textures/block/denk_mal_block_kern_an.png new file mode 100644 index 0000000000000000000000000000000000000000..0335f71ec5907da667cd4f75e38fd9b8b5568347 GIT binary patch literal 1864 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 literal 0 HcmV?d00001 From 7319724efa7e7d1ba0df4abb3394db94087fd7ba Mon Sep 17 00:00:00 2001 From: Malte Reents Date: Sat, 6 Apr 2024 22:05:59 +0200 Subject: [PATCH 3/4] working on DataIO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DataIO ist fertig; viele kleinigkeiten wurden sonst auch ncoh hinzugefügt --- .../java/modchest/REServerModClient.java | 9 +- .../networking/modNetworkingClient.java | 3 +- ...nitializer.java => clientInitializer.java} | 7 +- .../modchest/block/custom/denkMalBlock.java | 112 ++++- .../block/custom/denkMalBlockPlaceholder.java | 37 ++ src/main/java/modchest/block/modBlocks.java | 16 +- src/main/java/modchest/item/modItems.java | 6 +- .../modchest/mixin/LevelStorageMixin.java | 29 ++ .../modchest/mixin/MinecraftServerMixin.java | 49 +++ .../mixin/ServerPlayerEntityMixin.java | 6 +- .../{bedBlock.java => bedBlockMixin.java} | 4 +- .../networking/modNetworkingServer.java | 2 +- src/main/java/modchest/util/dataSaverIO.java | 68 +++ .../java/modchest/util/denkMalBlockUtil.java | 40 ++ src/main/java/modchest/util/initializer.java | 7 +- .../interfaces/LevelStorageInterface.java | 7 + .../ServerPlayerEntityInterface.java | 4 +- .../util/setAndGetMultiButtonsSpawn.java | 2 +- .../modchest/blockstates/denk_mal_block.json | 7 +- .../denk_mal_block_placeholder.json | 7 + .../models/block/denk_mal_block_an.json | 16 +- .../models/block/denk_mal_block_aus.json | 407 ++++-------------- .../block/denk_mal_block_placeholder.json | 6 + .../modchest/models/item/denk_mal_block.json | 2 +- .../textures/block/denk_mal_block_basis.png | Bin 2610 -> 2552 bytes src/main/resources/reservermod.mixins.json | 6 +- 26 files changed, 487 insertions(+), 372 deletions(-) rename src/client/java/modchest/util/{initializer.java => clientInitializer.java} (86%) create mode 100644 src/main/java/modchest/block/custom/denkMalBlockPlaceholder.java create mode 100644 src/main/java/modchest/mixin/LevelStorageMixin.java create mode 100644 src/main/java/modchest/mixin/MinecraftServerMixin.java rename src/main/java/modchest/mixin/{bedBlock.java => bedBlockMixin.java} (98%) create mode 100644 src/main/java/modchest/util/dataSaverIO.java create mode 100644 src/main/java/modchest/util/denkMalBlockUtil.java create mode 100644 src/main/java/modchest/util/interfaces/LevelStorageInterface.java rename src/main/java/modchest/util/{ => interfaces}/ServerPlayerEntityInterface.java (57%) create mode 100644 src/main/resources/assets/modchest/blockstates/denk_mal_block_placeholder.json create mode 100644 src/main/resources/assets/modchest/models/block/denk_mal_block_placeholder.json diff --git a/src/client/java/modchest/REServerModClient.java b/src/client/java/modchest/REServerModClient.java index 2012197..6fa6ee7 100644 --- a/src/client/java/modchest/REServerModClient.java +++ b/src/client/java/modchest/REServerModClient.java @@ -1,19 +1,18 @@ package modchest; -import modchest.networking.modNetworkingClient; +import modchest.util.clientInitializer; import net.fabricmc.api.ClientModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import modchest.util.initializer; public class REServerModClient implements ClientModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); // Erster Error Logger + @Override public void onInitializeClient() { // This entrypoint is suitable for setting up client-specific logic, such as rendering. - initializer.networking(); - initializer.renderer(); - + clientInitializer.renderer(); + clientInitializer.networking(); LOGGER.info("Modchest-Client successfully loaded!"); } diff --git a/src/client/java/modchest/networking/modNetworkingClient.java b/src/client/java/modchest/networking/modNetworkingClient.java index b30a978..0e08f34 100644 --- a/src/client/java/modchest/networking/modNetworkingClient.java +++ b/src/client/java/modchest/networking/modNetworkingClient.java @@ -9,7 +9,8 @@ public class modNetworkingClient { //Identifier werden eingeführt public static final Identifier request_respawn = new Identifier(REServerMod.MOD_ID, "request_respawn"); //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons"); public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons"); - public static void registerC2SPackets() { //Identifier fuer packets werden registriert (Identifier die der Server aufruft um beim CLient was auszufuehren) + + public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Server aufruft um beim Client was auszufuehren) ClientPlayNetworking.registerGlobalReceiver(request_respawn, respawnRequestS2CPacket::receive); //was der Client dann machen soll steht in der receive Methode } } diff --git a/src/client/java/modchest/util/initializer.java b/src/client/java/modchest/util/clientInitializer.java similarity index 86% rename from src/client/java/modchest/util/initializer.java rename to src/client/java/modchest/util/clientInitializer.java index 186c79a..3370f3b 100644 --- a/src/client/java/modchest/util/initializer.java +++ b/src/client/java/modchest/util/clientInitializer.java @@ -1,14 +1,11 @@ package modchest.util; -import modchest.block.entity.modBlockEntities; import modchest.block.modBlocks; -import modchest.item.modItemGroup; -import modchest.item.modItems; import modchest.networking.modNetworkingClient; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.minecraft.client.render.RenderLayer; -public class initializer { +public class clientInitializer { public static void itemGroups() { //modItemGroup.modchest(); // Item Gruppe fürs Creative-Inventar wird erstellt; In dieser Gruppe sollen // dann alle Items und Blöcke dieser Mod angezeigt werden @@ -24,7 +21,7 @@ public class initializer { } public static void networking() { //Identifier unter denen der Server zuhoert werden registriert - modNetworkingClient.registerC2SPackets(); //Identifier unter denen der Client zuhoert werden registriert + modNetworkingClient.registerS2CPackets(); //Identifier unter denen der Client zuhoert werden registriert } public static void renderer() { //Grafikrenderer werden aufgerufen diff --git a/src/main/java/modchest/block/custom/denkMalBlock.java b/src/main/java/modchest/block/custom/denkMalBlock.java index 000de6d..94fce6a 100644 --- a/src/main/java/modchest/block/custom/denkMalBlock.java +++ b/src/main/java/modchest/block/custom/denkMalBlock.java @@ -1,25 +1,34 @@ package modchest.block.custom; +import modchest.util.denkMalBlockUtil; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.ShapeContext; +import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import net.minecraft.world.explosion.Explosion; import org.jetbrains.annotations.Nullable; -public class denkMalBlock extends BlockWithEntity { //Item soll nciht craftable sein +import static modchest.block.modBlocks.denk_mal_block_placeholder; + +public class denkMalBlock extends BlockWithEntity { //Item soll nicht craftable sein + public static BooleanProperty POWERED = BooleanProperty.of("powered"); //speichert ob der Block ein Redstonesignal erhaelt + public denkMalBlock(FabricBlockSettings fabricBlockSettings) { super(fabricBlockSettings); + setDefaultState(getDefaultState().with(POWERED, false)); //Block ist beim platzieren immer aus } + @Override public BlockRenderType getRenderType(BlockState state) { //ruft auf, die Grafik zu rendern return BlockRenderType.MODEL; @@ -32,14 +41,101 @@ public class denkMalBlock extends BlockWithEntity { //Item soll nciht crafta return SHAPE; } + @Nullable - @Override //Später relevant für das Interface + @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return null; } - @Override //Block soll nicht gedroped werden; Nur mit Silktouch + @Override + public boolean isTranslucent(BlockState state, BlockView world, BlockPos pos) { //damit man durch den Glasteil des blockes sehen kann + return true; + } + + @Override //Block soll nicht gedroped werden public boolean shouldDropItemsOnExplosion(Explosion explosion) { return false; } + + @Override + public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) { //platziert den placeholder block oben drauf, weil es in miencraft keine 2 hohen Bloecke gibt + super.onPlaced(world, pos, state, placer, itemStack); + if (!world.isClient) { + world.setBlockState(pos.up(1), denk_mal_block_placeholder.getDefaultState(), Block.NOTIFY_ALL); //platziert den placeholder Block ueber sich selbst + world.updateNeighbors(pos, Blocks.AIR); + state.updateNeighbors(world, pos, Block.NOTIFY_ALL); + } + } + + @Override + public void onBroken(WorldAccess world, BlockPos pos, BlockState state) { //entfernt sich aus der Liste der zu ueberpruefenden bloecke + denkMalBlockUtil data = new denkMalBlockUtil(); + world.setBlockState(pos.up(1), Blocks.AIR.getDefaultState(), Block.NOTIFY_ALL); //entfernt den Placeholder block ueber sich + int[] temp = new int[3]; + temp[0] = pos.getX(); + temp[1] = pos.getY(); + temp[2] = pos.getZ(); + data.removeBlock(temp); //entfernt sich aus der liste der Abbauverhindernden Bloecke + + } + + //CODE ZUM UEBERPREUFEN OB MIT REDSTONE GEPOWERED + + @Override + @Nullable + public BlockState getPlacementState(ItemPlacementContext ctx) { + return (BlockState) this.getDefaultState().with(POWERED, ctx.getWorld().isReceivingRedstonePower(ctx.getBlockPos())); + } + + @Override + public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + if (world.isClient) { + return; + } + boolean bl = state.get(POWERED); + + if (bl != world.isReceivingRedstonePower(pos)) { + if (bl) { + world.createAndScheduleBlockTick(pos, this, 4); + } else { + world.setBlockState(pos, (BlockState) state.cycle(POWERED), Block.NOTIFY_LISTENERS); + changePositionList(state, world, pos); + } + } + } + + @Override + public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + if (state.get(POWERED).booleanValue() && !world.isReceivingRedstonePower(pos)) { + world.setBlockState(pos, (BlockState) state.cycle(POWERED), Block.NOTIFY_LISTENERS); + changePositionList(state, world, pos); + } + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(POWERED); + } + + //CODE ZUM UEBERÜREUFEN OB MIT REDSTONE GEPOWERED ZUENDE + + private void changePositionList(BlockState state, World world, BlockPos pos) { //aendert ob der Block in der Liste der Bloecke steht, die das abbauen verhindern + denkMalBlockUtil data = new denkMalBlockUtil(); + if (!world.isClient) { + int[] temp = new int[3]; + temp[0] = pos.getX(); + temp[1] = pos.getY(); + temp[2] = pos.getZ(); + int[] range = new int[3]; //noch ist die range auf 20 Bloecke, soll aber spaeter via ein Entity vom Spieler veraendert werden koenneny + range[0] = 20; + range[1] = 20; + range[2] = 20; + if (!state.get(POWERED)) { + data.addBlock(temp, range); + } else { + data.removeBlock(temp); + } + } + } } diff --git a/src/main/java/modchest/block/custom/denkMalBlockPlaceholder.java b/src/main/java/modchest/block/custom/denkMalBlockPlaceholder.java new file mode 100644 index 0000000..4faef0d --- /dev/null +++ b/src/main/java/modchest/block/custom/denkMalBlockPlaceholder.java @@ -0,0 +1,37 @@ +package modchest.block.custom; + +import modchest.REServerMod; +import modchest.util.denkMalBlockUtil; +import net.minecraft.block.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; + +import java.util.Arrays; + +import static modchest.block.modBlocks.denk_mal_block_placeholder; + +public class denkMalBlockPlaceholder extends Block { //Block der simuliert, dass der DenkMalBLock 2 Bloecke hoch waere + public denkMalBlockPlaceholder(Settings settings) { + super(settings); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { //Grafik kommt vom DenkMalBLock, dieser Block muss also unsichtbar sein + return BlockRenderType.INVISIBLE; + } + + + @Override + public void onBroken(WorldAccess world, BlockPos pos, BlockState state) { //Loescht den eigentlichen DenkMalBlock + denkMalBlockUtil data = new denkMalBlockUtil(); //denkMalBLockUtil holt sich alle infos von der static dataSaverIO Klasse + world.setBlockState(pos.down(1), Blocks.AIR.getDefaultState(), Block.NOTIFY_ALL); //unter diesem Block wird Luft platziert + int[] temp = new int[3]; + temp[0] = pos.getX(); + temp[1] = (pos.getY()-1); + temp[2] = pos.getZ(); + data.removeBlock(temp); //Loescht den denkMalBLock aus der Liste der abbauverhindernden Bloecke + } +} diff --git a/src/main/java/modchest/block/modBlocks.java b/src/main/java/modchest/block/modBlocks.java index 5e7a1a4..50de4ef 100644 --- a/src/main/java/modchest/block/modBlocks.java +++ b/src/main/java/modchest/block/modBlocks.java @@ -1,13 +1,13 @@ package modchest.block; import modchest.block.custom.denkMalBlock; +import modchest.block.custom.denkMalBlockPlaceholder; import modchest.block.custom.steeringWheelBlock; import modchest.item.modItemGroup; import modchest.REServerMod; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.block.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -18,6 +18,7 @@ import net.minecraft.util.registry.Registry; public class modBlocks { public static Block steering_wheel; // Block wird erstellt public static Block denk_mal_block; + public static Block denk_mal_block_placeholder; public static void setBlocks() {// Block wird definiert steering_wheel = registerBlock("steering_wheel", @@ -25,19 +26,24 @@ public class modBlocks { modItemGroup.modchest); denk_mal_block = registerBlock("denk_mal_block", - new denkMalBlock(FabricBlockSettings.copyOf(Blocks.GLASS).nonOpaque()), + new denkMalBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance((state) -> state.get(denkMalBlock.POWERED) ? 5 : 0).nonOpaque()), modItemGroup.modchest); + denk_mal_block_placeholder = registerBlockWithoutItem("denk_mal_block_placeholder", + new denkMalBlockPlaceholder(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().nonOpaque())); + } - private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben - // definierten Blöcke dem Register - // hinzu + private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben definierten Blöcke dem Register hinzu Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), new BlockItem(block, new FabricItemSettings().group(group))); return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block); } + private static Block registerBlockWithoutItem(String name, Block block) { // Nicht verändern! Fügt die oben definierten Blöcke dem Register hinzu + return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block); + } + public static void registerModBlocks() { // Error Logger halt... REServerMod.LOGGER.info("Registering ModBlocks for " + REServerMod.MOD_ID); } diff --git a/src/main/java/modchest/item/modItems.java b/src/main/java/modchest/item/modItems.java index f84cef3..5bd86a2 100644 --- a/src/main/java/modchest/item/modItems.java +++ b/src/main/java/modchest/item/modItems.java @@ -10,11 +10,11 @@ import net.minecraft.util.registry.Registry; //Liste der Items die hinzugefügt werden, ausgenommen Blöcke public class modItems { - public static Item shipblock; // shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für + private static Item shipblock; // shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für // das steering_wheel braucht zum craften, mehr macht es bisher nicht - public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist + private static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist // im detail erklärt was das Item machen soll - public static Item denk_mal_item; + private static Item denk_mal_item; public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest))); diff --git a/src/main/java/modchest/mixin/LevelStorageMixin.java b/src/main/java/modchest/mixin/LevelStorageMixin.java new file mode 100644 index 0000000..b878262 --- /dev/null +++ b/src/main/java/modchest/mixin/LevelStorageMixin.java @@ -0,0 +1,29 @@ +package modchest.mixin; + +import modchest.REServerMod; +import modchest.util.interfaces.LevelStorageInterface; +import net.minecraft.world.level.storage.LevelStorage; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import net.minecraft.world.level.storage.LevelStorage.Session; + +import java.io.File; + +@Mixin(Session.class) +public abstract class LevelStorageMixin implements LevelStorageInterface { + + @Final + @Shadow + LevelStorage.LevelSave directory; + + public File getFile() { //gibt den Dateipfad zurueck + File dateiPfad = null; + try { + dateiPfad = directory.path().toFile(); //Versucht den Dateipfad einzulesen; weil es sehr frueh kommt besonders abgesichert + } catch (Exception e) { + REServerMod.LOGGER.info("Error when trying to read File path: {}", e.toString()); + } + return dateiPfad; + } +} \ No newline at end of file diff --git a/src/main/java/modchest/mixin/MinecraftServerMixin.java b/src/main/java/modchest/mixin/MinecraftServerMixin.java new file mode 100644 index 0000000..9060d51 --- /dev/null +++ b/src/main/java/modchest/mixin/MinecraftServerMixin.java @@ -0,0 +1,49 @@ +package modchest.mixin; + +import modchest.REServerMod; +import modchest.util.interfaces.LevelStorageInterface; +import modchest.util.dataSaverIO; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.level.storage.LevelStorage; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.io.File; + +@Mixin(MinecraftServer.class) +public class MinecraftServerMixin { + @Shadow + @Final + protected LevelStorage.Session session; + @Unique + dataSaverIO dataSaver = new dataSaverIO(); + + @Inject(method = "prepareStartRegion", at = @At("TAIL")) + private void prepareStartRegion(CallbackInfo ci) { //wird beim Start des Servers aufgerufen + dataSaver.resetData(); //stellt sicher, dass keine Daten von einer Welt in eine andere "leaken" in dem es alle Daten loescht + LevelStorageInterface levelStorage = (LevelStorageInterface) session; //castet session mit dem Interface, damit custom Methoden verwendet werden koennen + try { + File file; + file = levelStorage.getFile(); //holt sich den Dateipfad + if (file != null) { + dataSaver.writeFilePath(file); //schreibt den Dateipfad der Welt fuer das dataSaverIO + dataSaver.readFile(); //holt die Daten von der Festplatte in den RAM + } else { + REServerMod.LOGGER.info("file is zero"); + } + } catch (Exception e) { + REServerMod.LOGGER.info("file could not be read with Exception: {}", e.toString()); + } + } + + @Inject(method = "shutdown", at = @At("HEAD")) + private void shutdown(CallbackInfo ci) { //is called when server shuts down + dataSaver.saveFile(); //Saves the Serverdata + } +} + diff --git a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java index 0a70b69..216038b 100644 --- a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java +++ b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java @@ -1,7 +1,7 @@ package modchest.mixin; import modchest.REServerMod; -import modchest.util.ServerPlayerEntityInterface; +import modchest.util.interfaces.ServerPlayerEntityInterface; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Mixin; @@ -10,8 +10,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Arrays; - @Mixin(ServerPlayerEntity.class) public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface { @Unique @@ -39,7 +37,7 @@ public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInter REServerMod.LOGGER.info("Error while saving custom NBt-Data: " + e); } } else { - REServerMod.LOGGER.info("write failed! This probably means, that the player hasn't set a custom spanpoint yet"); + REServerMod.LOGGER.info("write failed! This probably means, that the player hasn't set a custom spawnpoint yet"); } //REServerMod.LOGGER.info("writeCustomDataToNbt called"); } diff --git a/src/main/java/modchest/mixin/bedBlock.java b/src/main/java/modchest/mixin/bedBlockMixin.java similarity index 98% rename from src/main/java/modchest/mixin/bedBlock.java rename to src/main/java/modchest/mixin/bedBlockMixin.java index a995ba4..ec20832 100644 --- a/src/main/java/modchest/mixin/bedBlock.java +++ b/src/main/java/modchest/mixin/bedBlockMixin.java @@ -5,7 +5,6 @@ import modchest.util.setAndGetMultiButtonsSpawn; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; @@ -14,12 +13,11 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Arrays; import java.util.List; import java.util.Objects; @Mixin(BedBlock.class) -public class bedBlock { +public class bedBlockMixin { @Inject(method = "onBreak", at = @At("HEAD")) public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfo ci) { //Ueberprueft, wenn ein Bett zerstoert wird, ob jemand dieses Bett als Spawnpunkt hat diff --git a/src/main/java/modchest/networking/modNetworkingServer.java b/src/main/java/modchest/networking/modNetworkingServer.java index 64f771d..c680b33 100644 --- a/src/main/java/modchest/networking/modNetworkingServer.java +++ b/src/main/java/modchest/networking/modNetworkingServer.java @@ -11,7 +11,7 @@ public class modNetworkingServer { //Identifier werden eingeführt public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons"); public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons"); - public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren) + public static void registerC2SPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren) ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive); diff --git a/src/main/java/modchest/util/dataSaverIO.java b/src/main/java/modchest/util/dataSaverIO.java new file mode 100644 index 0000000..7e2ba40 --- /dev/null +++ b/src/main/java/modchest/util/dataSaverIO.java @@ -0,0 +1,68 @@ +package modchest.util; + +import modchest.REServerMod; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtIo; + +import java.io.*; + +public class dataSaverIO { //Speichert alles mod-relevanten Serverdaten ab + private static File reServerFile = null; + private static NbtCompound reServerNbt = null; + + public dataSaverIO() {} + + void readFromFile() { //laedt die Daten der Datei; macht der Server bereits automatisch, danke mixin! + try { + reServerNbt = NbtIo.read(reServerFile); //liest die Datei + if (reServerNbt == null) { //sollte der Nbt-Tag noch nciht existieren, wird er erstellt + reServerNbt = new NbtCompound(); + } + } catch (IOException e) { //sollte das IO einen Fehler haben, sollte aber nie vorkommen, wird die mod versuchen es zu fixen, indem sie einen neuen NbtTag erstellt und mit dem weiter arbeitet + REServerMod.LOGGER.error("Error when trying to read from file: " + String.valueOf(e) + " trying to fix it by making a new Nbt"); + reServerNbt = new NbtCompound(); + } catch (Exception e) { //alle anderen exception, versucht er genau so zu fixen. Loescht alle alten Daten, aber besser, als das die Mod garnicht mehr geht + reServerNbt = new NbtCompound(); + } + } + + void writeToFile() { //speichert den Nbt-Tag als Datei ab; macht der Server auch automatisch + reServerNbt.putInt("NullSafety", 1); //gibt manchmal Probleme wenn nichts im Nbt-Tag steht, deswegen wird hin und wieder mal eine NullSafety abgespeichert + try { + if (reServerNbt != null) { //stellt sicher, das auch wirklich wirklich was im NbtTag steht vor dem abspeichern + NbtIo.write(reServerNbt, reServerFile); + } + } catch (Exception e) { + REServerMod.LOGGER.error("Error when trying to write to file: " + String.valueOf(e)); + } + } + + public void writeToNbt(NbtCompound nbt) { //ueberschreibt den ServerNbt-Tag, pass auf, dass du nicht sachen von anderen Teilen der mods vergisst mit zu kopieren! + reServerNbt = nbt; + } + + public NbtCompound getFromNbt() { //uebergibt den servernbt + if (reServerNbt == null) { //sollte der server-nbt-tag noch nciht existieren, wird er neu erstellt + REServerMod.LOGGER.error("ServerNbt ist null in getFromNbt!"); //eigentlich sollte es nicht auftreten... + reServerNbt = new NbtCompound(); + } + return reServerNbt; + } + + public void readFile() { //public version, den servernbt von der Datei einzulesen + readFromFile(); + } + + public void saveFile() { //moeglichkeit, die datei force-abzuspeichern + writeToFile(); + } + + public void writeFilePath(File file) { //setzt den Pfad fuer den Server-Nbt-Tag wird vom server dank mixin automatisch gesetzt + reServerFile = new File(file, "REServerMod" + ".dat"); + } + + public void resetData() { //resets the data of this class + reServerFile = null; + reServerNbt = new NbtCompound(); + } +} \ No newline at end of file diff --git a/src/main/java/modchest/util/denkMalBlockUtil.java b/src/main/java/modchest/util/denkMalBlockUtil.java new file mode 100644 index 0000000..dc2ff1a --- /dev/null +++ b/src/main/java/modchest/util/denkMalBlockUtil.java @@ -0,0 +1,40 @@ +package modchest.util; + +import net.minecraft.nbt.NbtCompound; + +import java.util.Arrays; + +public class denkMalBlockUtil extends dataSaverIO{ + + public denkMalBlockUtil() {} + + public void addBlock(int[] pos, int[] range) { //fuegt bloecke der Liste an abbauverhindernden Bloecke hinzu + NbtCompound tempNbt = new NbtCompound(); //Nbt in dem die Lockdaten gespeichert werden + tempNbt.putIntArray("position", pos); + tempNbt.putIntArray("range", range); + NbtCompound nbt = returnloadedNbt(); //holt sich den denkmalblock nbt + nbt.put(Arrays.toString(pos), tempNbt); //speichert die daten des neuen Blocks ab + saveInNbt(nbt); //speichert den editierten denkmalblock-nbt ab + } + + public void removeBlock(int[] posString) { //loescht bloecke aus Liste an abbauverhindernden Bloecken + NbtCompound nbt = returnloadedNbt(); //holt sich den denkmalblock nbt + nbt.remove(Arrays.toString(posString)); //entfernt diesen block + saveInNbt(nbt); //speichert den editierten denkmalblock-nbt ab + } + + private NbtCompound returnloadedNbt() { //gibt den denkmalblock nbt zurueck + NbtCompound nbt = getFromNbt(); //laedt den gesamten reServerNbt + nbt = (NbtCompound) nbt.get("denkmalblock"); //nimmt den denkmalblocknbt und laedt diesen + if (nbt == null) { //sollte der nbt noch nicht existieren wird er erstellt + nbt = new NbtCompound(); + } + return nbt; + } + + private void saveInNbt(NbtCompound nbt) { //speichert den denkmalblock nbt im reServerNbt ab + NbtCompound reServerNbt = getFromNbt(); //holt den reServerNbt + reServerNbt.put("denkmalblock", nbt); //schreibt den denkmalblock nbt ab + writeToNbt(reServerNbt); //schreibt den editierten reServerNbt + } +} diff --git a/src/main/java/modchest/util/initializer.java b/src/main/java/modchest/util/initializer.java index 6308369..5c11196 100644 --- a/src/main/java/modchest/util/initializer.java +++ b/src/main/java/modchest/util/initializer.java @@ -25,6 +25,11 @@ public class initializer { } public static void networking() { //Identifier unter denen der Server zuhoert werden registriert - modNetworkingServer.registerS2CPackets(); + modNetworkingServer.registerC2SPackets(); + } + + public static void renderer() { + //BlockRenderLayerMap.INSTANCE.putBlock(modBlocks.denk_mal_block, RenderLayer.getTranslucent()); + } } diff --git a/src/main/java/modchest/util/interfaces/LevelStorageInterface.java b/src/main/java/modchest/util/interfaces/LevelStorageInterface.java new file mode 100644 index 0000000..420d02d --- /dev/null +++ b/src/main/java/modchest/util/interfaces/LevelStorageInterface.java @@ -0,0 +1,7 @@ +package modchest.util.interfaces; + +import java.io.File; + +public interface LevelStorageInterface { //Interface, damit der Server den Pfad holen kann + File getFile(); +} diff --git a/src/main/java/modchest/util/ServerPlayerEntityInterface.java b/src/main/java/modchest/util/interfaces/ServerPlayerEntityInterface.java similarity index 57% rename from src/main/java/modchest/util/ServerPlayerEntityInterface.java rename to src/main/java/modchest/util/interfaces/ServerPlayerEntityInterface.java index 2f43ab9..36e11dd 100644 --- a/src/main/java/modchest/util/ServerPlayerEntityInterface.java +++ b/src/main/java/modchest/util/interfaces/ServerPlayerEntityInterface.java @@ -1,8 +1,6 @@ -package modchest.util; +package modchest.util.interfaces; import net.minecraft.nbt.NbtCompound; -import net.minecraft.server.network.ServerPlayerEntity; -import org.spongepowered.asm.mixin.Unique; public interface ServerPlayerEntityInterface { NbtCompound getDataSaver(); diff --git a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java index 7ee7e51..19e1554 100644 --- a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java +++ b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java @@ -1,8 +1,8 @@ package modchest.util; import modchest.REServerMod; +import modchest.util.interfaces.ServerPlayerEntityInterface; import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtElement; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; diff --git a/src/main/resources/assets/modchest/blockstates/denk_mal_block.json b/src/main/resources/assets/modchest/blockstates/denk_mal_block.json index 49bafc0..8ddebca 100644 --- a/src/main/resources/assets/modchest/blockstates/denk_mal_block.json +++ b/src/main/resources/assets/modchest/blockstates/denk_mal_block.json @@ -1,5 +1,10 @@ { "variants": { - "": { "model": "modchest:block/denk_mal_block_aus"} + "powered=false": { + "model": "modchest:block/denk_mal_block_aus" + }, + "powered=true": { + "model": "modchest:block/denk_mal_block_an" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/modchest/blockstates/denk_mal_block_placeholder.json b/src/main/resources/assets/modchest/blockstates/denk_mal_block_placeholder.json new file mode 100644 index 0000000..3ee1c2c --- /dev/null +++ b/src/main/resources/assets/modchest/blockstates/denk_mal_block_placeholder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "modchest:block/denk_mal_block_placeholder" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json b/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json index b765d7f..ac919e1 100644 --- a/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json +++ b/src/main/resources/assets/modchest/models/block/denk_mal_block_an.json @@ -1,10 +1,12 @@ { + "parent": "block/cube_all", "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { "1": "modchest:block/denk_mal_block", + "2": "modchest:block/denk_mal_block_kern_an", "3": "modchest:block/denk_mal_block_basis", - "particle": "modchest:block/denk_mal_block_kern_an" + "particle": "modchest:block/denk_mal_block_kern_aus" }, "elements": [ { @@ -35,12 +37,12 @@ "from": [3, 18, 3], "to": [13, 29, 13], "faces": { - "north": {"uv": [0, 0, 5, 5.5], "texture": "#missing"}, - "east": {"uv": [5, 0, 10, 5.5], "texture": "#missing"}, - "south": {"uv": [0, 5.5, 5, 11], "texture": "#missing"}, - "west": {"uv": [5, 5.5, 10, 11], "texture": "#missing"}, - "up": {"uv": [15, 5, 10, 0], "texture": "#missing"}, - "down": {"uv": [15, 5, 10, 10], "texture": "#missing"} + "north": {"uv": [0, 0, 5, 5.5], "texture": "#2"}, + "east": {"uv": [5, 0, 10, 5.5], "texture": "#2"}, + "south": {"uv": [0, 5.5, 5, 11], "texture": "#2"}, + "west": {"uv": [5, 5.5, 10, 11], "texture": "#2"}, + "up": {"uv": [15, 5, 10, 0], "texture": "#2"}, + "down": {"uv": [15, 5, 10, 10], "texture": "#2"} } } ], diff --git a/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json b/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json index 62440df..49bd344 100644 --- a/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json +++ b/src/main/resources/assets/modchest/models/block/denk_mal_block_aus.json @@ -1,324 +1,89 @@ { "parent": "block/cube_all", - "credit": "Made with Blockbench", - "texture_size": [ - 64, - 64 - ], - "textures": { - "1": "modchest:block/denk_mal_block", - "2": "modchest:block/denk_mal_block_kern_aus", - "3": "modchest:block/denk_mal_block_basis", - "particles": "modchest:block/denk_mal_block_basis" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#3" - }, - "east": { - "uv": [ - 0, - 4, - 4, - 8 - ], - "texture": "#3" - }, - "south": { - "uv": [ - 4, - 0, - 8, - 4 - ], - "texture": "#3" - }, - "west": { - "uv": [ - 4, - 4, - 8, - 8 - ], - "texture": "#3" - }, - "up": { - "uv": [ - 4, - 12, - 0, - 8 - ], - "texture": "#3" - }, - "down": { - "uv": [ - 12, - 0, - 8, - 4 - ], - "texture": "#3" - } - } - }, - { - "from": [ - 0, - 16, - 0 - ], - "to": [ - 16, - 32, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#1" - }, - "east": { - "uv": [ - 0, - 4, - 4, - 8 - ], - "texture": "#1" - }, - "south": { - "uv": [ - 4, - 0, - 8, - 4 - ], - "texture": "#1" - }, - "west": { - "uv": [ - 4, - 4, - 8, - 8 - ], - "texture": "#1" - }, - "up": { - "uv": [ - 4, - 12, - 0, - 8 - ], - "texture": "#1" - }, - "down": { - "uv": [ - 12, - 0, - 8, - 4 - ], - "texture": "#1" - } - } - }, - { - "from": [ - 3, - 18, - 3 - ], - "to": [ - 13, - 29, - 13 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 5, - 5.5 - ], - "texture": "#2" - }, - "east": { - "uv": [ - 5, - 0, - 10, - 5.5 - ], - "texture": "#2" - }, - "south": { - "uv": [ - 0, - 5.5, - 5, - 11 - ], - "texture": "#2" - }, - "west": { - "uv": [ - 5, - 5.5, - 10, - 11 - ], - "texture": "#2" - }, - "up": { - "uv": [ - 15, - 5, - 10, - 0 - ], - "texture": "#2" - }, - "down": { - "uv": [ - 15, - 5, - 10, - 10 - ], - "texture": "#2" - } - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "thirdperson_lefthand": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_righthand": { - "rotation": [ - 1, - 0, - 0 - ], - "translation": [ - 2.5, - -1.5, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "firstperson_lefthand": { - "translation": [ - 2.5, - -1.5, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "translation": [ - 0, - -3.25, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "head": { - "translation": [ - 0, - 11.5, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "fixed": { - "translation": [ - 0, - -1.75, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - } - }, - "groups": [ - { - "name": "VoxelShapes", - "origin": [ - 8, - 8, - 8 - ], - "color": 0, - "children": [ - 0, - 1, - 2 - ] - } - ] + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "modchest:block/denk_mal_block", + "2": "modchest:block/denk_mal_block_kern_aus", + "3": "modchest:block/denk_mal_block_basis", + "particle": "modchest:block/denk_mal_block_kern_aus" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#3"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#3"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#3"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#3"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#3"} + } + }, + { + "from": [0, 16, 0], + "to": [16, 32, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#1"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#1"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#1"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#1"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#1"} + } + }, + { + "from": [3, 18, 3], + "to": [13, 29, 13], + "faces": { + "north": {"uv": [0, 0, 5, 5.5], "texture": "#2"}, + "east": {"uv": [5, 0, 10, 5.5], "texture": "#2"}, + "south": {"uv": [0, 5.5, 5, 11], "texture": "#2"}, + "west": {"uv": [5, 5.5, 10, 11], "texture": "#2"}, + "up": {"uv": [15, 5, 10, 0], "texture": "#2"}, + "down": {"uv": [15, 5, 10, 10], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [1, 0, 0], + "translation": [2.5, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "translation": [2.5, -1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 11.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "translation": [0, -1.75, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/block/denk_mal_block_placeholder.json b/src/main/resources/assets/modchest/models/block/denk_mal_block_placeholder.json new file mode 100644 index 0000000..fe5d622 --- /dev/null +++ b/src/main/resources/assets/modchest/models/block/denk_mal_block_placeholder.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "particle": "modchest:block/denk_mal_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modchest/models/item/denk_mal_block.json b/src/main/resources/assets/modchest/models/item/denk_mal_block.json index c9b0e8c..463b561 100644 --- a/src/main/resources/assets/modchest/models/item/denk_mal_block.json +++ b/src/main/resources/assets/modchest/models/item/denk_mal_block.json @@ -1,3 +1,3 @@ { - "parent": "modchest:block/denk_mal_block" + "parent": "modchest:block/denk_mal_block_aus" } \ No newline at end of file diff --git a/src/main/resources/assets/modchest/textures/block/denk_mal_block_basis.png b/src/main/resources/assets/modchest/textures/block/denk_mal_block_basis.png index 0fdf5b43a0b25b4e99b8835f84b3e9309728742d..36763a6ba5b4102cd75915cc98df3bc732bcdae3 100644 GIT binary patch delta 2481 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 RJRMM-0KX$Y5)Q>*`WNcf37-G} delta 2521 zcmZuycU+U_8vVkQstg5DP-$y>kpK!ZqHMeti#XT_VMI}e2mt{jlJF%~Y)iob0Da`II_#%60R+!*pcVi-W&xxNqkpQ=~Zs#pp;jUvy64sbFz9oUOqP zx18_PM|_6euWSgBtRT&cuZ+{;Ch$UIy*UO_B7rc0+yDSA^3_4Wx{jm@UUgB|)|TT_ z(311Z;-aIV6x1I%*Xabz$~y)1^d00ky5;5 zD*+fSb7t}Ev-ZAwQ4#%C>Bi;qMzzo`KxV#jX|VX&OMZ&GPKA2`E1TvYZ8eeNoc&h8 zn-9}?ueGTt7}Gp^ALBF2>O^T_OYBife+k$Dc(4(GA(<*Oiizf>*_Gp`qHwlxA9wj$ zV)NedQLEFCp827Ccv{%RL)Bl4&z9Le)2-s=y;`DE3@3?gMg!kpHnA4H*-YVMFC5xN zVDNN(_ho29^}0Z6~a-5Y=S=J_mm|lhyLNmOGu;V z2fF%r2{MY7Oa=3=14wFL5DDGY>(nSl2eu)7*6eCMfYmpFTT+}8{#5a#o=V%c&#_lF z0J%0{t0KX)Kg-l-(U@xMNJek{1tCB&Q;;_nZgPKF=1Q&6RwpUAUCB4^&zauuTyl?e zf%2nRo0utJq+jV8OSzoD(Yg;N))Y+^UnM`Q+Eurm>~4rUj3z|F9h&-ABcF5y!H!9$VYV=6VwG89cu& znN*B}E?B^;#c|;e>`@#b_idKrQHOhgZ{FD%?BbjVg(+DqG8R8% zE3<_Y>aVAb+{-UL32Xg)bg9~Oqc6+Q#YW3j;ur)fv6X@z*43TB6OB%vx9q_6zCjQT zqmmp7$?R~yr(Ub^ydT3>>nbIIHwou3KMO5aLh9=`x+|iY|JAc*a>}*(3lZJuY>q~GnVkTM}72cV|dF0*4zHq+7Ne!%eXxU^bD`+RLS&O%8eY>i+Km0hef_of#>d~b1bX&&=6=<| zdvE5M!?DD-Q7!9B7h53O zY+~oOht<-`3UvKR-SS%)nHhaizOXJXbI{nW@YL$ST@Z`^N)dZEI-OlS_bG}uGK@Yy zuCe>+ncq2D+Rt~g;SUOOuvnH4%?40?fUkjDSL&smcJuI>tJ|KB!d zmidcb8j9vNFRp3T4=$Y%y{AVrBw@+_w5%(a@Qqvqk9G^GR>(A&Lv7QQ6tK&==xa-4W37DFQoIoTXvPO6iG>CkuipZm$!vOFtzyahc6Y`LUOfGFf&#|1-0HIGK<+7 z-42FYIPOxEOb4wZHkL>0Yzir9QajJu27a3p^Fr}~cbuZ%aj7eI_N}tVW%$4yGXF4e zG(|#L1*bW2u`*67uQ=SePfdUkG;1e&g!^k-d+a3Mu&`Ezn8e>sW=}yTKag7D7@zq{ zQ*yZ?&bx9NY7!|u(mu8SLB!59)b3Ov779AIY9iK{1l9|Ds8&1$%__XPfvoWiYdq6tgvr_}pyap$cJ>jUZ|Mht+_;xl}TJU~@$xg#fw zAbP$bqiFA*J$rz$aW76kat|VNj80eY8OSll5m5+#ylO%kR%qq63oQIvA*PFKI&)~C z3CCoH;)5cQN!-qaT9M)YgUY{|{uGK5tW4&yr|Lq)ph#U+eq;w>OvwJFb{^i_l-i2o zh5|K)2S;MQCtZD&VE5V?~WFtqOz$ptH_ z(_9jF_?i>x3X1x)S;FCP^0*7q2%VtEYad!$GsCC;*~aSjp~=_7j82sD*u=!d9b9Kp zflbogyDf)N`E~b&V+pHYN11v3!}55iQ*aqFfEM`n`bgMrL_Tea`58XR%Jj@1{BBro6G0w&LSTC7k%t4lmGw# diff --git a/src/main/resources/reservermod.mixins.json b/src/main/resources/reservermod.mixins.json index 62856ee..f8038fc 100644 --- a/src/main/resources/reservermod.mixins.json +++ b/src/main/resources/reservermod.mixins.json @@ -3,8 +3,10 @@ "package": "modchest.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ServerPlayerEntityMixin", - "bedBlock" + "bedBlockMixin", + "LevelStorageMixin", + "MinecraftServerMixin", + "ServerPlayerEntityMixin" ], "injectors": { "defaultRequire": 1 From a50d5f6cc7fe30210baa190c8eb70fa4ac64cb82 Mon Sep 17 00:00:00 2001 From: Malte Reents Date: Sun, 7 Apr 2024 17:29:37 +0200 Subject: [PATCH 4/4] block updates completely prohibitable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Man kann jetzt weder blöcke platzieren noch abbauen, sofern der denkmalblock ein redstone signal erhält. Block hat noch kein Interface und kann nciht verschoben werden --- .../modchest/block/custom/denkMalBlock.java | 9 +++ .../event/playerBreakBlockEvents.java | 18 ++++++ .../mixin/flintAndSteelItemMixin.java | 41 ++++++++++++++ src/main/java/modchest/mixin/itemMixin.java | 41 ++++++++++++++ .../modchest/mixin/playerPlaceBlockMixin.java | 34 +++++++++++ .../java/modchest/util/denkMalBlockUtil.java | 56 +++++++++++++++++-- src/main/java/modchest/util/initializer.java | 3 + src/main/resources/reservermod.mixins.json | 3 + 8 files changed, 199 insertions(+), 6 deletions(-) create mode 100644 src/main/java/modchest/event/playerBreakBlockEvents.java create mode 100644 src/main/java/modchest/mixin/flintAndSteelItemMixin.java create mode 100644 src/main/java/modchest/mixin/itemMixin.java create mode 100644 src/main/java/modchest/mixin/playerPlaceBlockMixin.java diff --git a/src/main/java/modchest/block/custom/denkMalBlock.java b/src/main/java/modchest/block/custom/denkMalBlock.java index 94fce6a..ff8a436 100644 --- a/src/main/java/modchest/block/custom/denkMalBlock.java +++ b/src/main/java/modchest/block/custom/denkMalBlock.java @@ -18,6 +18,9 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.explosion.Explosion; import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; import static modchest.block.modBlocks.denk_mal_block_placeholder; @@ -138,4 +141,10 @@ public class denkMalBlock extends BlockWithEntity { //Item soll nicht crafta } } } + + @Mutable + @Final protected BlockPos worldPosition; + public void setCMPos(BlockPos newPos) { + worldPosition = newPos; + } } diff --git a/src/main/java/modchest/event/playerBreakBlockEvents.java b/src/main/java/modchest/event/playerBreakBlockEvents.java new file mode 100644 index 0000000..1fabcf5 --- /dev/null +++ b/src/main/java/modchest/event/playerBreakBlockEvents.java @@ -0,0 +1,18 @@ +package modchest.event; + +import modchest.util.denkMalBlockUtil; +import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +public class playerBreakBlockEvents implements PlayerBlockBreakEvents.Before { + @Override + public boolean beforeBlockBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity) { + denkMalBlockUtil util = new denkMalBlockUtil(); + return util.allowBlocks(world, player, pos); + } +} diff --git a/src/main/java/modchest/mixin/flintAndSteelItemMixin.java b/src/main/java/modchest/mixin/flintAndSteelItemMixin.java new file mode 100644 index 0000000..b64ad73 --- /dev/null +++ b/src/main/java/modchest/mixin/flintAndSteelItemMixin.java @@ -0,0 +1,41 @@ +package modchest.mixin; + +import modchest.REServerMod; +import modchest.util.denkMalBlockUtil; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.FlintAndSteelItem; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(FlintAndSteelItem.class) +public class flintAndSteelItemMixin { + + @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) + public void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + if(!callPlaceable(context)) { + cir.setReturnValue(ActionResult.FAIL); + } + } + + @Unique + private boolean callPlaceable(ItemUsageContext context) { + try { + PlayerEntity player = context.getPlayer(); + World world = context.getWorld(); + BlockPos pos = context.getBlockPos(); + denkMalBlockUtil util = new denkMalBlockUtil(); + return util.allowBlocks(world, player, pos); + } catch (Exception e) { + REServerMod.LOGGER.info("Exception in variables: " + e.toString()); + } + return false; + } + +} diff --git a/src/main/java/modchest/mixin/itemMixin.java b/src/main/java/modchest/mixin/itemMixin.java new file mode 100644 index 0000000..61f1886 --- /dev/null +++ b/src/main/java/modchest/mixin/itemMixin.java @@ -0,0 +1,41 @@ +package modchest.mixin; + +import modchest.REServerMod; +import modchest.util.denkMalBlockUtil; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Item.class) +public class itemMixin { + + @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) + public void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + if(!callPlaceable(context)) { + cir.setReturnValue(ActionResult.FAIL); + } + } + + @Unique + private boolean callPlaceable(ItemUsageContext context) { + try { + PlayerEntity player = context.getPlayer(); + World world = context.getWorld(); + BlockPos pos = context.getBlockPos(); + denkMalBlockUtil util = new denkMalBlockUtil(); + return util.allowBlocks(world, player, pos); + } catch (Exception e) { + REServerMod.LOGGER.info("Exception in variables: " + e.toString()); + } + return false; + } + +} diff --git a/src/main/java/modchest/mixin/playerPlaceBlockMixin.java b/src/main/java/modchest/mixin/playerPlaceBlockMixin.java new file mode 100644 index 0000000..a33512b --- /dev/null +++ b/src/main/java/modchest/mixin/playerPlaceBlockMixin.java @@ -0,0 +1,34 @@ +package modchest.mixin; + +import modchest.util.denkMalBlockUtil; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(BlockItem.class) +public class playerPlaceBlockMixin { + @Inject(method = "place(Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/util/ActionResult;", at = @At("HEAD"), cancellable = true) + public void canPlace(ItemPlacementContext context, CallbackInfoReturnable cir) { + if(!callPlaceable(context)) { + cir.setReturnValue(ActionResult.FAIL); + } + } + + @Unique + private boolean callPlaceable(ItemPlacementContext context) { + PlayerEntity player = context.getPlayer(); + World world = context.getWorld(); + BlockPos pos = context.getBlockPos(); + + denkMalBlockUtil util = new denkMalBlockUtil(); + return util.allowBlocks(world, player, pos); + } +} diff --git a/src/main/java/modchest/util/denkMalBlockUtil.java b/src/main/java/modchest/util/denkMalBlockUtil.java index dc2ff1a..da9bac4 100644 --- a/src/main/java/modchest/util/denkMalBlockUtil.java +++ b/src/main/java/modchest/util/denkMalBlockUtil.java @@ -1,31 +1,39 @@ package modchest.util; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import java.util.Arrays; +import java.util.Set; + +import static java.lang.Math.abs; public class denkMalBlockUtil extends dataSaverIO{ public denkMalBlockUtil() {} + public void addBlock(int[] pos, int[] range) { //fuegt bloecke der Liste an abbauverhindernden Bloecke hinzu - NbtCompound tempNbt = new NbtCompound(); //Nbt in dem die Lockdaten gespeichert werden + NbtCompound tempNbt = new NbtCompound(); //Nbt in dem die Blockdaten gespeichert werden + NbtCompound nbt = returnLoadedNbt(); //holt sich den denkmalblock nbt tempNbt.putIntArray("position", pos); tempNbt.putIntArray("range", range); - NbtCompound nbt = returnloadedNbt(); //holt sich den denkmalblock nbt - nbt.put(Arrays.toString(pos), tempNbt); //speichert die daten des neuen Blocks ab + nbt.put(Arrays.toString(pos), tempNbt); //speichert die daten des neuen Blocks ab saveInNbt(nbt); //speichert den editierten denkmalblock-nbt ab } public void removeBlock(int[] posString) { //loescht bloecke aus Liste an abbauverhindernden Bloecken - NbtCompound nbt = returnloadedNbt(); //holt sich den denkmalblock nbt + NbtCompound nbt = returnLoadedNbt(); //holt sich den denkmalblock nbt nbt.remove(Arrays.toString(posString)); //entfernt diesen block saveInNbt(nbt); //speichert den editierten denkmalblock-nbt ab } - private NbtCompound returnloadedNbt() { //gibt den denkmalblock nbt zurueck + private NbtCompound returnLoadedNbt() { //gibt den denkmalblock nbt zurueck NbtCompound nbt = getFromNbt(); //laedt den gesamten reServerNbt - nbt = (NbtCompound) nbt.get("denkmalblock"); //nimmt den denkmalblocknbt und laedt diesen + nbt = (NbtCompound) nbt.get("denkmalblock");//nimmt den denkmalblocknbt und laedt diesen if (nbt == null) { //sollte der nbt noch nicht existieren wird er erstellt nbt = new NbtCompound(); } @@ -37,4 +45,40 @@ public class denkMalBlockUtil extends dataSaverIO{ reServerNbt.put("denkmalblock", nbt); //schreibt den denkmalblock nbt ab writeToNbt(reServerNbt); //schreibt den editierten reServerNbt } + + public boolean allowBlocks(World world, PlayerEntity player, BlockPos pos) { + if (world.getRegistryKey() == World.OVERWORLD) { + if (!player.isCreative()) { + NbtCompound nbt = returnLoadedNbt(); + Set set = nbt.getKeys(); + String[] keys = set.toArray(new String[0]);//erzeugt einen String-Array mit allen keys + + for (String key : keys) { + if (inRange((NbtCompound) nbt.get(key), pos)) { + if (!world.isClient) { + player.sendMessage(Text.of("Can't change Blocks here! This area is protected!")); + } + return false; + } + } + } + } + return true; + } + + private boolean inRange(NbtCompound nbt, BlockPos pos) { + int[] denkPos = nbt.getIntArray("position"); + int[] denkRange = nbt.getIntArray("range"); + int[] blockPos = new int[3]; + blockPos[0] = pos.getX(); + blockPos[1] = pos.getY(); + blockPos[2] = pos.getZ(); + for(int i = 0; i < 3; i++) { + int dif = (denkPos[i] - blockPos[i]); + if (abs(dif) > denkRange[i]) { + return false; + } + } + return true; + } } diff --git a/src/main/java/modchest/util/initializer.java b/src/main/java/modchest/util/initializer.java index 5c11196..7ad0cb5 100644 --- a/src/main/java/modchest/util/initializer.java +++ b/src/main/java/modchest/util/initializer.java @@ -3,10 +3,12 @@ package modchest.util; import modchest.block.entity.modBlockEntities; import modchest.block.modBlocks; import modchest.event.playerAfterRespawnEvent; +import modchest.event.playerBreakBlockEvents; import modchest.item.modItemGroup; import modchest.item.modItems; import modchest.networking.modNetworkingServer; import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; +import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; public class initializer { public static void itemGroups() { @@ -22,6 +24,7 @@ public class initializer { public static void events() { //Events, bei denen custom Code ausgefuehrt wird, werden eingefuehrt ServerPlayerEvents.AFTER_RESPAWN.register(new playerAfterRespawnEvent()); + PlayerBlockBreakEvents.BEFORE.register(new playerBreakBlockEvents()); } public static void networking() { //Identifier unter denen der Server zuhoert werden registriert diff --git a/src/main/resources/reservermod.mixins.json b/src/main/resources/reservermod.mixins.json index f8038fc..c132e08 100644 --- a/src/main/resources/reservermod.mixins.json +++ b/src/main/resources/reservermod.mixins.json @@ -4,8 +4,11 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "bedBlockMixin", + "flintAndSteelItemMixin", + "itemMixin", "LevelStorageMixin", "MinecraftServerMixin", + "playerPlaceBlockMixin", "ServerPlayerEntityMixin" ], "injectors": {