commit dee168b0d0d98c79f0d58d3a1e072057d5d6fe79 Author: skippyall <121978267+skippyall@users.noreply.github.com> Date: Tue May 12 21:51:43 2026 +0200 Init diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e901c02 --- /dev/null +++ b/build.gradle @@ -0,0 +1,87 @@ +plugins { + id 'net.fabricmc.fabric-loom' version "${loom_version}" + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "villa" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + +} + +processResources { + def version = project.version + inputs.property "version", version + + filesMatching("fabric.mod.json") { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 25 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 +} + +jar { + def projectName = project.name + inputs.property "projectName", projectName + + from("LICENSE") { + rename { "${it}_$projectName"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..78d501e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=26.1.2 +loader_version=0.19.2 +loom_version=1.16-SNAPSHOT + +# Mod Properties +mod_version=1.0.0 +maven_group=de.foxgalaxy.villa + +# Dependencies +fabric_api_version=0.148.2+26.1.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d997cfc Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /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-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..739907d --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 + + + +# 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" ) + + 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, 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..74ce2b7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} + +// Should match your modid +rootProject.name = 'villa' diff --git a/src/client/java/de/foxgalaxy/villa/client/VillaModClient.java b/src/client/java/de/foxgalaxy/villa/client/VillaModClient.java new file mode 100644 index 0000000..23a6c3a --- /dev/null +++ b/src/client/java/de/foxgalaxy/villa/client/VillaModClient.java @@ -0,0 +1,10 @@ +package de.foxgalaxy.villa.client; + +import net.fabricmc.api.ClientModInitializer; + +public class VillaModClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + + } +} \ No newline at end of file diff --git a/src/client/resources/villa.client.mixins.json b/src/client/resources/villa.client.mixins.json new file mode 100644 index 0000000..8473add --- /dev/null +++ b/src/client/resources/villa.client.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "de.foxgalaxy.villa.client.mixin", + "compatibilityLevel": "JAVA_25", + "client": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file diff --git a/src/main/java/de/foxgalaxy/villa/VillaMod.java b/src/main/java/de/foxgalaxy/villa/VillaMod.java new file mode 100644 index 0000000..a157a26 --- /dev/null +++ b/src/main/java/de/foxgalaxy/villa/VillaMod.java @@ -0,0 +1,57 @@ +package de.foxgalaxy.villa; + +import com.mojang.serialization.Codec; +import net.fabricmc.api.ModInitializer; + +import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry; +import net.fabricmc.fabric.api.attachment.v1.AttachmentType; +import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class VillaMod implements ModInitializer { + public static final String MOD_ID = "villa"; + + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + public static final TagKey SOULBOUND = TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(MOD_ID, "soulbound")); + public static final AttachmentType HAS_JOINED = AttachmentRegistry.create(Identifier.fromNamespaceAndPath(MOD_ID, "joined"), builder -> + builder.initializer(() -> false) + .persistent(Codec.BOOL) + .copyOnDeath() + ); + + @Override + public void onInitialize() { + ServerPlayerEvents.JOIN.register((player) -> { + if(!player.getAttachedOrCreate(HAS_JOINED)) { + player.setAttached(HAS_JOINED, true); + giveEquipment(player); + } + }); + } + + public static void giveEquipment(ServerPlayer player) { + Inventory inv = player.getInventory(); + inv.add(new ItemStack(Items.IRON_PICKAXE)); + inv.add(new ItemStack(Items.IRON_AXE)); + inv.add(new ItemStack(Items.IRON_SHOVEL)); + inv.add(new ItemStack(Items.BUCKET)); + inv.add(new ItemStack(Items.BREAD, 32)); + + player.setItemSlot(EquipmentSlot.OFFHAND, new ItemStack(Items.SHIELD)); + player.setItemSlot(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET)); + player.setItemSlot(EquipmentSlot.CHEST, new ItemStack(Items.IRON_CHESTPLATE)); + player.setItemSlot(EquipmentSlot.LEGS, new ItemStack(Items.IRON_LEGGINGS)); + player.setItemSlot(EquipmentSlot.FEET, new ItemStack(Items.IRON_BOOTS)); + } +} \ No newline at end of file diff --git a/src/main/java/de/foxgalaxy/villa/mixin/EntityEquipmentMixin.java b/src/main/java/de/foxgalaxy/villa/mixin/EntityEquipmentMixin.java new file mode 100644 index 0000000..c9f5101 --- /dev/null +++ b/src/main/java/de/foxgalaxy/villa/mixin/EntityEquipmentMixin.java @@ -0,0 +1,35 @@ +package de.foxgalaxy.villa.mixin; + +import de.foxgalaxy.villa.VillaMod; +import net.minecraft.world.entity.EntityEquipment; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.EnumMap; +import java.util.Map; + +@Mixin(EntityEquipment.class) +public class EntityEquipmentMixin { + @Shadow + @Final + private EnumMap items; + + /** + * @author Erfinderlabyrinth + * @reason To make it easier to keep armor + */ + @Overwrite + public void dropAll(final LivingEntity dropper) { + for (Map.Entry equipmentSlotItemStackEntry : items.entrySet()) { + if (!equipmentSlotItemStackEntry.getValue().is(VillaMod.SOULBOUND)) { + dropper.drop(equipmentSlotItemStackEntry.getValue(), true, false); + equipmentSlotItemStackEntry.setValue(ItemStack.EMPTY); + } + } + } +} diff --git a/src/main/java/de/foxgalaxy/villa/mixin/InventoryMixin.java b/src/main/java/de/foxgalaxy/villa/mixin/InventoryMixin.java new file mode 100644 index 0000000..7e6cb8d --- /dev/null +++ b/src/main/java/de/foxgalaxy/villa/mixin/InventoryMixin.java @@ -0,0 +1,20 @@ +package de.foxgalaxy.villa.mixin; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import de.foxgalaxy.villa.VillaMod; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(Inventory.class) +public class InventoryMixin { + @WrapOperation(method = "dropAll", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;isEmpty()Z")) + public boolean skipArmorAndTools(ItemStack instance, Operation original) { + if (instance.is(VillaMod.SOULBOUND)) { + return true; + } + return original.call(instance); + } +} diff --git a/src/main/java/de/foxgalaxy/villa/mixin/MerchantOfferMixin.java b/src/main/java/de/foxgalaxy/villa/mixin/MerchantOfferMixin.java new file mode 100644 index 0000000..4cc0842 --- /dev/null +++ b/src/main/java/de/foxgalaxy/villa/mixin/MerchantOfferMixin.java @@ -0,0 +1,15 @@ +package de.foxgalaxy.villa.mixin; + +import net.minecraft.world.item.trading.MerchantOffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MerchantOffer.class) +public class MerchantOfferMixin { + @Inject(method = "increaseUses", at = @At("HEAD"), cancellable = true) + private void cancelUseIncrease(CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/java/de/foxgalaxy/villa/mixin/ServerPlayerMixin.java b/src/main/java/de/foxgalaxy/villa/mixin/ServerPlayerMixin.java new file mode 100644 index 0000000..92c7d36 --- /dev/null +++ b/src/main/java/de/foxgalaxy/villa/mixin/ServerPlayerMixin.java @@ -0,0 +1,31 @@ +package de.foxgalaxy.villa.mixin; + +import com.mojang.authlib.GameProfile; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.gamerules.GameRules; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ServerPlayer.class) +public abstract class ServerPlayerMixin extends Player { + public ServerPlayerMixin(Level level, GameProfile gameProfile) { + super(level, gameProfile); + } + + @Shadow + public abstract ServerLevel level(); + + @Inject(method = "restoreFrom", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/gamerules/GameRules;KEEP_INVENTORY:Lnet/minecraft/world/level/gamerules/GameRule;", opcode = Opcodes.GETSTATIC)) + private void transferItems(ServerPlayer oldPlayer, boolean restoreAll, CallbackInfo ci) { + if(!(level().getGameRules().get(GameRules.KEEP_INVENTORY) || oldPlayer.isSpectator())) { + this.getInventory().replaceWith(oldPlayer.getInventory()); + } + } +} diff --git a/src/main/resources/data/villa/tags/item/soulbound.json b/src/main/resources/data/villa/tags/item/soulbound.json new file mode 100644 index 0000000..655b5af --- /dev/null +++ b/src/main/resources/data/villa/tags/item/soulbound.json @@ -0,0 +1,18 @@ +{ + "values": [ + "#minecraft:foot_armor", + "#minecraft:leg_armor", + "#minecraft:chest_armor", + "#minecraft:head_armor", + "minecraft:elytra", + "minecraft:shield", + "#minecraft:swords", + "#minecraft:axes", + "#minecraft:pickaxes", + "#minecraft:shovels", + "#minecraft:hoes", + "minecraft:bow", + "minecraft:crossbow", + "#minecraft:spears" + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..bd0917a --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "villa", + "version": "${version}", + "name": "Villa", + "description": "The mod for the villa project", + "authors": [ + "ErfinderLabyrinth", + "skippyall" + ], + "environment": "*", + "entrypoints": { + "main": [ + "de.foxgalaxy.villa.VillaMod" + ], + "client": [ + "de.foxgalaxy.villa.client.VillaModClient" + ] + }, + "mixins": [ + "villa.mixins.json", + { + "config": "villa.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.19.2", + "minecraft": "~26.1.2", + "java": ">=25", + "fabric-api": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/villa.mixins.json b/src/main/resources/villa.mixins.json new file mode 100644 index 0000000..8190931 --- /dev/null +++ b/src/main/resources/villa.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "package": "de.foxgalaxy.villa.mixin", + "compatibilityLevel": "JAVA_25", + "mixins": [ + "EntityEquipmentMixin", + "InventoryMixin", + "MerchantOfferMixin", + "ServerPlayerMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file