diff --git a/src/main/java/systems/brn/tweaks/Tweaks.java b/src/main/java/systems/brn/tweaks/Tweaks.java index 1cc26c1..6400391 100644 --- a/src/main/java/systems/brn/tweaks/Tweaks.java +++ b/src/main/java/systems/brn/tweaks/Tweaks.java @@ -6,9 +6,9 @@ import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry; import net.minecraft.world.GameRules; public class Tweaks implements ModInitializer { - public static final GameRules.Key Entity_Portal_Cooldown = + public static final GameRules.Key ENTITY_PORTAL_COOLDOWN = GameRuleRegistry.register("entityPortalCooldown", GameRules.Category.MOBS, GameRuleFactory.createIntRule(300)); - public static final GameRules.Key Enderpearl_Damage = + public static final GameRules.Key ENDER_PEARL_DAMAGE = GameRuleRegistry.register("enderPearlDamage", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(5)); @Override public void onInitialize() { diff --git a/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java b/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java index 896da14..48a8b92 100644 --- a/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java +++ b/src/main/java/systems/brn/tweaks/mixin/DontHurtMePearlMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import static systems.brn.tweaks.Tweaks.Enderpearl_Damage; +import static systems.brn.tweaks.Tweaks.ENDER_PEARL_DAMAGE; @Mixin(net.minecraft.entity.projectile.thrown.EnderPearlEntity.class) public class DontHurtMePearlMixin { @@ -15,7 +15,7 @@ public class DontHurtMePearlMixin { @Redirect(method = "onCollision(Lnet/minecraft/util/hit/HitResult;)V", 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)); + entity.damage(world, source, world.getGameRules().getInt(ENDER_PEARL_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 91ab814..8472553 100644 --- a/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java +++ b/src/main/java/systems/brn/tweaks/mixin/JustTeleportAlreadyMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static systems.brn.tweaks.Tweaks.Entity_Portal_Cooldown; +import static systems.brn.tweaks.Tweaks.ENTITY_PORTAL_COOLDOWN; @Mixin(net.minecraft.entity.Entity.class) public class JustTeleportAlreadyMixin { @@ -21,7 +21,7 @@ public class JustTeleportAlreadyMixin { cancellable = true) private void getDefaultPortalCooldown(CallbackInfoReturnable cir) { if (world instanceof ServerWorld sWorld) { - cir.setReturnValue(sWorld.getGameRules().getInt(Entity_Portal_Cooldown)); + cir.setReturnValue(sWorld.getGameRules().getInt(ENTITY_PORTAL_COOLDOWN)); } } @@ -31,7 +31,7 @@ public class JustTeleportAlreadyMixin { @Inject(method = "tickPortalCooldown", at = @At(value = "RETURN")) private void tickPortalCooldown(CallbackInfo ci) { if (world instanceof ServerWorld sWorld) { - int maxCooldown = sWorld.getGameRules().getInt(Entity_Portal_Cooldown); + int maxCooldown = sWorld.getGameRules().getInt(ENTITY_PORTAL_COOLDOWN); if (portalCooldown > maxCooldown) { portalCooldown = maxCooldown; }