Merge branch 'master' into 1.16

src/main/java/carpet/mixins/PlayerEntityMixin.java

@@ -1,23 +0,0 @@
-package carpet.mixins;
-
-import carpet.CarpetSettings;
-import carpet.helpers.PortalHelper;
-import net.minecraft.entity.player.PlayerEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
-
-@Mixin(PlayerEntity.class)
-public abstract class PlayerEntityMixin
-{
-    @ModifyConstant(method = "getMaxNetherPortalTime",
-            constant = @Constant(intValue = 1))
-    private int addFillUpdatesInt(int original) {
-        if (CarpetSettings.portalCreativeDelay)
-            if (PortalHelper.player_holds_obsidian((PlayerEntity) (Object)this))
-                return 72000;
-            else
-                return 80;
-        return original;
-    }
-}

src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java

@@ -0,0 +1,23 @@
+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;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(PlayerEntity.class)
+public abstract class PlayerEntityMixin_portalDelayMixin
+{
+    @Final @Shadow public PlayerAbilities abilities;
+
+    @Inject(method = "getMaxNetherPortalTime()I", at = @At("HEAD"), cancellable = true)
+    private void onMaxNetherPortalTime(CallbackInfoReturnable<Integer> cir) {
+        if(CarpetSettings.portalCreativeDelay != 1 && this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalCreativeDelay);
+        else if(CarpetSettings.portalSurvivalDelay != 80 && !this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalSurvivalDelay);
+    }
+}