From 5bf5c81e72468d0152bb51bc66a89083e6d9ee9b Mon Sep 17 00:00:00 2001 From: Insane96 Date: Mon, 9 May 2022 12:26:01 +0200 Subject: [PATCH] Renamed Mixin Classes --- ....java => DragonChargrPlayerPhaseMixin.java} | 4 ++-- ...tityMixin.java => DragonFireballMixin.java} | 4 ++-- ...ava => DragonHoldingPatternPhaseMixin.java} | 2 +- ....java => DragonStrafePlayerPhaseMixin.java} | 4 ++-- ...ntityMixin.java => ElderGuardianMixin.java} | 2 +- ...alEntityMixin.java => EndCrystalMixin.java} | 2 +- ...nEntityMixin.java => EnderDragonMixin.java} | 4 ++-- ...ntityMixin.java => ShulkerBulletMixin.java} | 4 ++-- .../resources/progressivebosses.mixins.json | 18 +++++++++--------- 9 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/insane96mcp/progressivebosses/mixin/{ChargingPlayerPhaseMixin.java => DragonChargrPlayerPhaseMixin.java} (94%) rename src/main/java/insane96mcp/progressivebosses/mixin/{DragonFireballEntityMixin.java => DragonFireballMixin.java} (82%) rename src/main/java/insane96mcp/progressivebosses/mixin/{HoldingPatternPhaseMixin.java => DragonHoldingPatternPhaseMixin.java} (95%) rename src/main/java/insane96mcp/progressivebosses/mixin/{StrafePlayerPhaseMixin.java => DragonStrafePlayerPhaseMixin.java} (96%) rename src/main/java/insane96mcp/progressivebosses/mixin/{ElderGuardianEntityMixin.java => ElderGuardianMixin.java} (94%) rename src/main/java/insane96mcp/progressivebosses/mixin/{EnderCrystalEntityMixin.java => EndCrystalMixin.java} (95%) rename src/main/java/insane96mcp/progressivebosses/mixin/{EnderDragonEntityMixin.java => EnderDragonMixin.java} (93%) rename src/main/java/insane96mcp/progressivebosses/mixin/{ShulkerBulletEntityMixin.java => ShulkerBulletMixin.java} (92%) diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/ChargingPlayerPhaseMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/DragonChargrPlayerPhaseMixin.java similarity index 94% rename from src/main/java/insane96mcp/progressivebosses/mixin/ChargingPlayerPhaseMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/DragonChargrPlayerPhaseMixin.java index eaa4f54a..99b87178 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/ChargingPlayerPhaseMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/DragonChargrPlayerPhaseMixin.java @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(DragonChargePlayerPhase.class) -public abstract class ChargingPlayerPhaseMixin extends AbstractDragonPhaseInstance { +public abstract class DragonChargrPlayerPhaseMixin extends AbstractDragonPhaseInstance { @Shadow @Final @@ -27,7 +27,7 @@ public abstract class ChargingPlayerPhaseMixin extends AbstractDragonPhaseInstan @Shadow private Vec3 targetLocation; - public ChargingPlayerPhaseMixin(EnderDragon dragonIn) { + public DragonChargrPlayerPhaseMixin(EnderDragon dragonIn) { super(dragonIn); } diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballEntityMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballMixin.java similarity index 82% rename from src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballEntityMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballMixin.java index 1345d1c7..271eab02 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballEntityMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/DragonFireballMixin.java @@ -12,9 +12,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(DragonFireball.class) -public class DragonFireballEntityMixin extends AbstractHurtingProjectile { +public class DragonFireballMixin extends AbstractHurtingProjectile { - protected DragonFireballEntityMixin(EntityType p_i50173_1_, Level p_i50173_2_) { + protected DragonFireballMixin(EntityType p_i50173_1_, Level p_i50173_2_) { super(p_i50173_1_, p_i50173_2_); } diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/HoldingPatternPhaseMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/DragonHoldingPatternPhaseMixin.java similarity index 95% rename from src/main/java/insane96mcp/progressivebosses/mixin/HoldingPatternPhaseMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/DragonHoldingPatternPhaseMixin.java index fde87bcd..0c77d53c 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/HoldingPatternPhaseMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/DragonHoldingPatternPhaseMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(DragonHoldingPatternPhase.class) -public class HoldingPatternPhaseMixin { +public class DragonHoldingPatternPhaseMixin { @Shadow public Path currentPath; diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/StrafePlayerPhaseMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/DragonStrafePlayerPhaseMixin.java similarity index 96% rename from src/main/java/insane96mcp/progressivebosses/mixin/StrafePlayerPhaseMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/DragonStrafePlayerPhaseMixin.java index 34080a20..a7b80f0e 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/StrafePlayerPhaseMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/DragonStrafePlayerPhaseMixin.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Shadow; @Mixin(DragonStrafePlayerPhase.class) -public abstract class StrafePlayerPhaseMixin extends AbstractDragonPhaseInstance { +public abstract class DragonStrafePlayerPhaseMixin extends AbstractDragonPhaseInstance { @Shadow private int fireballCharge; @Shadow @@ -25,7 +25,7 @@ public abstract class StrafePlayerPhaseMixin extends AbstractDragonPhaseInstance @Shadow private LivingEntity attackTarget; - public StrafePlayerPhaseMixin(EnderDragon dragonIn) { + public DragonStrafePlayerPhaseMixin(EnderDragon dragonIn) { super(dragonIn); } diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianEntityMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianMixin.java similarity index 94% rename from src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianEntityMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianMixin.java index 7b251f58..e16a29be 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianEntityMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/ElderGuardianMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ElderGuardian.class) -public class ElderGuardianEntityMixin { +public class ElderGuardianMixin { @Inject(at = @At("HEAD"), method = "getAttackDuration()I", cancellable = true) private void getAttackDuration(CallbackInfoReturnable callback) { diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/EnderCrystalEntityMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/EndCrystalMixin.java similarity index 95% rename from src/main/java/insane96mcp/progressivebosses/mixin/EnderCrystalEntityMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/EndCrystalMixin.java index 8b030c1e..000e7b86 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/EnderCrystalEntityMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/EndCrystalMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(EndCrystal.class) -public class EnderCrystalEntityMixin { +public class EndCrystalMixin { @Inject(at = @At("HEAD"), method = "hurt(Lnet/minecraft/world/damagesource/DamageSource;F)Z", cancellable = true) private void hurt(DamageSource source, float amount, CallbackInfoReturnable callback) { diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonEntityMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonMixin.java similarity index 93% rename from src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonEntityMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonMixin.java index 4d32dc81..9fcd8bdc 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonEntityMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/EnderDragonMixin.java @@ -15,8 +15,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(EnderDragon.class) -public class EnderDragonEntityMixin extends Mob { - protected EnderDragonEntityMixin(EntityType type, Level worldIn) { +public class EnderDragonMixin extends Mob { + protected EnderDragonMixin(EntityType type, Level worldIn) { super(type, worldIn); } diff --git a/src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletEntityMixin.java b/src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletMixin.java similarity index 92% rename from src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletEntityMixin.java rename to src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletMixin.java index 6198b589..4aea2ab8 100644 --- a/src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletEntityMixin.java +++ b/src/main/java/insane96mcp/progressivebosses/mixin/ShulkerBulletMixin.java @@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ShulkerBullet.class) -public abstract class ShulkerBulletEntityMixin extends Projectile { +public abstract class ShulkerBulletMixin extends Projectile { - public ShulkerBulletEntityMixin(EntityType entityType, Level world) { + public ShulkerBulletMixin(EntityType entityType, Level world) { super(entityType, world); this.noPhysics = true; } diff --git a/src/main/resources/progressivebosses.mixins.json b/src/main/resources/progressivebosses.mixins.json index 9ae5d480..88b307f7 100644 --- a/src/main/resources/progressivebosses.mixins.json +++ b/src/main/resources/progressivebosses.mixins.json @@ -4,16 +4,16 @@ "compatibilityLevel": "JAVA_8", "refmap": "progressivebosses.refmap.json", "mixins": [ - "ChargingPlayerPhaseMixin", - "DragonFireballEntityMixin", - "ElderGuardianEntityMixin", + "DragonChargrPlayerPhaseMixin", + "DragonFireballMixin", + "DragonHoldingPatternPhaseMixin", + "DragonLandingPhaseMixin", + "DragonStrafePlayerPhaseMixin", + "ElderGuardianMixin", + "EndCrystalMixin", "EndDragonFightMixin", - "EnderCrystalEntityMixin", - "EnderDragonEntityMixin", - "HoldingPatternPhaseMixin", - "LandingPhaseMixin", - "ShulkerBulletEntityMixin", - "StrafePlayerPhaseMixin" + "EnderDragonMixin", + "ShulkerBulletMixin" ], "client": [ "client.WitherBossRendererMixin"