From 4e0a3f39f65bcd861dddbd2efff710a3a72d89b6 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Sun, 5 Jul 2026 20:25:42 +0700 Subject: [PATCH] refactor: rename mixins to match classes chore: spotless build: 26.2 --- .../{AbstractBlockMixin.java => BlockBehaviourMixin.java} | 2 +- ...aguleBlockMixin.java => MangrovePropaguleBlockMixin.java} | 2 +- ...Mixin.java => RandomizableContainerBlockEntityMixin.java} | 4 ++-- .../mixin/{EntityMixin.java => LivingEntityMixin.java} | 4 ++-- .../mixin/{BeeEntityMixin.java => BeeMixin.java} | 4 ++-- .../mixin/{ExplosionMixin.java => ServerExplosionMixin.java} | 2 +- ...ctMinecartEntityMixin.java => AbstractMinecartMixin.java} | 4 ++-- ...aceMinecartEntityMixin.java => FurnaceMinecartMixin.java} | 4 ++-- .../slimes/mixin/flee/{MobEntityMixin.java => MobMixin.java} | 4 ++-- .../mixin/merge/{SlimeEntityMixin.java => SlimeMixin.java} | 4 ++-- .../freeze/{SnowballEntityMixin.java => SnowballMixin.java} | 5 ++--- ...nowballEntityMixin.java => ThrowableProjectileMixin.java} | 4 ++-- ...nowballEntityMixin.java => ThrowableProjectileMixin.java} | 4 ++-- .../{SnowballEntityMixin.java => SnowballMixin.java} | 5 ++--- .../mixin/{VillagerEntityMixin.java => VillagerMixin.java} | 4 ++-- .../mixin/{ZombieEntityMixin.java => ZombieMixin.java} | 4 ++-- .../mixin/{ZombieEntityMixin.java => ZombieMixin.java} | 4 ++-- .../{AnvilScreenHandlerMixin.java => AnvilMenuMixin.java} | 4 ++-- ...creenMixin.java => CreativeModeInventoryScreenMixin.java} | 4 ++-- ...tionScreenMixin.java => GameModeSwitcherScreenMixin.java} | 4 ++-- .../mixin/{InGameHudMixin.java => GuiMixin.java} | 2 +- .../{GameModeSelectionMixin.java => GameModeIconMixin.java} | 2 +- ...tionScreenMixin.java => GameModeSwitcherScreenMixin.java} | 4 ++-- ...{DrawContextMixin.java => GuiGraphicsExtractorMixin.java} | 2 +- .../mixin/{PlayerEntityMixin.java => PlayerMixin.java} | 4 ++-- .../{AnvilScreenHandlerMixin.java => AnvilMenuMixin.java} | 4 ++-- ...viorMixin.java => MinecartDispenseItemBehaviorMixin.java} | 2 +- .../{SpikeCacheMixin.java => SpikeCacheLoaderMixin.java} | 2 +- ...ctMinecartEntityMixin.java => AbstractMinecartMixin.java} | 4 ++-- .../mixin/{PlayerEntityMixin.java => PlayerMixin.java} | 4 ++-- .../mixin/{GoatHornMixin.java => InstrumentItemMixin.java} | 2 +- .../mixin/{VillagerEntityMixin.java => VillagerMixin.java} | 4 ++-- .../mixin/{PlayerEntityMixin.java => PlayerMixin.java} | 4 ++-- .../mixin/{PlayerManagerMixin.java => PlayerListMixin.java} | 2 +- ...PlayerScreenHandlerMixin.java => InventoryMenuMixin.java} | 2 +- .../mixin/{PlayerEntityMixin.java => PlayerMixin.java} | 2 +- .../mixin/{MinecraftClientMixin.java => MinecraftMixin.java} | 2 +- ...gerImplMixin.java => ReloadableResourceManagerMixin.java} | 2 +- .../{DebugHudMixin.java => DebugScreenOverlayMixin.java} | 2 +- .../wakeup/{PlayerEntityMixin.java => PlayerMixin.java} | 2 +- .../mixin/{ServerWorldMixin.java => ServerLevelMixin.java} | 2 +- ...entProjectileEntityMixin.java => AbstractArrowMixin.java} | 4 ++-- .../{FallingBlockMixin.java => FallingBlockEntityMixin.java} | 4 ++-- .../mixin/{FarmlandMixin.java => FarmlandBlockMixin.java} | 2 +- .../{AbstractFireBlockMixin.java => FireBlockMixin.java} | 4 ++-- 45 files changed, 72 insertions(+), 74 deletions(-) rename src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/{AbstractBlockMixin.java => BlockBehaviourMixin.java} (98%) rename src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/{PropaguleBlockMixin.java => MangrovePropaguleBlockMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/{LootableContainerBlockEntityMixin.java => RandomizableContainerBlockEntityMixin.java} (91%) rename src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/{EntityMixin.java => LivingEntityMixin.java} (95%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/{BeeEntityMixin.java => BeeMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/{ExplosionMixin.java => ServerExplosionMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/{AbstractMinecartEntityMixin.java => AbstractMinecartMixin.java} (87%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/{FurnaceMinecartEntityMixin.java => FurnaceMinecartMixin.java} (90%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/{MobEntityMixin.java => MobMixin.java} (92%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/{SlimeEntityMixin.java => SlimeMixin.java} (90%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/{SnowballEntityMixin.java => SnowballMixin.java} (88%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/{SnowballEntityMixin.java => ThrowableProjectileMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/{SnowballEntityMixin.java => ThrowableProjectileMixin.java} (90%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/{SnowballEntityMixin.java => SnowballMixin.java} (89%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/{VillagerEntityMixin.java => VillagerMixin.java} (92%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/{ZombieEntityMixin.java => ZombieMixin.java} (90%) rename src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/{ZombieEntityMixin.java => ZombieMixin.java} (89%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/{AnvilScreenHandlerMixin.java => AnvilMenuMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/{CreativeInventoryScreenMixin.java => CreativeModeInventoryScreenMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/{GameModeSelectionScreenMixin.java => GameModeSwitcherScreenMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/{InGameHudMixin.java => GuiMixin.java} (99%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/{GameModeSelectionMixin.java => GameModeIconMixin.java} (95%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/{GameModeSelectionScreenMixin.java => GameModeSwitcherScreenMixin.java} (93%) rename src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/{DrawContextMixin.java => GuiGraphicsExtractorMixin.java} (98%) rename src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/{PlayerEntityMixin.java => PlayerMixin.java} (91%) rename src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/{AnvilScreenHandlerMixin.java => AnvilMenuMixin.java} (95%) rename src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/{ItemDispenserBehaviorMixin.java => MinecartDispenseItemBehaviorMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/{SpikeCacheMixin.java => SpikeCacheLoaderMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/{AbstractMinecartEntityMixin.java => AbstractMinecartMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/{PlayerEntityMixin.java => PlayerMixin.java} (95%) rename src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/{GoatHornMixin.java => InstrumentItemMixin.java} (98%) rename src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/{VillagerEntityMixin.java => VillagerMixin.java} (94%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/{PlayerEntityMixin.java => PlayerMixin.java} (93%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/{PlayerManagerMixin.java => PlayerListMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/{PlayerScreenHandlerMixin.java => InventoryMenuMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/{PlayerEntityMixin.java => PlayerMixin.java} (98%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/{MinecraftClientMixin.java => MinecraftMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/{ReloadableResourceManagerImplMixin.java => ReloadableResourceManagerMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/{DebugHudMixin.java => DebugScreenOverlayMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/{PlayerEntityMixin.java => PlayerMixin.java} (98%) rename src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/{ServerWorldMixin.java => ServerLevelMixin.java} (96%) rename src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/{PersistentProjectileEntityMixin.java => AbstractArrowMixin.java} (90%) rename src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/{FallingBlockMixin.java => FallingBlockEntityMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/{FarmlandMixin.java => FarmlandBlockMixin.java} (97%) rename src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/{AbstractFireBlockMixin.java => FireBlockMixin.java} (95%) diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/BlockBehaviourMixin.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/BlockBehaviourMixin.java index 756e7e4f..8fefa039 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/cactus_bottle_filling/mixin/BlockBehaviourMixin.java @@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(BlockBehaviour.class) -abstract class AbstractBlockMixin { +abstract class BlockBehaviourMixin { @Inject(at = @At("HEAD"), method = "useItemOn", cancellable = true) private void andromeda$onUse( diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/PropaguleBlockMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/MangrovePropaguleBlockMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/PropaguleBlockMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/MangrovePropaguleBlockMixin.java index 4bcb01cb..6a367289 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/PropaguleBlockMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/falling_propagule/mixin/MangrovePropaguleBlockMixin.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(MangrovePropaguleBlock.class) -abstract class PropaguleBlockMixin { +abstract class MangrovePropaguleBlockMixin { @Shadow private static boolean isFullyGrown(BlockState state) { diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/LootableContainerBlockEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/RandomizableContainerBlockEntityMixin.java similarity index 91% rename from src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/LootableContainerBlockEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/RandomizableContainerBlockEntityMixin.java index 3e160541..e47d9e64 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/LootableContainerBlockEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/mixin/RandomizableContainerBlockEntityMixin.java @@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(RandomizableContainerBlockEntity.class) -abstract class LootableContainerBlockEntityMixin extends BaseContainerBlockEntity { +abstract class RandomizableContainerBlockEntityMixin extends BaseContainerBlockEntity { - protected LootableContainerBlockEntityMixin( + protected RandomizableContainerBlockEntityMixin( BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { super(blockEntityType, blockPos, blockState); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/EntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/LivingEntityMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/EntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/LivingEntityMixin.java index 10fa67a3..72629594 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/EntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/leaf_slowdown/mixin/LivingEntityMixin.java @@ -21,12 +21,12 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(LivingEntity.class) -abstract class EntityMixin extends Entity { +abstract class LivingEntityMixin extends Entity { @Shadow public abstract @Nullable AttributeInstance getAttribute(Holder attribute); - public EntityMixin(EntityType type, Level level) { + public LivingEntityMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeMixin.java index 88565d0b..b18496ba 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/bee_flower_duplication/mixin/BeeMixin.java @@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Bee.class) -abstract class BeeEntityMixin extends Animal { +abstract class BeeMixin extends Animal { @Shadow @Nullable private BlockPos savedFlowerPos; @@ -35,7 +35,7 @@ abstract class BeeEntityMixin extends Animal { @Unique private int andromeda$plantingCoolDown; - protected BeeEntityMixin(EntityType entityType, Level level) { + protected BeeMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ExplosionMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ServerExplosionMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ExplosionMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ServerExplosionMixin.java index c6a84512..59f1a483 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ExplosionMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/ghast_tweaks/mixin/ServerExplosionMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ServerExplosion.class) -abstract class ExplosionMixin implements GhastExplosionDuck { +abstract class ServerExplosionMixin implements GhastExplosionDuck { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartMixin.java similarity index 87% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartMixin.java index c460b0fa..3762339e 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/AbstractMinecartMixin.java @@ -10,9 +10,9 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(AbstractMinecart.class) -abstract class AbstractMinecartEntityMixin extends Entity { +abstract class AbstractMinecartMixin extends Entity { - public AbstractMinecartEntityMixin(EntityType type, Level level) { + public AbstractMinecartMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartMixin.java similarity index 90% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartMixin.java index 365a1d96..6a7d2ba8 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/minecart_speed_control/mixin/FurnaceMinecartMixin.java @@ -13,12 +13,12 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(MinecartFurnace.class) -abstract class FurnaceMinecartEntityMixin extends AbstractMinecart { +abstract class FurnaceMinecartMixin extends AbstractMinecart { @Shadow public int fuel; - protected FurnaceMinecartEntityMixin(EntityType entityType, Level level) { + protected FurnaceMinecartMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobMixin.java similarity index 92% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobMixin.java index 41cb352a..7dd4d68f 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/flee/MobMixin.java @@ -14,12 +14,12 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @Mixin(Mob.class) -abstract class MobEntityMixin extends Entity { +abstract class MobMixin extends Entity { @Shadow @Nullable private LivingEntity target; - public MobEntityMixin(EntityType type, Level level) { + public MobMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeMixin.java similarity index 90% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeMixin.java index 31a19494..05672aa1 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/slimes/mixin/merge/SlimeMixin.java @@ -13,9 +13,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Slime.class) -abstract class SlimeEntityMixin extends AbstractCubeMob { +abstract class SlimeMixin extends AbstractCubeMob { - protected SlimeEntityMixin(EntityType type, Level level) { + protected SlimeMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballMixin.java similarity index 88% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballMixin.java index 613f418c..6fac72ab 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/freeze/SnowballMixin.java @@ -14,10 +14,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Snowball.class) -abstract class SnowballEntityMixin extends ThrowableItemProjectile { +abstract class SnowballMixin extends ThrowableItemProjectile { - public SnowballEntityMixin( - EntityType entityType, Level level) { + public SnowballMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/SnowballEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/ThrowableProjectileMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/SnowballEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/ThrowableProjectileMixin.java index 5cbd2460..a78193ad 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/SnowballEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/layers/ThrowableProjectileMixin.java @@ -23,9 +23,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ThrowableProjectile.class) -abstract class SnowballEntityMixin extends Projectile { +abstract class ThrowableProjectileMixin extends Projectile { - public SnowballEntityMixin(EntityType entityType, Level level) { + public ThrowableProjectileMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/SnowballEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/ThrowableProjectileMixin.java similarity index 90% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/SnowballEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/ThrowableProjectileMixin.java index eab04cb7..ce3e716e 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/SnowballEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/melt/ThrowableProjectileMixin.java @@ -14,9 +14,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ThrowableProjectile.class) -abstract class SnowballEntityMixin extends Projectile { +abstract class ThrowableProjectileMixin extends Projectile { - public SnowballEntityMixin(EntityType entityType, Level level) { + public ThrowableProjectileMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballMixin.java similarity index 89% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballMixin.java index f485974f..8e7964d4 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/snowball_tweaks/mixin/put_out_fire/SnowballMixin.java @@ -15,10 +15,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Snowball.class) -abstract class SnowballEntityMixin extends ThrowableItemProjectile { +abstract class SnowballMixin extends ThrowableItemProjectile { - public SnowballEntityMixin( - EntityType entityType, Level level) { + public SnowballMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerMixin.java similarity index 92% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerMixin.java index 67a4b78e..a11c4955 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/villagers_follow_emeralds/mixin/VillagerMixin.java @@ -16,9 +16,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Villager.class) -abstract class VillagerEntityMixin extends AbstractVillager { +abstract class VillagerMixin extends AbstractVillager { - public VillagerEntityMixin(EntityType entityType, Level level) { + public VillagerMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieMixin.java similarity index 90% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieMixin.java index d3c1a5bd..44eff089 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/all_pick_up/mixin/ZombieMixin.java @@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Zombie.class) -abstract class ZombieEntityMixin extends Monster { +abstract class ZombieMixin extends Monster { - protected ZombieEntityMixin(EntityType entityType, Level level) { + protected ZombieMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieMixin.java similarity index 89% rename from src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieMixin.java index 0dea564a..76d80b3d 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/zombie/clean_pickup/mixin/ZombieMixin.java @@ -12,9 +12,9 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(Zombie.class) -abstract class ZombieEntityMixin extends Monster { +abstract class ZombieMixin extends Monster { - protected ZombieEntityMixin(EntityType entityType, Level level) { + protected ZombieMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilScreenHandlerMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilMenuMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilScreenHandlerMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilMenuMixin.java index 0741c21a..25ceb0d8 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilScreenHandlerMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/AnvilMenuMixin.java @@ -22,9 +22,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(AnvilMenu.class) -abstract class AnvilScreenHandlerMixin extends ItemCombinerMenu { +abstract class AnvilMenuMixin extends ItemCombinerMenu { - public AnvilScreenHandlerMixin( + public AnvilMenuMixin( @Nullable MenuType menuType, int i, Inventory inventory, diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeInventoryScreenMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeModeInventoryScreenMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeInventoryScreenMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeModeInventoryScreenMixin.java index dedf3baf..ea8f8263 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeInventoryScreenMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/CreativeModeInventoryScreenMixin.java @@ -19,10 +19,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(CreativeModeInventoryScreen.class) -abstract class CreativeInventoryScreenMixin +abstract class CreativeModeInventoryScreenMixin extends AbstractContainerScreen { - public CreativeInventoryScreenMixin( + public CreativeModeInventoryScreenMixin( CreativeModeInventoryScreen.ItemPickerMenu abstractContainerMenu, Inventory inventory, Component component) { diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSelectionScreenMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSwitcherScreenMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSelectionScreenMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSwitcherScreenMixin.java index eeaf0ffe..4fd27f80 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSelectionScreenMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/mixin/GameModeSwitcherScreenMixin.java @@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GameModeSwitcherScreen.class) -abstract class GameModeSelectionScreenMixin extends Screen { +abstract class GameModeSwitcherScreenMixin extends Screen { @Shadow protected abstract void init(); @@ -69,7 +69,7 @@ abstract class GameModeSelectionScreenMixin extends Screen { () -> Utilities.pickAtRandom(ANDROMEDA$SPECTATOR)); }); - protected GameModeSelectionScreenMixin(Component title) { + protected GameModeSwitcherScreenMixin(Component title) { super(title); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/InGameHudMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/GuiMixin.java similarity index 99% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/InGameHudMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/GuiMixin.java index 7f31f784..e5a20b6a 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/InGameHudMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/name_tooltips/mixin/GuiMixin.java @@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Hud.class) -abstract class InGameHudMixin { +abstract class GuiMixin { @Shadow @Final private Minecraft minecraft; diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeIconMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeIconMixin.java index 40cd74db..af141efb 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeIconMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(GameModeSwitcherScreen.GameModeIcon.class) -abstract class GameModeSelectionMixin { +abstract class GameModeIconMixin { @ModifyExpressionValue( method = "getNext", at = diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionScreenMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSwitcherScreenMixin.java similarity index 93% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionScreenMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSwitcherScreenMixin.java index be971526..650cd3ea 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSelectionScreenMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/no_more_adventure/mixin/GameModeSwitcherScreenMixin.java @@ -11,8 +11,8 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @Mixin(GameModeSwitcherScreen.class) -abstract class GameModeSelectionScreenMixin extends Screen { - protected GameModeSelectionScreenMixin(Component title) { +abstract class GameModeSwitcherScreenMixin extends Screen { + protected GameModeSwitcherScreenMixin(Component title) { super(title); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/DrawContextMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/GuiGraphicsExtractorMixin.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/DrawContextMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/GuiGraphicsExtractorMixin.java index 329cc90c..601fd6b8 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/DrawContextMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/smooth_tooltips/mixin/GuiGraphicsExtractorMixin.java @@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GuiGraphicsExtractor.class) -abstract class DrawContextMixin { +abstract class GuiGraphicsExtractorMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerMixin.java similarity index 91% rename from src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerMixin.java index e4ef8347..86538f19 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/mixin/PlayerMixin.java @@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(Player.class) -abstract class PlayerEntityMixin extends LivingEntity { +abstract class PlayerMixin extends LivingEntity { - protected PlayerEntityMixin(EntityType entityType, Level level) { + protected PlayerMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilScreenHandlerMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilMenuMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilScreenHandlerMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilMenuMixin.java index 24e8acb7..03941bb2 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilScreenHandlerMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/mending_tweaks/mixin/AnvilMenuMixin.java @@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(AnvilMenu.class) -abstract class AnvilScreenHandlerMixin extends ItemCombinerMenu { +abstract class AnvilMenuMixin extends ItemCombinerMenu { - public AnvilScreenHandlerMixin( + public AnvilMenuMixin( @Nullable MenuType menuType, int i, Inventory inventory, diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/ItemDispenserBehaviorMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/MinecartDispenseItemBehaviorMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/ItemDispenserBehaviorMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/MinecartDispenseItemBehaviorMixin.java index f525114c..17820063 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/ItemDispenserBehaviorMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/minecart_block_picking/mixin/MinecartDispenseItemBehaviorMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(MinecartDispenseItemBehavior.class) -abstract class ItemDispenserBehaviorMixin { +abstract class MinecartDispenseItemBehaviorMixin { @Inject( at = diff --git a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheLoaderMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheLoaderMixin.java index f7a67f24..11a3889c 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/dragon_fight/mixin/SpikeCacheLoaderMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(targets = "net.minecraft.world.level.levelgen.feature.EndSpikeFeature$SpikeCacheLoader") -abstract class SpikeCacheMixin { +abstract class SpikeCacheLoaderMixin { @ModifyExpressionValue( method = "load(Ljava/lang/Long;)Ljava/util/List;", diff --git a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartMixin.java index 67b70a47..571dc85a 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/AbstractMinecartMixin.java @@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(AbstractMinecart.class) -public abstract class AbstractMinecartEntityMixin extends Entity implements LinkableMinecart { +public abstract class AbstractMinecartMixin extends Entity implements LinkableMinecart { @Unique private double lastMovementLength = 0.0D; // Movement length on previous tick @@ -37,7 +37,7 @@ public abstract class AbstractMinecartEntityMixin extends Entity implements Link @Unique private ItemStack linkart$itemStack = ItemStack.EMPTY; - public AbstractMinecartEntityMixin(EntityType type, Level level) { + public AbstractMinecartMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerMixin.java index 37d62991..fea4bbe0 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/linkart/mixin/PlayerMixin.java @@ -22,9 +22,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Player.class) -public abstract class PlayerEntityMixin extends LivingEntity { +public abstract class PlayerMixin extends LivingEntity { - protected PlayerEntityMixin(EntityType entityType, Level level) { + protected PlayerMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/InstrumentItemMixin.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/InstrumentItemMixin.java index c51cf1d3..08e7a752 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/GoatHornMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/trading_goat_horn/mixin/InstrumentItemMixin.java @@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(InstrumentItem.class) -abstract class GoatHornMixin { +abstract class InstrumentItemMixin { @Inject( at = diff --git a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerMixin.java similarity index 94% rename from src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerMixin.java index 982678e7..512e280b 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/mechanics/villager_gifting/mixin/VillagerMixin.java @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Villager.class) -abstract class VillagerEntityMixin extends AbstractVillager { +abstract class VillagerMixin extends AbstractVillager { @Shadow @Final @@ -33,7 +33,7 @@ abstract class VillagerEntityMixin extends AbstractVillager { @Shadow protected abstract void setUnhappy(); - public VillagerEntityMixin(EntityType entityType, Level level) { + public VillagerMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerMixin.java similarity index 93% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerMixin.java index 57748525..ac3fc84d 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/minor_inconvenience/mixin/PlayerMixin.java @@ -18,12 +18,12 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Player.class) -abstract class PlayerEntityMixin extends LivingEntity { +abstract class PlayerMixin extends LivingEntity { @Unique private static final ResourceKey AGONY = Andromeda.key(Registries.DAMAGE_TYPE, "agony"); - protected PlayerEntityMixin(EntityType entityType, Level level) { + protected PlayerMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerManagerMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerListMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerManagerMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerListMixin.java index 18908600..480d71f2 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerManagerMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/recipe_advancements_generation/mixin/PlayerListMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerList.class) -abstract class PlayerManagerMixin { +abstract class PlayerListMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerScreenHandlerMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/InventoryMenuMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerScreenHandlerMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/InventoryMenuMixin.java index aca4516f..d1d6f5ce 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerScreenHandlerMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/InventoryMenuMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(InventoryMenu.class) -abstract class PlayerScreenHandlerMixin { +abstract class InventoryMenuMixin { @Redirect( at = diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerMixin.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerMixin.java index 4fb6c25d..422b8aaf 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/tiny_storage/mixin/PlayerMixin.java @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Player.class) -abstract class PlayerEntityMixin { +abstract class PlayerMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftClientMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftClientMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftMixin.java index c84b190a..68856c1d 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftClientMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/MinecraftMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Minecraft.class) -abstract class MinecraftClientMixin { +abstract class MinecraftMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerImplMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerImplMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerMixin.java index ca0f712a..da53491b 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerImplMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/mixin/ReloadableResourceManagerMixin.java @@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ReloadableResourceManager.class) -abstract class ReloadableResourceManagerImplMixin { +abstract class ReloadableResourceManagerMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugHudMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugScreenOverlayMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugHudMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugScreenOverlayMixin.java index 9a5a4e1f..a5cfae57 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugHudMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/useless_info/DebugScreenOverlayMixin.java @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @MixinEnvironment(CEnvType.CLIENT) @Mixin(DebugScreenOverlay.class) -abstract class DebugHudMixin { +abstract class DebugScreenOverlayMixin { @Shadow @Final diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerMixin.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerMixin.java index fb72542d..79bc9bc7 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/unknown/mixin/wakeup/PlayerMixin.java @@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Player.class) -abstract class PlayerEntityMixin { +abstract class PlayerMixin { @Inject(at = @At("HEAD"), method = "stopSleepInBed(ZZ)V") private void andromeda$wakeUp(boolean forcefulWakeUp, boolean updateLevelList, CallbackInfo ci) { diff --git a/src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerWorldMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerLevelMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerWorldMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerLevelMixin.java index 384c4513..2e97e1f8 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerWorldMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/world/crop_temperature/mixin/ServerLevelMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(ServerLevel.class) -abstract class ServerWorldMixin { +abstract class ServerLevelMixin { @WrapWithCondition( at = diff --git a/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/AbstractArrowMixin.java similarity index 90% rename from src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/AbstractArrowMixin.java index 5a4073da..d59c1dd4 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/AbstractArrowMixin.java @@ -18,9 +18,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(AbstractArrow.class) -abstract class PersistentProjectileEntityMixin extends Projectile { +abstract class AbstractArrowMixin extends Projectile { - public PersistentProjectileEntityMixin(EntityType entityType, Level level) { + public AbstractArrowMixin(EntityType entityType, Level level) { super(entityType, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockEntityMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockEntityMixin.java index 09b7d656..8dd86c58 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/world/falling_beenests/mixin/FallingBlockEntityMixin.java @@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(FallingBlockEntity.class) -abstract class FallingBlockMixin extends Entity { +abstract class FallingBlockEntityMixin extends Entity { @Shadow @Nullable public CompoundTag blockData; @@ -44,7 +44,7 @@ abstract class FallingBlockMixin extends Entity { @Shadow private BlockState blockState; - public FallingBlockMixin(EntityType type, Level level) { + public FallingBlockEntityMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandBlockMixin.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandBlockMixin.java index 7f527ef2..6a095964 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/world/moist_control/mixin/FarmlandBlockMixin.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(FarmlandBlock.class) -abstract class FarmlandMixin { +abstract class FarmlandBlockMixin { @Inject(at = @At("HEAD"), method = "isNearWater") private static void andromeda$prepareRule( diff --git a/src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/AbstractFireBlockMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/FireBlockMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/AbstractFireBlockMixin.java rename to src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/FireBlockMixin.java index 3a29405d..a24959f5 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/AbstractFireBlockMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/world/quick_fire/mixin/FireBlockMixin.java @@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(FireBlock.class) -abstract class AbstractFireBlockMixin extends BaseFireBlock { +abstract class FireBlockMixin extends BaseFireBlock { @Shadow protected abstract void checkBurnOut( @@ -27,7 +27,7 @@ abstract class AbstractFireBlockMixin extends BaseFireBlock { @Unique private static final ThreadLocal LOCAL = ThreadLocal.withInitial(() -> Boolean.FALSE); - public AbstractFireBlockMixin(Properties settings, float damage) { + public FireBlockMixin(Properties settings, float damage) { super(settings, damage); } -- 2.51.2