From b572270dd677d3dcb0ed9f6ce3b6c2c7986e5cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sun, 10 Nov 2024 10:13:00 +0100 Subject: [PATCH] Update --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../brn/tweaks/mixin/DontHurtMePearlMixin.java | 10 +++++----- .../tweaks/mixin/JustTeleportAlreadyMixin.java | 17 ++++++++++++----- src/main/resources/assets/icon.png | Bin 0 -> 1057 bytes 6 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/icon.png diff --git a/build.gradle b/build.gradle index c9a2241..8a82fbd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index aa321c5..deabdd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 -loader_version=0.16.0 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 +loader_version=0.16.9 # Fabric API -fabric_version=0.102.1+1.21.1 +fabric_version=0.107.3+1.21.3 # Mod Properties -mod_version=1.2.1 +mod_version=1.2.2 maven_group=systems.brn archives_base_name=tweaks diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java b/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java index 7b4adb4..310916f 100644 --- a/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java +++ b/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java @@ -2,6 +2,8 @@ package systems.brn.tweaks.mixin; import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -13,11 +15,9 @@ import static systems.brn.tweaks.Tweaks.Enderpearl_Damage; public class DontHurtMePearlMixin { @Redirect(method = "onCollision(Lnet/minecraft/util/hit/HitResult;)V", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z")) - private boolean redirectDamage(Entity entity, DamageSource source, float amount) { - World world = entity.getWorld(); - entity.damage(source, world.getGameRules().getInt(Enderpearl_Damage)); + at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;damage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z")) + private boolean redirectDamage(ServerPlayerEntity entity, ServerWorld world, DamageSource source, float amount) { + entity.damage(world, source, world.getGameRules().getInt(Enderpearl_Damage)); return false; } } diff --git a/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java b/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java index a710e25..91ab814 100644 --- a/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java +++ b/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java @@ -1,5 +1,6 @@ package systems.brn.tweaks.mixin; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -12,22 +13,28 @@ import static systems.brn.tweaks.Tweaks.Entity_Portal_Cooldown; @Mixin(net.minecraft.entity.Entity.class) public class JustTeleportAlreadyMixin { - @Shadow private World world; + @Shadow + private World world; @Inject(method = "getDefaultPortalCooldown", at = @At(value = "RETURN"), cancellable = true) private void getDefaultPortalCooldown(CallbackInfoReturnable cir) { - cir.setReturnValue(world.getGameRules().getInt(Entity_Portal_Cooldown)); + if (world instanceof ServerWorld sWorld) { + cir.setReturnValue(sWorld.getGameRules().getInt(Entity_Portal_Cooldown)); + } } @Shadow private int portalCooldown; + @Inject(method = "tickPortalCooldown", at = @At(value = "RETURN")) private void tickPortalCooldown(CallbackInfo ci) { - int maxCooldown = world.getGameRules().getInt(Entity_Portal_Cooldown); - if (portalCooldown > maxCooldown) { - portalCooldown = maxCooldown; + if (world instanceof ServerWorld sWorld) { + int maxCooldown = sWorld.getGameRules().getInt(Entity_Portal_Cooldown); + if (portalCooldown > maxCooldown) { + portalCooldown = maxCooldown; + } } } } diff --git a/src/main/resources/assets/icon.png b/src/main/resources/assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c2ae943ea2fccd29f1ba8db67c43e72604a43dbc GIT binary patch literal 1057 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfEt$^F0iMpz3I#>^X_+~x z3=A3*YbV-z9Cna78XvsWHQMEk!lMZbt+sY|SxnOsJLr_Dz2#Lx(MxfYOpl-#8P@Af z&GOx$?BeOMvN5cVADE9^J?eSU)$31uREFT=gN63@?pEK~%iNMSb!A#SPk`xZ5A{b$ zdi%A0#Tjzgw+XtqBrThFMkno|)xLKRAHI&AlD>2P?_!pzO(z-pJ!F!1B?{&XoX?B0 zdS3fTK--(^qh;Zd1>8dRMX`CGrJqka%ygbd^5z$t!j1@?uN&?hUX!!pi1Cp`*Q*-w zC$>gD+;cQ??X}3~^Zv9pHf@{q(CTcV%7zw|AOXe2eO#+H2rLa%KI$^-+he_dhR5eC zP4`*HC1EKR(9Cu6WAp!m@AJ++`VwNTDZu_KKIeBb(}%ZAYuj?`O>_%)p?h48n{ROYO@T7#P?~Jbhi+pL25vifF%LuQy|0V2~_vjVN)>&&^HE zD`9XhN=+Eaj?arkQZ-mJq00(O$liq3{6lf^FI zTs(h4^ZkYWGs-_qP(LxlGUekGrxyY*N@ACMcv+)mnGh{|mM_UA{d;%&9#&KexW##@ahAtnq-( zc>|{3U$qjY{KQwD=+J+&Gg9tFl)sD1-#m{sP7gSwu8XLeSaPOiwzN+4jOz7LOkg?u zwa)y(uGy2BRbrPj?%%&xt=;_g;S;YOmRxj7n)YzT6`lfjm%Pok77XQuvgdz&&6=`i zQx@0Jsf&d+J(|8+M{=1)c$jx$t8&zSftn>P&se8~W^v9)cKG$<&#a&(!^*8jCea%= z{7aiPDNy6B*~-$HZzsH5^Vi)ej>C0Q^3rQhH>_lFT(k4<)1NPQiB0Xu-sJ7Jc!9E! z;LfIhGrW9e{QWqmWN(B~#OD`fU)=Uf&k