diff --git a/src/main/java/carpet/mixins/PlayerEntityMixin.java b/src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java similarity index 69% rename from src/main/java/carpet/mixins/PlayerEntityMixin.java rename to src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java index 39c7ab56..b0102cb6 100644 --- a/src/main/java/carpet/mixins/PlayerEntityMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java @@ -3,6 +3,7 @@ package carpet.mixins; import carpet.CarpetSettings; import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerEntity; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.Inject; @@ -10,16 +11,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.At; @Mixin(PlayerEntity.class) -public abstract class PlayerEntityMixin { - @Shadow - public PlayerAbilities abilities; +public abstract class PlayerEntityMixin_portalDelayMixin +{ + @Final @Shadow public PlayerAbilities abilities; - @Inject( - method = "getMaxNetherPortalTime()I", - at = @At("HEAD"), - cancellable = true - ) - public void onMaxNetherPortalTime(CallbackInfoReturnable cir) { + @Inject(method = "getMaxNetherPortalTime()I", at = @At("HEAD"), cancellable = true) + private void onMaxNetherPortalTime(CallbackInfoReturnable cir) { if(CarpetSettings.portalCreativeDelay != 1 && this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalCreativeDelay); else if(CarpetSettings.portalSurvivalDelay != 80 && !this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalSurvivalDelay); } diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 26935e54..5f60c74c 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -109,7 +109,7 @@ "EndCityFeatureMixin", "InfestedBlockMixin", - "PlayerEntityMixin", + "PlayerEntityMixin_portalDelayMixin", "PistonBlock_qcMixin", "DispenserBlock_qcMixin",