Renamed Mixin Classes

Insane96 · May 9, 2022 · 5bf5c81 · 5bf5c81
1 parent b91d7e2
commit 5bf5c81
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/...osses/mixin/ChargingPlayerPhaseMixin.java → ...s/mixin/DragonChargrPlayerPhaseMixin.java b/...osses/mixin/ChargingPlayerPhaseMixin.java → ...s/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/...sses/mixin/DragonFireballEntityMixin.java → ...sivebosses/mixin/DragonFireballMixin.java b/...sses/mixin/DragonFireballEntityMixin.java → ...sivebosses/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<? extends AbstractHurtingProjectile> p_i50173_1_, Level p_i50173_2_) {
+	protected DragonFireballMixin(EntityType<? extends AbstractHurtingProjectile> p_i50173_1_, Level p_i50173_2_) {
 		super(p_i50173_1_, p_i50173_2_);
 	}
 

diff --git a/...osses/mixin/HoldingPatternPhaseMixin.java → ...mixin/DragonHoldingPatternPhaseMixin.java b/...osses/mixin/HoldingPatternPhaseMixin.java → ...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/...ebosses/mixin/StrafePlayerPhaseMixin.java → ...s/mixin/DragonStrafePlayerPhaseMixin.java b/...ebosses/mixin/StrafePlayerPhaseMixin.java → ...s/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/...osses/mixin/ElderGuardianEntityMixin.java → ...ssivebosses/mixin/ElderGuardianMixin.java b/...osses/mixin/ElderGuardianEntityMixin.java → ...ssivebosses/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<Integer> callback) {

diff --git a/...bosses/mixin/EnderCrystalEntityMixin.java → ...gressivebosses/mixin/EndCrystalMixin.java b/...bosses/mixin/EnderCrystalEntityMixin.java → ...gressivebosses/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<Boolean> callback) {

diff --git a/...ebosses/mixin/EnderDragonEntityMixin.java → ...ressivebosses/mixin/EnderDragonMixin.java b/...ebosses/mixin/EnderDragonEntityMixin.java → ...ressivebosses/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<? extends Mob> type, Level worldIn) {
+public class EnderDragonMixin extends Mob {
+	protected EnderDragonMixin(EntityType<? extends Mob> type, Level worldIn) {
 		super(type, worldIn);
 	}
 

diff --git a/...osses/mixin/ShulkerBulletEntityMixin.java → ...ssivebosses/mixin/ShulkerBulletMixin.java b/...osses/mixin/ShulkerBulletEntityMixin.java → ...ssivebosses/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<? extends Projectile> entityType, Level world) {
+	public ShulkerBulletMixin(EntityType<? extends Projectile> 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
@@ -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"