Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'fabric-loom' version '1.11-SNAPSHOT'
id 'maven-publish'
}

version = project.mod_version
group = project.maven_group
def targetJavaVersion = 17
def targetJavaVersion = 21


repositories {
Expand Down Expand Up @@ -56,14 +56,14 @@ java {
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
archivesBaseName = project.mod_id + project.generated_file_name_addon
base.archivesName = project.mod_id + project.generated_file_name_addon
// Uncomment this line to generate a de-obfuscated jar
// withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}" }
rename { "${it}_${base.archivesName}" }
}
}

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
# Mod Properties
mod_name=Transferable Pets
mod_id=transferable_pets
generated_file_name_addon=-[1.21]
generated_file_name_addon=-[1.21.10]
mod_version=1.0.5
mod_description=Transferable Pets is a mod that allows you to transfer your pets to other players. Mod page: https://modrinth.com/mod/transferable-pets
mod_icon=assets/transferable_pets/icon.png
Expand All @@ -13,8 +13,8 @@ environment=*
maven_group=winterwolfsv
# Dependencies
# check this on https://modmuss50.me/fabric.html
minecraft_version=1.21
yarn_mappings=1.21+build.2
loader_version=0.15.11
minecraft_version=1.21.10
yarn_mappings=1.21.10+build.2
loader_version=0.17.3
# Fabric API
fabric_version=0.100.1+1.21
fabric_version=0.135.0+1.21.10
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
47 changes: 32 additions & 15 deletions gradlew
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 23 additions & 18 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ private void interact(Entity entity, Hand hand, CallbackInfoReturnable<ActionRes
PlayerEntity targetPlayer = (PlayerEntity) entity;
PlayerEntity player = (PlayerEntity) (Object) this;
if (!(player.isSneaking() && player instanceof ServerPlayerEntity)) return;
ServerWorld world = (ServerWorld) player.getWorld();
ServerWorld world = (ServerWorld) player.getEntityWorld();

for (Entity localEntities : world.getOtherEntities(player, Box.of(player.getPos(), 12, 12, 12), EntityPredicates.VALID_ENTITY)) {
for (Entity localEntities : world.getOtherEntities(player, Box.of(player.getEntityPos(), 12, 12, 12), EntityPredicates.VALID_ENTITY)) {
if (!(localEntities instanceof AnimalEntity animal)) continue;
if (!(animal.isLeashed() && animal.getLeashHolder() == player)) continue;
if (!(animal instanceof TameableEntity pet && pet.getOwner() == player)) continue;

((TameableEntity) animal).setOwner(targetPlayer);
animal.detachLeash(true, false);
pet.setTamedBy(targetPlayer);
animal.detachLeashWithoutDrop();
animal.attachLeash(targetPlayer, true);
showHearts(world, animal);
showHearts(world, targetPlayer);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"transferable_pets.mixins.json"
],
"depends": {
"fabricloader": "*",
"fabricloader": ">=0.17.3",
"fabric": "*",
"minecraft": ">=1.21"
"minecraft": ">=1.21.10"
}
}