From a5476775977f4b7e43c2cacfa1879115229e73f2 Mon Sep 17 00:00:00 2001
From: FX - PR0CESS <fx.e.morin@gmail.com>
Date: Tue, 25 Jan 2022 21:32:01 -0500
Subject: [PATCH] Migrate Carpet Mixin names to mojang mappings

---
 .../java/carpet/logging/HUDController.java    |   1 -
 ...tityMixin.java => AbstractArrowMixin.java} |   4 +-
 ...n.java => AbstractArrow_extremeMixin.java} |   2 +-
 ...ContainerMenuSubclasses_scarpetMixin.java} |   4 +-
 ...ractContainerMenu_ctrlQCraftingMixin.java} |   5 +-
 ...> AbstractContainerMenu_scarpetMixin.java} |   2 +-
 ...ctContainerMenu_stackableSBoxesMixin.java} |   2 +-
 ...ava => ArmorStand_scarpetMarkerMixin.java} |   4 +-
 ...ureMixin.java => BastionFeatureMixin.java} |   8 +-
 ...java => BlazeAttackGoal_extremeMixin.java} |   2 +-
 ...remeMixin.java => Blaze_extremeMixin.java} |   2 +-
 ....java => BlockInput_fillUpdatesMixin.java} |   2 +-
 ...ixin.java => BlockInput_scarpetMixin.java} |   2 +-
 ...ionStorage_scarpetChunkCreationMixin.java} |   6 +-
 ....java => BlockPredicate_scarpetMixin.java} |   2 +-
 ...=> BoundTickingBlockEntity_tickMixin.java} |   2 +-
 ...in.java => ChunkAccess_warningsMixin.java} |   2 +-
 ...> ChunkMap_scarpetChunkCreationMixin.java} |   2 +-
 ...tickMixin.java => ChunkMap_tickMixin.java} |   2 +-
 ...entPacketListener_customPacketsMixin.java} |   2 +-
 ...ava => ClientboundTabListPacketMixin.java} |   2 +-
 ...va => CloneCommands_fillUpdatesMixin.java} |   2 +-
 ...java => Commands_customCommandsMixin.java} |   2 +-
 ...ava => Connection_packetCounterMixin.java} |   2 +-
 ...ixin.java => Containers_extremeMixin.java} |   2 +-
 ...=> CoralFanBlock_renewableCoralMixin.java} | 164 ++++-----
 ... => CoralFeature_renewableCoralMixin.java} |   2 +-
 ... CoralPlantBlock_renewableCoralMixin.java} |   2 +-
 ...eItemBehavior_extremeBehavioursMixin.java} |   2 +-
 ...nceManager_scarpetChunkCreationMixin.java} |   2 +-
 ...java => DistanceManager_scarpetMixin.java} |   2 +-
 ... => DistanceManager_spawnChunksMixin.java} |   2 +-
 ...in.java => DistanceManager_tickMixin.java} |   4 +-
 ...aphMinFixedPoint_resetChunkInterface.java} |   2 +-
 ...a => ExperienceOrb_xpNoCooldownMixin.java} |   4 +-
 ....java => Explosion_optimizedTntMixin.java} |   2 +-
 .../mixins/Explosion_scarpetEventMixin.java   |   2 -
 ...=> FireworkRocketEntity_extremeMixin.java} |   2 +-
 ...xin.java => FishingHook_extremeMixin.java} |   2 +-
 ...a => FlatLevelSource_structuresMixin.java} |   5 +-
 ...owingFluid_liquidDamageDisabledMixin.java} |   2 +-
 ...va => Guardian_renewableSpongesMixin.java} |   4 +-
 ...ameHudMixin.java => Gui_tablistMixin.java} |   2 +-
 ...va => HopperBlockEntity_counterMixin.java} |   4 +-
 ...ntityMixin.java => Husk_templesMixin.java} |   2 +-
 ...in.java => InfestedBlock_gravelMixin.java} |   4 +-
 ....java => Inventory_scarpetEventMixin.java} |   2 +-
 .../java/carpet/mixins/ItemEntityMixin.java   |   2 +-
 ...ightEngine_scarpetChunkCreationMixin.java} |   2 +-
 ...ionStorage_scarpetChunkCreationMixin.java} |   2 +-
 ....java => LevelChunk_fillUpdatesMixin.java} |   2 +-
 ...in.java => LevelChunk_movableBEMixin.java} |   4 +-
 ...evelEntityGetterAdapter_scarpetMixin.java} |   2 +-
 ...ightEngine_scarpetChunkCreationMixin.java} |   2 +-
 ...=> LevelRenderer_creativeNoClipMixin.java} |   2 +-
 ...in.java => LevelRenderer_fogOffMixin.java} |   2 +-
 ...va => LevelRenderer_pausedShakeMixin.java} |   2 +-
 ... => LevelRenderer_scarpetRenderMixin.java} |   2 +-
 ...Mixin.java => Level_fillUpdatesMixin.java} |   2 +-
 ...ava => Level_getOtherEntitiesLimited.java} |   2 +-
 ...TEMixin.java => Level_movableBEMixin.java} |   2 +-
 ...Mixin.java => Level_scarpetPlopMixin.java} |   2 +-
 ...ld_tickMixin.java => Level_tickMixin.java} |   2 +-
 ...Level_updateSuppressionCrashFixMixin.java} |   2 +-
 ...LiquidBlock_renewableBlackstoneMixin.java} |   2 +-
 ... LiquidBlock_renewableDeepslateMixin.java} |   2 +-
 ....java => LivingEntity_cleanLogsMixin.java} |   4 +-
 ...va => LocalPlayer_clientCommandMixin.java} |   2 +-
 ...MerchantResultSlot_scarpetEventMixin.java} |   6 +-
 ...ftClientMixin.java => MinecraftMixin.java} |   2 +-
 ...n.java => Minecraft_pausedShakeMixin.java} |   2 +-
 ...Mixin.java => MobCategory_spawnMixin.java} |   2 +-
 .../{MobEntityMixin.java => MobMixin.java}    |   2 +-
 ...xtremeMixin.java => Mob_extremeMixin.java} |   2 +-
 ...perMixin.java => NaturalSpawnerMixin.java} |   2 +-
 ...eBasedChunkGenerator_husksSpawnMixin.java} |   6 +-
 ...in.java => NoiseSampler_scarpetMixin.java} |   6 +-
 ...Mixin.java => Objective_scarpetMixin.java} |   2 +-
 ...a => PathNavigation_pathfindingMixin.java} |   2 +-
 ...entEntitySectionManager_scarpetMixin.java} |   2 +-
 .../mixins/PickaxeItem_missingToolsMixin.java |   2 -
 ... => PieceGeneratorSupplier_plopMixin.java} |   2 +-
 ...va => PistonBaseBlock_movableBEMixin.java} |   4 +-
 ...ixin.java => PistonBaseBlock_qcMixin.java} |   2 +-
 ...=> PistonBaseBlock_rotatorBlockMixin.java} |   2 +-
 ...=> PistonHeadRenderer_movableBEMixin.java} |   2 +-
 ...stonMovingBlockEntity_movableBEMixin.java} |   5 +-
 ...ovingBlockEntity_playerHandlingMixin.java} |  11 +-
 ...reMixin.java => PlayerList_coreMixin.java} |   6 +-
 ....java => PlayerList_fakePlayersMixin.java} |   2 +-
 ...ava => PlayerList_scarpetEventsMixin.java} |   2 +-
 ...dMixin.java => PlayerTabOverlayMixin.java} |   2 +-
 ...ixin.java => PlayerTeam_scarpetMixin.java} |   2 +-
 ...ava => Player_antiCheatDisabledMixin.java} |   2 +-
 ...n.java => Player_creativeNoClipMixin.java} |   4 +-
 ...ixin.java => Player_fakePlayersMixin.java} |   2 +-
 ...rrotMixin.java => Player_parrotMixin.java} |   4 +-
 ...ixin.java => Player_portalDelayMixin.java} |   2 +-
 ...in.java => Player_scarpetEventsMixin.java} |   4 +-
 ...xin.java => Player_xpNoCooldownMixin.java} |   2 +-
 ...Mixin.java => PoiRecord_scarpetMixin.java} |   2 +-
 ...ntEntityMixin.java => PrimedTntMixin.java} |   4 +-
 ...zedSpaghettiRarityMixin_scarpetMixin.java} |   2 +-
 ....java => RecipeBookMenu_scarpetMixin.java} |   2 +-
 ....java => RedstoneWireBlock_fastMixin.java} |   5 +-
 ...va => SaplingBlock_desertShrubsMixin.java} |   2 +-
 ...rMixin.java => ServerChunkCacheMixin.java} |   2 +-
 ...n.java => ServerChunkCache_tickMixin.java} |   2 +-
 ...n.java => ServerEntity_leashFixMixin.java} |   2 +-
 ...a => ServerFunctionManager_tickMixin.java} |   2 +-
 ...=> ServerGamePacketListenerImplMixin.java} |   2 +-
 ...tListenerImpl_antiCheatDisabledMixin.java} |   2 +-
 ...rverGamePacketListenerImpl_coreMixin.java} |   2 +-
 ...ListenerImpl_interactionUpdatesMixin.java} |   2 +-
 ...acketListenerImpl_scarpetEventsMixin.java} |   4 +-
 ...rverGamePacketListenerImpl_tickMixin.java} |   2 +-
 ...xin.java => ServerLevel_scarpetMixin.java} |   5 +-
 ...java => ServerLevel_spawnChunksMixin.java} |   2 +-
 ...kMixin.java => ServerLevel_tickMixin.java} |   4 +-
 ... ServerPlayerGameMode_antiCheatMixin.java} |   2 +-
 ... => ServerPlayerGameMode_cactusMixin.java} |   2 +-
 ...verPlayerGameMode_scarpetEventsMixin.java} |   2 +-
 ...ntityMixin.java => ServerPlayerMixin.java} |   2 +-
 ...va => ServerPlayer_scarpetEventMixin.java} |   4 +-
 ...layer_updateSuppressionCrashFixMixin.java} |   4 +-
 ...Mixin.java => ServerStatus_motdMixin.java} |   2 +-
 ...> ServerboundPlayerActionPacketMixin.java} |   2 +-
 ...verboundSetStructureBlockPacketMixin.java} |   4 +-
 ... => SetBlockCommand_fillUpdatesMixin.java} |   2 +-
 ...ava => SkeletonTrapGoal_extremeMixin.java} |   2 +-
 ...ionStorage_scarpetChunkCreationMixin.java} |   6 +-
 ...n.java => SoundEngine_cleanLogsMixin.java} |   6 +-
 ...erInnerMixin.java => SpawnStateMixin.java} |   7 +-
 ...AndWallBlockItem_creativeNoClipMixin.java} |   2 +-
 ...tructureBlockEntity_fillUpdatesMixin.java} |   2 +-
 ... => StructureBlockEntity_limitsMixin.java} |   4 +-
 ...java => StructureBlockRenderer_mixin.java} |   2 +-
 ...> StructureTemplate_fillUpdatesMixin.java} |   2 +-
 ...java => SummonCommand_lightningMixin.java} |   2 +-
 ... => SystemReport_addScarpetAppsMixin.java} |   2 +-
 ...tewayBlockEntity_creativeNoClipMixin.java} |   2 +-
 ...ightEngine_scarpetChunkCreationMixin.java} |   4 +-
 ...hreadedLevelLightEngine_scarpetMixin.java} |   4 +-
 ...xin.java => ThrowableProjectileMixin.java} |   4 +-
 ...edMixin.java => Timer_tickSpeedMixin.java} |   2 +-
 ...Mixin.java => TntBlock_noUpdateMixin.java} |   2 +-
 ...xin.java => UseOnContext_cactusMixin.java} |   2 +-
 ...ity_aiMixin.java => Villager_aiMixin.java} |   4 +-
 ...ixin.java => WitherBoss_extremeMixin.java} |   2 +-
 ...n.java => WoolCarpetBlock_placeMixin.java} |   4 +-
 ...a => WorldGenRegion_scarpetPlopMixin.java} |   2 +-
 .../java/carpet/script/api/Scoreboards.java   |  11 +-
 .../java/carpet/script/api/WorldAccess.java   |  10 +-
 src/main/resources/carpet.mixins.json         | 324 ++++++++----------
 154 files changed, 422 insertions(+), 501 deletions(-)
 rename src/main/java/carpet/mixins/{ProjectileEntityMixin.java => AbstractArrowMixin.java} (92%)
 rename src/main/java/carpet/mixins/{ProjectileEntity_extremeMixin.java => AbstractArrow_extremeMixin.java} (93%)
 rename src/main/java/carpet/mixins/{ScreenHandlerSubclasses_scarpetMixin.java => AbstractContainerMenuSubclasses_scarpetMixin.java} (85%)
 rename src/main/java/carpet/mixins/{ContainerMixin.java => AbstractContainerMenu_ctrlQCraftingMixin.java} (91%)
 rename src/main/java/carpet/mixins/{ScreenHandler_scarpetMixin.java => AbstractContainerMenu_scarpetMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ScreenHandler_stackableSBoxesMixin.java => AbstractContainerMenu_stackableSBoxesMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ArmorStandEntity_scarpetMarkerMixin.java => ArmorStand_scarpetMarkerMixin.java} (89%)
 rename src/main/java/carpet/mixins/{BastionRemnantFeatureMixin.java => BastionFeatureMixin.java} (78%)
 rename src/main/java/carpet/mixins/{BlazeEntityShootFireballGoal_extremeMixin.java => BlazeAttackGoal_extremeMixin.java} (91%)
 rename src/main/java/carpet/mixins/{BlazeEntity_extremeMixin.java => Blaze_extremeMixin.java} (93%)
 rename src/main/java/carpet/mixins/{BlockStateArgument_fillUpdatesMixin.java => BlockInput_fillUpdatesMixin.java} (95%)
 rename src/main/java/carpet/mixins/{BlockStateArgument_scarpetMixin.java => BlockInput_scarpetMixin.java} (85%)
 rename src/main/java/carpet/mixins/{BlockLightStorage_scarpetChunkCreationMixin.java => BlockLightSectionStorage_scarpetChunkCreationMixin.java} (83%)
 rename src/main/java/carpet/mixins/{StatePredicate_scarpetMixin.java => BlockPredicate_scarpetMixin.java} (95%)
 rename src/main/java/carpet/mixins/{WorldChunkBEList_tickMixin.java => BoundTickingBlockEntity_tickMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ChunkMixin.java => ChunkAccess_warningsMixin.java} (93%)
 rename src/main/java/carpet/mixins/{ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java => ChunkMap_scarpetChunkCreationMixin.java} (99%)
 rename src/main/java/carpet/mixins/{ThreadedAnvilChunkStorage_tickMixin.java => ChunkMap_tickMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ClientPlayNetworkHandlerMixin.java => ClientPacketListener_customPacketsMixin.java} (95%)
 rename src/main/java/carpet/mixins/{PlayerListHeaderS2CPacketMixin.java => ClientboundTabListPacketMixin.java} (89%)
 rename src/main/java/carpet/mixins/{CloneCommandMixin.java => CloneCommands_fillUpdatesMixin.java} (95%)
 rename src/main/java/carpet/mixins/{CommandManagerMixin.java => Commands_customCommandsMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ClientConnectionMixin.java => Connection_packetCounterMixin.java} (94%)
 rename src/main/java/carpet/mixins/{ItemScatterer_extremeMixin.java => Containers_extremeMixin.java} (94%)
 rename src/main/java/carpet/mixins/{CoralFanBlockMixin.java => CoralFanBlock_renewableCoralMixin.java} (95%)
 rename src/main/java/carpet/mixins/{CoralFeatureMixin.java => CoralFeature_renewableCoralMixin.java} (89%)
 rename src/main/java/carpet/mixins/{CoralBlockMixin.java => CoralPlantBlock_renewableCoralMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ItemDispenserBehaviour_extremeBehavioursMixin.java => DefaultDispenseItemBehavior_extremeBehavioursMixin.java} (90%)
 rename src/main/java/carpet/mixins/{ChunkTicketManager_scarpetChunkCreationMixin.java => DistanceManager_scarpetChunkCreationMixin.java} (85%)
 rename src/main/java/carpet/mixins/{ChunkTicketManager_scarpetMixin.java => DistanceManager_scarpetMixin.java} (87%)
 rename src/main/java/carpet/mixins/{ChunkTicketManager_spawnChunksMixin.java => DistanceManager_spawnChunksMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ChunkTicketManager_tickMixin.java => DistanceManager_tickMixin.java} (85%)
 rename src/main/java/carpet/mixins/{LevelPropagator_resetChunkInterface.java => DynamicGraphMinFixedPoint_resetChunkInterface.java} (87%)
 rename src/main/java/carpet/mixins/{ExperienceOrbEntityMixin.java => ExperienceOrb_xpNoCooldownMixin.java} (90%)
 rename src/main/java/carpet/mixins/{ExplosionMixin.java => Explosion_optimizedTntMixin.java} (98%)
 rename src/main/java/carpet/mixins/{FireworkEntity_extremeMixin.java => FireworkRocketEntity_extremeMixin.java} (93%)
 rename src/main/java/carpet/mixins/{FishingBobberEntity_extremeMixin.java => FishingHook_extremeMixin.java} (93%)
 rename src/main/java/carpet/mixins/{FlatChunkGeneratorMixin.java => FlatLevelSource_structuresMixin.java} (94%)
 rename src/main/java/carpet/mixins/{FlowableFluid_liquidDamageDisabledMixin.java => FlowingFluid_liquidDamageDisabledMixin.java} (95%)
 rename src/main/java/carpet/mixins/{GuardianEntityMixin.java => Guardian_renewableSpongesMixin.java} (91%)
 rename src/main/java/carpet/mixins/{InGameHudMixin.java => Gui_tablistMixin.java} (95%)
 rename src/main/java/carpet/mixins/{HopperBlockEntityMixin.java => HopperBlockEntity_counterMixin.java} (91%)
 rename src/main/java/carpet/mixins/{HuskEntityMixin.java => Husk_templesMixin.java} (96%)
 rename src/main/java/carpet/mixins/{InfestedBlockMixin.java => InfestedBlock_gravelMixin.java} (89%)
 rename src/main/java/carpet/mixins/{PlayerInventory_scarpetEventMixin.java => Inventory_scarpetEventMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ChunkLightProvider_scarpetChunkCreationMixin.java => LayerLightEngine_scarpetChunkCreationMixin.java} (87%)
 rename src/main/java/carpet/mixins/{LightStorage_scarpetChunkCreationMixin.java => LayerLightSectionStorage_scarpetChunkCreationMixin.java} (97%)
 rename src/main/java/carpet/mixins/{WorldChunk_fillUpdatesMixin.java => LevelChunk_fillUpdatesMixin.java} (97%)
 rename src/main/java/carpet/mixins/{WorldChunk_movableTEMixin.java => LevelChunk_movableBEMixin.java} (98%)
 rename src/main/java/carpet/mixins/{SimpleEntityLookup_scarpetMixin.java => LevelEntityGetterAdapter_scarpetMixin.java} (88%)
 rename src/main/java/carpet/mixins/{LightingProvider_scarpetChunkCreationMixin.java => LevelLightEngine_scarpetChunkCreationMixin.java} (94%)
 rename src/main/java/carpet/mixins/{WorldRenderer_creativeNoClipMixin.java => LevelRenderer_creativeNoClipMixin.java} (93%)
 rename src/main/java/carpet/mixins/{WorldRenderer_fogOffMixin.java => LevelRenderer_fogOffMixin.java} (95%)
 rename src/main/java/carpet/mixins/{WorldRenderer_pausedShakeMixin.java => LevelRenderer_pausedShakeMixin.java} (97%)
 rename src/main/java/carpet/mixins/{WorldRenderer_scarpetRenderMixin.java => LevelRenderer_scarpetRenderMixin.java} (98%)
 rename src/main/java/carpet/mixins/{World_fillUpdatesMixin.java => Level_fillUpdatesMixin.java} (96%)
 rename src/main/java/carpet/mixins/{World_getOtherEntitiesLimited.java => Level_getOtherEntitiesLimited.java} (97%)
 rename src/main/java/carpet/mixins/{World_movableTEMixin.java => Level_movableBEMixin.java} (98%)
 rename src/main/java/carpet/mixins/{World_scarpetPlopMixin.java => Level_scarpetPlopMixin.java} (96%)
 rename src/main/java/carpet/mixins/{World_tickMixin.java => Level_tickMixin.java} (98%)
 rename src/main/java/carpet/mixins/{World_updateSuppressionCrashFixMixin.java => Level_updateSuppressionCrashFixMixin.java} (96%)
 rename src/main/java/carpet/mixins/{FluidBlock_renewableBlackstoneMixin.java => LiquidBlock_renewableBlackstoneMixin.java} (96%)
 rename src/main/java/carpet/mixins/{FluidBlock_renewableDeepslateMixin.java => LiquidBlock_renewableDeepslateMixin.java} (95%)
 rename src/main/java/carpet/mixins/{LivingEntityMixin.java => LivingEntity_cleanLogsMixin.java} (85%)
 rename src/main/java/carpet/mixins/{ClientPlayerEntity_clientCommandMixin.java => LocalPlayer_clientCommandMixin.java} (96%)
 rename src/main/java/carpet/mixins/{TradeOutputSlot_scarpetEventMixin.java => MerchantResultSlot_scarpetEventMixin.java} (83%)
 rename src/main/java/carpet/mixins/{MinecraftClientMixin.java => MinecraftMixin.java} (97%)
 rename src/main/java/carpet/mixins/{MinecraftClient_pausedShakeMixin.java => Minecraft_pausedShakeMixin.java} (81%)
 rename src/main/java/carpet/mixins/{SpawnGroup_spawnMixin.java => MobCategory_spawnMixin.java} (92%)
 rename src/main/java/carpet/mixins/{MobEntityMixin.java => MobMixin.java} (93%)
 rename src/main/java/carpet/mixins/{MobEntity_extremeMixin.java => Mob_extremeMixin.java} (93%)
 rename src/main/java/carpet/mixins/{SpawnHelperMixin.java => NaturalSpawnerMixin.java} (99%)
 rename src/main/java/carpet/mixins/{NoiseChunkGenerator_husksSpawnMixin.java => NoiseBasedChunkGenerator_husksSpawnMixin.java} (90%)
 rename src/main/java/carpet/mixins/{NoiseColumnSamplerMixin_scarpetMixin.java => NoiseSampler_scarpetMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ScoreboardObjective_scarpetMixin.java => Objective_scarpetMixin.java} (87%)
 rename src/main/java/carpet/mixins/{EntityNavigation_pathfindingMixin.java => PathNavigation_pathfindingMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ServerEntityManager_scarpetMixin.java => PersistentEntitySectionManager_scarpetMixin.java} (96%)
 rename src/main/java/carpet/mixins/{StructureGeneratorFactory_plopMixin.java => PieceGeneratorSupplier_plopMixin.java} (93%)
 rename src/main/java/carpet/mixins/{PistonBlock_movableTEMixin.java => PistonBaseBlock_movableBEMixin.java} (97%)
 rename src/main/java/carpet/mixins/{PistonBlock_qcMixin.java => PistonBaseBlock_qcMixin.java} (96%)
 rename src/main/java/carpet/mixins/{PistonBlock_rotatorBlockMixin.java => PistonBaseBlock_rotatorBlockMixin.java} (88%)
 rename src/main/java/carpet/mixins/{PistonBlockEntityRenderer_movableTEMixin.java => PistonHeadRenderer_movableBEMixin.java} (96%)
 rename src/main/java/carpet/mixins/{PistonBlockEntity_movableTEMixin.java => PistonMovingBlockEntity_movableBEMixin.java} (95%)
 rename src/main/java/carpet/mixins/{PistonBlockEntity_playerHandlingMixin.java => PistonMovingBlockEntity_playerHandlingMixin.java} (89%)
 rename src/main/java/carpet/mixins/{PlayerManager_coreMixin.java => PlayerList_coreMixin.java} (77%)
 rename src/main/java/carpet/mixins/{PlayerManager_fakePlayersMixin.java => PlayerList_fakePlayersMixin.java} (97%)
 rename src/main/java/carpet/mixins/{PlayerManager_scarpetEventsMixin.java => PlayerList_scarpetEventsMixin.java} (96%)
 rename src/main/java/carpet/mixins/{PlayerListHudMixin.java => PlayerTabOverlayMixin.java} (85%)
 rename src/main/java/carpet/mixins/{Team_scarpetMixin.java => PlayerTeam_scarpetMixin.java} (87%)
 rename src/main/java/carpet/mixins/{PlayerEntity_antiCheatDisabled.java => Player_antiCheatDisabledMixin.java} (96%)
 rename src/main/java/carpet/mixins/{PlayerEntity_creativeNoClipMixin.java => Player_creativeNoClipMixin.java} (90%)
 rename src/main/java/carpet/mixins/{PlayerEntity_fakePlayersMixin.java => Player_fakePlayersMixin.java} (94%)
 rename src/main/java/carpet/mixins/{PlayerEntity_parrotMixin.java => Player_parrotMixin.java} (95%)
 rename src/main/java/carpet/mixins/{PlayerEntityMixin_portalDelayMixin.java => Player_portalDelayMixin.java} (94%)
 rename src/main/java/carpet/mixins/{PlayerEntity_scarpetEventsMixin.java => Player_scarpetEventsMixin.java} (94%)
 rename src/main/java/carpet/mixins/{PlayerEntity_xpNoCooldownMixin.java => Player_xpNoCooldownMixin.java} (93%)
 rename src/main/java/carpet/mixins/{PointOfInterest_scarpetMixin.java => PoiRecord_scarpetMixin.java} (88%)
 rename src/main/java/carpet/mixins/{TntEntityMixin.java => PrimedTntMixin.java} (97%)
 rename src/main/java/carpet/mixins/{CaveScalerMixin_scarpetMixin.java => QuantizedSpaghettiRarityMixin_scarpetMixin.java} (84%)
 rename src/main/java/carpet/mixins/{AbstractRecipeScreenHandler_scarpetMixin.java => RecipeBookMenu_scarpetMixin.java} (93%)
 rename src/main/java/carpet/mixins/{RedstoneWireBlockMixin.java => RedstoneWireBlock_fastMixin.java} (95%)
 rename src/main/java/carpet/mixins/{SaplingBlockMixin.java => SaplingBlock_desertShrubsMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ServerChunkManagerMixin.java => ServerChunkCacheMixin.java} (98%)
 rename src/main/java/carpet/mixins/{ServerChunkManager_tickMixin.java => ServerChunkCache_tickMixin.java} (98%)
 rename src/main/java/carpet/mixins/{EntityTrackerEntry_leashFixMixin.java => ServerEntity_leashFixMixin.java} (96%)
 rename src/main/java/carpet/mixins/{CommandFunctionManager_tickMixin.java => ServerFunctionManager_tickMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandlerMixin.java => ServerGamePacketListenerImplMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandler_antiCheatDisabledMixin.java => ServerGamePacketListenerImpl_antiCheatDisabledMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandler_coreMixin.java => ServerGamePacketListenerImpl_coreMixin.java} (94%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandler_interactionUpdatesMixin.java => ServerGamePacketListenerImpl_interactionUpdatesMixin.java} (98%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandler_scarpetEventsMixin.java => ServerGamePacketListenerImpl_scarpetEventsMixin.java} (98%)
 rename src/main/java/carpet/mixins/{ServerPlayNetworkHandler_tickMixin.java => ServerGamePacketListenerImpl_tickMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ServerWorld_scarpetMixin.java => ServerLevel_scarpetMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ServerWorld_spawnChunksMixin.java => ServerLevel_spawnChunksMixin.java} (92%)
 rename src/main/java/carpet/mixins/{ServerWorld_tickMixin.java => ServerLevel_tickMixin.java} (98%)
 rename src/main/java/carpet/mixins/{ServerPlayerInteractionManager_antiCheatMixin.java => ServerPlayerGameMode_antiCheatMixin.java} (97%)
 rename src/main/java/carpet/mixins/{ServerPlayerInteractionManager_cactusMixin.java => ServerPlayerGameMode_cactusMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ServerPlayerInteractionManager_scarpetEventsMixin.java => ServerPlayerGameMode_scarpetEventsMixin.java} (96%)
 rename src/main/java/carpet/mixins/{ServerPlayerEntityMixin.java => ServerPlayerMixin.java} (94%)
 rename src/main/java/carpet/mixins/{ServerPlayerEntity_scarpetEventMixin.java => ServerPlayer_scarpetEventMixin.java} (95%)
 rename src/main/java/carpet/mixins/{ServerPlayerEntity_updateSuppressionCrashFixMixin.java => ServerPlayer_updateSuppressionCrashFixMixin.java} (90%)
 rename src/main/java/carpet/mixins/{ServerMetadata_motdMixin.java => ServerStatus_motdMixin.java} (95%)
 rename src/main/java/carpet/mixins/{PlayerActionC2SPacketMixin.java => ServerboundPlayerActionPacketMixin.java} (90%)
 rename src/main/java/carpet/mixins/{UpdateStructureBlockC2SPacketMixin.java => ServerboundSetStructureBlockPacketMixin.java} (95%)
 rename src/main/java/carpet/mixins/{SetBlockCommandMixin.java => SetBlockCommand_fillUpdatesMixin.java} (94%)
 rename src/main/java/carpet/mixins/{SkeletonHorseTrapTriggerGoal_extremeMixin.java => SkeletonTrapGoal_extremeMixin.java} (91%)
 rename src/main/java/carpet/mixins/{SkyLightStorage_scarpetChunkCreationMixin.java => SkyLightSectionStorage_scarpetChunkCreationMixin.java} (90%)
 rename src/main/java/carpet/mixins/{SoundSystem_cleanLogsMixin.java => SoundEngine_cleanLogsMixin.java} (71%)
 rename src/main/java/carpet/mixins/{SpawnHelperInnerMixin.java => SpawnStateMixin.java} (77%)
 rename src/main/java/carpet/mixins/{WallStandingBlockItem_creativeNoClipMixin.java => StandingAndWallBlockItem_creativeNoClipMixin.java} (96%)
 rename src/main/java/carpet/mixins/{StructureBlockBlockEntity_fillUpdatesMixin.java => StructureBlockEntity_fillUpdatesMixin.java} (96%)
 rename src/main/java/carpet/mixins/{StructureBlockBlockEntity_limitsMixin.java => StructureBlockEntity_limitsMixin.java} (92%)
 rename src/main/java/carpet/mixins/{StructureBlockBlockEntityRenderer_mixin.java => StructureBlockRenderer_mixin.java} (87%)
 rename src/main/java/carpet/mixins/{Structure_fillUpdatesMixin.java => StructureTemplate_fillUpdatesMixin.java} (97%)
 rename src/main/java/carpet/mixins/{SummonCommandMixin.java => SummonCommand_lightningMixin.java} (97%)
 rename src/main/java/carpet/mixins/{CrashReport_addScarpetAppsMixin.java => SystemReport_addScarpetAppsMixin.java} (94%)
 rename src/main/java/carpet/mixins/{EndGatewayBlockEntity_creativeNoClipMixin.java => TheEndGatewayBlockEntity_creativeNoClipMixin.java} (92%)
 rename src/main/java/carpet/mixins/{ServerLightingProvider_scarpetChunkCreationMixin.java => ThreadedLevelLightEngine_scarpetChunkCreationMixin.java} (90%)
 rename src/main/java/carpet/mixins/{ServerLightingProvider_scarpetMixin.java => ThreadedLevelLightEngine_scarpetMixin.java} (88%)
 rename src/main/java/carpet/mixins/{ThrownEntityMixin.java => ThrowableProjectileMixin.java} (89%)
 rename src/main/java/carpet/mixins/{RenderTickCounter_tickSpeedMixin.java => Timer_tickSpeedMixin.java} (93%)
 rename src/main/java/carpet/mixins/{TntBlockMixin.java => TntBlock_noUpdateMixin.java} (94%)
 rename src/main/java/carpet/mixins/{ItemUsageContext_cactusMixin.java => UseOnContext_cactusMixin.java} (95%)
 rename src/main/java/carpet/mixins/{VillagerEntity_aiMixin.java => Villager_aiMixin.java} (97%)
 rename src/main/java/carpet/mixins/{WitherEntity_extremeMixin.java => WitherBoss_extremeMixin.java} (94%)
 rename src/main/java/carpet/mixins/{CarpetBlockMixin.java => WoolCarpetBlock_placeMixin.java} (87%)
 rename src/main/java/carpet/mixins/{ChunkRegion_scarpetPlopMixin.java => WorldGenRegion_scarpetPlopMixin.java} (93%)

diff --git a/src/main/java/carpet/logging/HUDController.java b/src/main/java/carpet/logging/HUDController.java
index 57006b41..93c303fc 100644
--- a/src/main/java/carpet/logging/HUDController.java
+++ b/src/main/java/carpet/logging/HUDController.java
@@ -4,7 +4,6 @@ import carpet.CarpetServer;
 import carpet.helpers.HopperCounter;
 import carpet.helpers.TickSpeed;
 import carpet.logging.logHelpers.PacketCounter;
-import carpet.mixins.PlayerListHeaderS2CPacketMixin;
 import carpet.utils.Messenger;
 import carpet.utils.SpawnReporter;
 import io.netty.buffer.Unpooled;
diff --git a/src/main/java/carpet/mixins/ProjectileEntityMixin.java b/src/main/java/carpet/mixins/AbstractArrowMixin.java
similarity index 92%
rename from src/main/java/carpet/mixins/ProjectileEntityMixin.java
rename to src/main/java/carpet/mixins/AbstractArrowMixin.java
index e375524d..2be15272 100644
--- a/src/main/java/carpet/mixins/ProjectileEntityMixin.java
+++ b/src/main/java/carpet/mixins/AbstractArrowMixin.java
@@ -15,10 +15,10 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AbstractArrow.class)
-public abstract class ProjectileEntityMixin extends Entity
+public abstract class AbstractArrowMixin extends Entity
 {
     private TrajectoryLogHelper logHelper;
-    public ProjectileEntityMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
+    public AbstractArrowMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
 
     @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN"))
     private void addLogger(EntityType<? extends Projectile> entityType_1, Level world_1, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java b/src/main/java/carpet/mixins/AbstractArrow_extremeMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/AbstractArrow_extremeMixin.java
index 287ee2cc..85dc7ed8 100644
--- a/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/AbstractArrow_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 
 @Mixin(AbstractArrow.class)
-public class ProjectileEntity_extremeMixin
+public class AbstractArrow_extremeMixin
 {
     // calculates damage
     @Redirect(method = "setEnchantmentEffectsFromEntity", expect = 1, at = @At(
diff --git a/src/main/java/carpet/mixins/ScreenHandlerSubclasses_scarpetMixin.java b/src/main/java/carpet/mixins/AbstractContainerMenuSubclasses_scarpetMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/ScreenHandlerSubclasses_scarpetMixin.java
rename to src/main/java/carpet/mixins/AbstractContainerMenuSubclasses_scarpetMixin.java
index 81c21334..c164a227 100644
--- a/src/main/java/carpet/mixins/ScreenHandlerSubclasses_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/AbstractContainerMenuSubclasses_scarpetMixin.java
@@ -16,8 +16,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 //classes that override onButtonClick
 @Mixin({EnchantmentMenu.class, LecternMenu.class, LoomMenu.class, StonecutterMenu.class})
-public abstract class ScreenHandlerSubclasses_scarpetMixin extends AbstractContainerMenu {
-    protected ScreenHandlerSubclasses_scarpetMixin(MenuType<?> type, int syncId) {
+public abstract class AbstractContainerMenuSubclasses_scarpetMixin extends AbstractContainerMenu {
+    protected AbstractContainerMenuSubclasses_scarpetMixin(MenuType<?> type, int syncId) {
         super(type, syncId);
     }
 
diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java
similarity index 91%
rename from src/main/java/carpet/mixins/ContainerMixin.java
rename to src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java
index 29a9a002..49620f21 100644
--- a/src/main/java/carpet/mixins/ContainerMixin.java
+++ b/src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java
@@ -7,9 +7,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.List;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -19,7 +17,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
 @Mixin(AbstractContainerMenu.class)
-public abstract class ContainerMixin
+public abstract class AbstractContainerMenu_ctrlQCraftingMixin
 {
 
     @Shadow public abstract void clicked(int int_1, int int_2, ClickType slotActionType_1, Player playerEntity_1);
@@ -37,7 +35,6 @@ public abstract class ContainerMixin
     {
         if (actionType == ClickType.THROW && CarpetSettings.ctrlQCraftingFix && this.getCarried().isEmpty() && slotId >= 0)
         {
-            ItemStack itemStack_1 = ItemStack.EMPTY;
             Slot slot_4 = slots.get(slotId);
             if (/*slot_4 != null && */slot_4.hasItem() && slot_4.mayPickup(playerEntity))
             {
diff --git a/src/main/java/carpet/mixins/ScreenHandler_scarpetMixin.java b/src/main/java/carpet/mixins/AbstractContainerMenu_scarpetMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/ScreenHandler_scarpetMixin.java
rename to src/main/java/carpet/mixins/AbstractContainerMenu_scarpetMixin.java
index b43d9ae0..3cc06d7b 100644
--- a/src/main/java/carpet/mixins/ScreenHandler_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/AbstractContainerMenu_scarpetMixin.java
@@ -20,7 +20,7 @@ import net.minecraft.world.inventory.DataSlot;
 import net.minecraft.world.item.crafting.Recipe;
 
 @Mixin(AbstractContainerMenu.class)
-public abstract class ScreenHandler_scarpetMixin implements ScreenHandlerInterface
+public abstract class AbstractContainerMenu_scarpetMixin implements ScreenHandlerInterface
 {
     @Shadow @Final private List<ContainerListener> containerListeners;
     @Shadow public abstract void sendAllDataToRemote();
diff --git a/src/main/java/carpet/mixins/ScreenHandler_stackableSBoxesMixin.java b/src/main/java/carpet/mixins/AbstractContainerMenu_stackableSBoxesMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ScreenHandler_stackableSBoxesMixin.java
rename to src/main/java/carpet/mixins/AbstractContainerMenu_stackableSBoxesMixin.java
index 874db190..bb7dea28 100644
--- a/src/main/java/carpet/mixins/ScreenHandler_stackableSBoxesMixin.java
+++ b/src/main/java/carpet/mixins/AbstractContainerMenu_stackableSBoxesMixin.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(AbstractContainerMenu.class)
-public class ScreenHandler_stackableSBoxesMixin
+public class AbstractContainerMenu_stackableSBoxesMixin
 {
     @Redirect(method = "doClick", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java b/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java
rename to src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java
index cdfe9a1e..79359b9b 100644
--- a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java
+++ b/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java
@@ -15,9 +15,9 @@ import net.minecraft.world.entity.decoration.ArmorStand;
 import net.minecraft.world.level.Level;
 
 @Mixin(ArmorStand.class)
-public abstract class ArmorStandEntity_scarpetMarkerMixin extends LivingEntity
+public abstract class ArmorStand_scarpetMarkerMixin extends LivingEntity
 {
-    protected ArmorStandEntity_scarpetMarkerMixin(EntityType<? extends LivingEntity> entityType_1, Level world_1)
+    protected ArmorStand_scarpetMarkerMixin(EntityType<? extends LivingEntity> entityType_1, Level world_1)
     {
         super(entityType_1, world_1);
     }
diff --git a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java b/src/main/java/carpet/mixins/BastionFeatureMixin.java
similarity index 78%
rename from src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
rename to src/main/java/carpet/mixins/BastionFeatureMixin.java
index 512df06a..20a5273a 100644
--- a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java
+++ b/src/main/java/carpet/mixins/BastionFeatureMixin.java
@@ -1,17 +1,11 @@
 package carpet.mixins;
 
-import carpet.CarpetSettings;
-
-import com.google.common.collect.Lists;
-import com.mojang.serialization.Codec;
 import org.spongepowered.asm.mixin.Mixin;
 
-import java.util.Collections;
-import java.util.List;
 import net.minecraft.world.level.levelgen.feature.BastionFeature;
 
 @Mixin(BastionFeature.class)
-public abstract class BastionRemnantFeatureMixin //extends JigsawFeature
+public abstract class BastionFeatureMixin //extends JigsawFeature
 {
     /*
     private static final Pool<SpawnSettings.SpawnEntry> spawnList = Pool.of(
diff --git a/src/main/java/carpet/mixins/BlazeEntityShootFireballGoal_extremeMixin.java b/src/main/java/carpet/mixins/BlazeAttackGoal_extremeMixin.java
similarity index 91%
rename from src/main/java/carpet/mixins/BlazeEntityShootFireballGoal_extremeMixin.java
rename to src/main/java/carpet/mixins/BlazeAttackGoal_extremeMixin.java
index 0fca369c..00e2d772 100644
--- a/src/main/java/carpet/mixins/BlazeEntityShootFireballGoal_extremeMixin.java
+++ b/src/main/java/carpet/mixins/BlazeAttackGoal_extremeMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import java.util.Random;
 
 @Mixin(targets = "net.minecraft.world.entity.monster.Blaze$BlazeAttackGoal")
-public class BlazeEntityShootFireballGoal_extremeMixin
+public class BlazeAttackGoal_extremeMixin
 {
     @Redirect(method = "tick()V", expect = 2, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/BlazeEntity_extremeMixin.java b/src/main/java/carpet/mixins/Blaze_extremeMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/BlazeEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/Blaze_extremeMixin.java
index ecce1c38..24bc9c72 100644
--- a/src/main/java/carpet/mixins/BlazeEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/Blaze_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.monster.Blaze;
 
 @Mixin(Blaze.class)
-public class BlazeEntity_extremeMixin
+public class Blaze_extremeMixin
 {
     // unused actually
     @Redirect(method = "customServerAiStep", expect = 1, at = @At(
diff --git a/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java b/src/main/java/carpet/mixins/BlockInput_fillUpdatesMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java
rename to src/main/java/carpet/mixins/BlockInput_fillUpdatesMixin.java
index 225e28c2..c06bff02 100644
--- a/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/BlockInput_fillUpdatesMixin.java
@@ -12,7 +12,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 
 @Mixin(BlockInput.class)
-public class BlockStateArgument_fillUpdatesMixin
+public class BlockInput_fillUpdatesMixin
 {
     @Redirect(method = "place", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/BlockStateArgument_scarpetMixin.java b/src/main/java/carpet/mixins/BlockInput_scarpetMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/BlockStateArgument_scarpetMixin.java
rename to src/main/java/carpet/mixins/BlockInput_scarpetMixin.java
index 477ce298..44261a65 100644
--- a/src/main/java/carpet/mixins/BlockStateArgument_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/BlockInput_scarpetMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(BlockInput.class)
-public class BlockStateArgument_scarpetMixin implements BlockStateArgumentInterface
+public class BlockInput_scarpetMixin implements BlockStateArgumentInterface
 {
     @Shadow @Final private @Nullable CompoundTag tag;
 
diff --git a/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/BlockLightSectionStorage_scarpetChunkCreationMixin.java
similarity index 83%
rename from src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/BlockLightSectionStorage_scarpetChunkCreationMixin.java
index abf20a55..63d868ce 100644
--- a/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/BlockLightSectionStorage_scarpetChunkCreationMixin.java
@@ -16,9 +16,9 @@ import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.lighting.LayerLightSectionStorage;
 
 @Mixin(BlockLightSectionStorage.class)
-public abstract class BlockLightStorage_scarpetChunkCreationMixin extends LayerLightSectionStorage<BlockDataLayerStorageMap> implements LightStorageInterface
+public abstract class BlockLightSectionStorage_scarpetChunkCreationMixin extends LayerLightSectionStorage<BlockDataLayerStorageMap> implements LightStorageInterface
 {
-    private BlockLightStorage_scarpetChunkCreationMixin(final LightLayer lightType, final LightChunkGetter chunkProvider, final BlockDataLayerStorageMap lightData)
+    private BlockLightSectionStorage_scarpetChunkCreationMixin(final LightLayer lightType, final LightChunkGetter chunkProvider, final BlockDataLayerStorageMap lightData)
     {
         super(lightType, chunkProvider, lightData);
     }
@@ -26,7 +26,7 @@ public abstract class BlockLightStorage_scarpetChunkCreationMixin extends LayerL
     @Override
     public void processRelight(final LayerLightEngine<?, ?> lightProvider, final long cPos)
     {
-        final LevelPropagator_resetChunkInterface levelPropagator = (LevelPropagator_resetChunkInterface) lightProvider;
+        final DynamicGraphMinFixedPoint_resetChunkInterface levelPropagator = (DynamicGraphMinFixedPoint_resetChunkInterface) lightProvider;
 
         for (int y = -1; y < 17; ++y)
         {
diff --git a/src/main/java/carpet/mixins/StatePredicate_scarpetMixin.java b/src/main/java/carpet/mixins/BlockPredicate_scarpetMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/StatePredicate_scarpetMixin.java
rename to src/main/java/carpet/mixins/BlockPredicate_scarpetMixin.java
index 1c6fdcf9..d7364fa3 100644
--- a/src/main/java/carpet/mixins/StatePredicate_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/BlockPredicate_scarpetMixin.java
@@ -18,7 +18,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
 
 @Mixin(targets = "net.minecraft.commands.arguments.blocks.BlockPredicateArgument$BlockPredicate")
-public class StatePredicate_scarpetMixin implements BlockPredicateInterface
+public class BlockPredicate_scarpetMixin implements BlockPredicateInterface
 {
 
     @Shadow @Final private BlockState state;
diff --git a/src/main/java/carpet/mixins/WorldChunkBEList_tickMixin.java b/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/WorldChunkBEList_tickMixin.java
rename to src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java
index 4f895361..31578084 100644
--- a/src/main/java/carpet/mixins/WorldChunkBEList_tickMixin.java
+++ b/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(targets = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity")
-public class  WorldChunkBEList_tickMixin<T extends BlockEntity>
+public class BoundTickingBlockEntity_tickMixin<T extends BlockEntity>
 {
     @Shadow @Final private T blockEntity;
     CarpetProfiler.ProfilerToken entitySection;
diff --git a/src/main/java/carpet/mixins/ChunkMixin.java b/src/main/java/carpet/mixins/ChunkAccess_warningsMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/ChunkMixin.java
rename to src/main/java/carpet/mixins/ChunkAccess_warningsMixin.java
index 40f45099..2be7d8ed 100644
--- a/src/main/java/carpet/mixins/ChunkMixin.java
+++ b/src/main/java/carpet/mixins/ChunkAccess_warningsMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ChunkAccess.class)
-public abstract class ChunkMixin
+public abstract class ChunkAccess_warningsMixin
 {
     // failed to mixin into interface. need to mixin in two places that uses it
     @Inject(method = "markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V",
diff --git a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
similarity index 99%
rename from src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
index bd8d2475..07b919b3 100644
--- a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
@@ -59,7 +59,7 @@ import static carpet.script.CarpetEventServer.Event.CHUNK_GENERATED;
 import static carpet.script.CarpetEventServer.Event.CHUNK_LOADED;
 
 @Mixin(ChunkMap.class)
-public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implements ThreadedAnvilChunkStorageInterface
+public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvilChunkStorageInterface
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_tickMixin.java b/src/main/java/carpet/mixins/ChunkMap_tickMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_tickMixin.java
rename to src/main/java/carpet/mixins/ChunkMap_tickMixin.java
index 48662c0b..c20eb6bf 100644
--- a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_tickMixin.java
+++ b/src/main/java/carpet/mixins/ChunkMap_tickMixin.java
@@ -13,7 +13,7 @@ import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 
 @Mixin(ChunkMap.class)
-public class ThreadedAnvilChunkStorage_tickMixin
+public class ChunkMap_tickMixin
 {
     @Shadow @Final private ServerLevel level;
     CarpetProfiler.ProfilerToken currentSection;
diff --git a/src/main/java/carpet/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/carpet/mixins/ClientPacketListener_customPacketsMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ClientPlayNetworkHandlerMixin.java
rename to src/main/java/carpet/mixins/ClientPacketListener_customPacketsMixin.java
index f14243fc..2c24b811 100644
--- a/src/main/java/carpet/mixins/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/carpet/mixins/ClientPacketListener_customPacketsMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPacketListener.class)
-public abstract class ClientPlayNetworkHandlerMixin
+public abstract class ClientPacketListener_customPacketsMixin
 {
     @Shadow private Minecraft minecraft;
 
diff --git a/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java b/src/main/java/carpet/mixins/ClientboundTabListPacketMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java
rename to src/main/java/carpet/mixins/ClientboundTabListPacketMixin.java
index a9764646..4a292b31 100644
--- a/src/main/java/carpet/mixins/PlayerListHeaderS2CPacketMixin.java
+++ b/src/main/java/carpet/mixins/ClientboundTabListPacketMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ClientboundTabListPacket.class)
-public interface PlayerListHeaderS2CPacketMixin
+public interface ClientboundTabListPacketMixin
 {
     @Accessor("header")
     void setHeader(Component header);
diff --git a/src/main/java/carpet/mixins/CloneCommandMixin.java b/src/main/java/carpet/mixins/CloneCommands_fillUpdatesMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/CloneCommandMixin.java
rename to src/main/java/carpet/mixins/CloneCommands_fillUpdatesMixin.java
index 92e49309..e9d7c366 100644
--- a/src/main/java/carpet/mixins/CloneCommandMixin.java
+++ b/src/main/java/carpet/mixins/CloneCommands_fillUpdatesMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 
 @Mixin(CloneCommands.class)
-public abstract class CloneCommandMixin
+public abstract class CloneCommands_fillUpdatesMixin
 {
     @ModifyConstant(method = "clone", constant = @Constant(intValue = 32768))
     private static int fillLimit(int original) {
diff --git a/src/main/java/carpet/mixins/CommandManagerMixin.java b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/CommandManagerMixin.java
rename to src/main/java/carpet/mixins/Commands_customCommandsMixin.java
index 4c8fc081..47d40c4c 100644
--- a/src/main/java/carpet/mixins/CommandManagerMixin.java
+++ b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 
 @Mixin(Commands.class)
-public abstract class CommandManagerMixin
+public abstract class Commands_customCommandsMixin
 {
 
     @Shadow
diff --git a/src/main/java/carpet/mixins/ClientConnectionMixin.java b/src/main/java/carpet/mixins/Connection_packetCounterMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/ClientConnectionMixin.java
rename to src/main/java/carpet/mixins/Connection_packetCounterMixin.java
index 1109338b..46635fb8 100644
--- a/src/main/java/carpet/mixins/ClientConnectionMixin.java
+++ b/src/main/java/carpet/mixins/Connection_packetCounterMixin.java
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Connection.class)
-public abstract class ClientConnectionMixin implements ClientConnectionInterface
+public abstract class Connection_packetCounterMixin implements ClientConnectionInterface
 {
     // Add to the packet counter whenever a packet is received.
     @Inject(method = "channelRead0", at = @At("HEAD"))
diff --git a/src/main/java/carpet/mixins/ItemScatterer_extremeMixin.java b/src/main/java/carpet/mixins/Containers_extremeMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/ItemScatterer_extremeMixin.java
rename to src/main/java/carpet/mixins/Containers_extremeMixin.java
index bd8601da..b7b833a0 100644
--- a/src/main/java/carpet/mixins/ItemScatterer_extremeMixin.java
+++ b/src/main/java/carpet/mixins/Containers_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.Containers;
 
 @Mixin(Containers.class)
-public class ItemScatterer_extremeMixin
+public class Containers_extremeMixin
 {
     @Redirect(method = "dropItemStack(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V",  expect = 3, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/CoralFanBlockMixin.java b/src/main/java/carpet/mixins/CoralFanBlock_renewableCoralMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/CoralFanBlockMixin.java
rename to src/main/java/carpet/mixins/CoralFanBlock_renewableCoralMixin.java
index d112b897..789dbaaf 100644
--- a/src/main/java/carpet/mixins/CoralFanBlockMixin.java
+++ b/src/main/java/carpet/mixins/CoralFanBlock_renewableCoralMixin.java
@@ -1,82 +1,82 @@
-package carpet.mixins;
-
-import carpet.CarpetSettings;
-import carpet.fakes.CoralFeatureInterface;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.BaseCoralPlantTypeBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.BonemealableBlock;
-import net.minecraft.world.level.block.CoralFanBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.levelgen.feature.CoralClawFeature;
-import net.minecraft.world.level.levelgen.feature.CoralFeature;
-import net.minecraft.world.level.levelgen.feature.CoralMushroomFeature;
-import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import net.minecraft.world.level.material.MaterialColor;
-import org.spongepowered.asm.mixin.Mixin;
-
-import java.util.Random;
-
-@Mixin(CoralFanBlock.class)
-public abstract class CoralFanBlockMixin implements BonemealableBlock
-{
-    public boolean isValidBonemealTarget(BlockGetter var1, BlockPos var2, BlockState var3, boolean var4)
-    {
-        return CarpetSettings.renewableCoral == CarpetSettings.RenewableCoralMode.EXPANDED
-                && var3.getValue(BaseCoralPlantTypeBlock.WATERLOGGED)
-                && var1.getFluidState(var2.above()).is(FluidTags.WATER);
-    }
-
-    public boolean isBonemealSuccess(Level var1, Random var2, BlockPos var3, BlockState var4)
-    {
-        return (double)var1.random.nextFloat() < 0.15D;
-    }
-
-    public void performBonemeal(ServerLevel worldIn, Random random, BlockPos pos, BlockState blockUnder)
-    {
-
-        CoralFeature coral;
-        int variant = random.nextInt(3);
-        if (variant == 0)
-            coral = new CoralClawFeature(NoneFeatureConfiguration.CODEC);
-        else if (variant == 1)
-            coral = new CoralTreeFeature(NoneFeatureConfiguration.CODEC);
-        else
-            coral = new CoralMushroomFeature(NoneFeatureConfiguration.CODEC);
-
-        MaterialColor color = blockUnder.getMapColor(worldIn, pos);
-        BlockState proper_block = blockUnder;
-        for (Block block: BlockTags.CORAL_BLOCKS.getValues())
-        {
-            proper_block = block.defaultBlockState();
-            if (proper_block.getMapColor(worldIn,pos) == color)
-            {
-                break;
-            }
-        }
-        worldIn.setBlock(pos, Blocks.WATER.defaultBlockState(), 4);
-
-        if (!((CoralFeatureInterface)coral).growSpecific(worldIn, random, pos, proper_block))
-        {
-            worldIn.setBlock(pos, blockUnder, 3);
-        }
-        else
-        {
-            if (worldIn.random.nextInt(10)==0)
-            {
-                BlockPos randomPos = pos.offset(worldIn.random.nextInt(16)-8,worldIn.random.nextInt(8),worldIn.random.nextInt(16)-8  );
-                if (BlockTags.CORAL_BLOCKS.contains(worldIn.getBlockState(randomPos).getBlock()))
-                {
-                    worldIn.setBlock(randomPos, Blocks.WET_SPONGE.defaultBlockState(), 3);
-                }
-            }
-        }
-    }
-}
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import carpet.fakes.CoralFeatureInterface;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.BaseCoralPlantTypeBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.BonemealableBlock;
+import net.minecraft.world.level.block.CoralFanBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.feature.CoralClawFeature;
+import net.minecraft.world.level.levelgen.feature.CoralFeature;
+import net.minecraft.world.level.levelgen.feature.CoralMushroomFeature;
+import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+import net.minecraft.world.level.material.MaterialColor;
+import org.spongepowered.asm.mixin.Mixin;
+
+import java.util.Random;
+
+@Mixin(CoralFanBlock.class)
+public abstract class CoralFanBlock_renewableCoralMixin implements BonemealableBlock
+{
+    public boolean isValidBonemealTarget(BlockGetter var1, BlockPos var2, BlockState var3, boolean var4)
+    {
+        return CarpetSettings.renewableCoral == CarpetSettings.RenewableCoralMode.EXPANDED
+                && var3.getValue(BaseCoralPlantTypeBlock.WATERLOGGED)
+                && var1.getFluidState(var2.above()).is(FluidTags.WATER);
+    }
+
+    public boolean isBonemealSuccess(Level var1, Random var2, BlockPos var3, BlockState var4)
+    {
+        return (double)var1.random.nextFloat() < 0.15D;
+    }
+
+    public void performBonemeal(ServerLevel worldIn, Random random, BlockPos pos, BlockState blockUnder)
+    {
+
+        CoralFeature coral;
+        int variant = random.nextInt(3);
+        if (variant == 0)
+            coral = new CoralClawFeature(NoneFeatureConfiguration.CODEC);
+        else if (variant == 1)
+            coral = new CoralTreeFeature(NoneFeatureConfiguration.CODEC);
+        else
+            coral = new CoralMushroomFeature(NoneFeatureConfiguration.CODEC);
+
+        MaterialColor color = blockUnder.getMapColor(worldIn, pos);
+        BlockState proper_block = blockUnder;
+        for (Block block: BlockTags.CORAL_BLOCKS.getValues())
+        {
+            proper_block = block.defaultBlockState();
+            if (proper_block.getMapColor(worldIn,pos) == color)
+            {
+                break;
+            }
+        }
+        worldIn.setBlock(pos, Blocks.WATER.defaultBlockState(), 4);
+
+        if (!((CoralFeatureInterface)coral).growSpecific(worldIn, random, pos, proper_block))
+        {
+            worldIn.setBlock(pos, blockUnder, 3);
+        }
+        else
+        {
+            if (worldIn.random.nextInt(10)==0)
+            {
+                BlockPos randomPos = pos.offset(worldIn.random.nextInt(16)-8,worldIn.random.nextInt(8),worldIn.random.nextInt(16)-8  );
+                if (BlockTags.CORAL_BLOCKS.contains(worldIn.getBlockState(randomPos).getBlock()))
+                {
+                    worldIn.setBlock(randomPos, Blocks.WET_SPONGE.defaultBlockState(), 3);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/carpet/mixins/CoralFeatureMixin.java b/src/main/java/carpet/mixins/CoralFeature_renewableCoralMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/CoralFeatureMixin.java
rename to src/main/java/carpet/mixins/CoralFeature_renewableCoralMixin.java
index 06713ca9..86a2957b 100644
--- a/src/main/java/carpet/mixins/CoralFeatureMixin.java
+++ b/src/main/java/carpet/mixins/CoralFeature_renewableCoralMixin.java
@@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.CoralFeature;
 
 @Mixin(CoralFeature.class)
-public abstract class CoralFeatureMixin implements CoralFeatureInterface
+public abstract class CoralFeature_renewableCoralMixin implements CoralFeatureInterface
 {
 
     @Shadow protected abstract boolean placeFeature(LevelAccessor var1, Random var2, BlockPos var3, BlockState var4);
diff --git a/src/main/java/carpet/mixins/CoralBlockMixin.java b/src/main/java/carpet/mixins/CoralPlantBlock_renewableCoralMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/CoralBlockMixin.java
rename to src/main/java/carpet/mixins/CoralPlantBlock_renewableCoralMixin.java
index 471cc2fa..ac8fb2c9 100644
--- a/src/main/java/carpet/mixins/CoralBlockMixin.java
+++ b/src/main/java/carpet/mixins/CoralPlantBlock_renewableCoralMixin.java
@@ -25,7 +25,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf
 import net.minecraft.world.level.material.MaterialColor;
 
 @Mixin(CoralPlantBlock.class)
-public abstract class CoralBlockMixin implements BonemealableBlock
+public abstract class CoralPlantBlock_renewableCoralMixin implements BonemealableBlock
 {
     public boolean isValidBonemealTarget(BlockGetter var1, BlockPos var2, BlockState var3, boolean var4)
     {
diff --git a/src/main/java/carpet/mixins/ItemDispenserBehaviour_extremeBehavioursMixin.java b/src/main/java/carpet/mixins/DefaultDispenseItemBehavior_extremeBehavioursMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/ItemDispenserBehaviour_extremeBehavioursMixin.java
rename to src/main/java/carpet/mixins/DefaultDispenseItemBehavior_extremeBehavioursMixin.java
index 25f9b46f..973ac5c4 100644
--- a/src/main/java/carpet/mixins/ItemDispenserBehaviour_extremeBehavioursMixin.java
+++ b/src/main/java/carpet/mixins/DefaultDispenseItemBehavior_extremeBehavioursMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
 
 @Mixin(DefaultDispenseItemBehavior.class)
-public class ItemDispenserBehaviour_extremeBehavioursMixin
+public class DefaultDispenseItemBehavior_extremeBehavioursMixin
 {
     @Redirect(method = "spawnItem", expect = 3, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/ChunkTicketManager_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/DistanceManager_scarpetChunkCreationMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/ChunkTicketManager_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/DistanceManager_scarpetChunkCreationMixin.java
index 531ad681..694aed49 100644
--- a/src/main/java/carpet/mixins/ChunkTicketManager_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/DistanceManager_scarpetChunkCreationMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import carpet.fakes.ChunkTicketManagerInterface;
 
 @Mixin(DistanceManager.class)
-public abstract class ChunkTicketManager_scarpetChunkCreationMixin implements ChunkTicketManagerInterface
+public abstract class DistanceManager_scarpetChunkCreationMixin implements ChunkTicketManagerInterface
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java b/src/main/java/carpet/mixins/DistanceManager_scarpetMixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
rename to src/main/java/carpet/mixins/DistanceManager_scarpetMixin.java
index 36843e9e..120f1f4a 100644
--- a/src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/DistanceManager_scarpetMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(DistanceManager.class)
-public abstract class ChunkTicketManager_scarpetMixin implements ChunkTicketManagerInterface
+public abstract class DistanceManager_scarpetMixin implements ChunkTicketManagerInterface
 {
     @Shadow @Final private Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> tickets;
 
diff --git a/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java b/src/main/java/carpet/mixins/DistanceManager_spawnChunksMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java
rename to src/main/java/carpet/mixins/DistanceManager_spawnChunksMixin.java
index f4270e46..a773a8cb 100644
--- a/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java
+++ b/src/main/java/carpet/mixins/DistanceManager_spawnChunksMixin.java
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import java.util.Iterator;
 
 @Mixin(DistanceManager.class)
-public abstract class ChunkTicketManager_spawnChunksMixin implements ChunkTicketManagerInterface
+public abstract class DistanceManager_spawnChunksMixin implements ChunkTicketManagerInterface
 {
     @Shadow @Final private Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> tickets;
 
diff --git a/src/main/java/carpet/mixins/ChunkTicketManager_tickMixin.java b/src/main/java/carpet/mixins/DistanceManager_tickMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/ChunkTicketManager_tickMixin.java
rename to src/main/java/carpet/mixins/DistanceManager_tickMixin.java
index 4f22f6e4..ff5ca448 100644
--- a/src/main/java/carpet/mixins/ChunkTicketManager_tickMixin.java
+++ b/src/main/java/carpet/mixins/DistanceManager_tickMixin.java
@@ -9,11 +9,11 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(DistanceManager.class)
-public class ChunkTicketManager_tickMixin
+public class DistanceManager_tickMixin
 {
     @Shadow private long ticketTickCounter;
 
-    @Inject(method = "purgeStaleTickets", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "purgeStaleTickets", at = @At("HEAD"))
     private void pauseTicketSystem(CallbackInfo ci)
     {
         // pausing expiry of tickets
diff --git a/src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java b/src/main/java/carpet/mixins/DynamicGraphMinFixedPoint_resetChunkInterface.java
similarity index 87%
rename from src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java
rename to src/main/java/carpet/mixins/DynamicGraphMinFixedPoint_resetChunkInterface.java
index 65f073e4..cc8f8e09 100644
--- a/src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java
+++ b/src/main/java/carpet/mixins/DynamicGraphMinFixedPoint_resetChunkInterface.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(DynamicGraphMinFixedPoint.class)
-public interface LevelPropagator_resetChunkInterface
+public interface DynamicGraphMinFixedPoint_resetChunkInterface
 {
     @Invoker("checkEdge")
     void cmInvokeUpdateLevel(long sourceId, long id, int level, boolean decrease);
diff --git a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java b/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java
rename to src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java
index 5c8e8cee..e11c8f3b 100644
--- a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java
+++ b/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ExperienceOrb.class)
-public abstract class ExperienceOrbEntityMixin extends Entity
+public abstract class ExperienceOrb_xpNoCooldownMixin extends Entity
 {
     @Shadow
     private int count;
@@ -21,7 +21,7 @@ public abstract class ExperienceOrbEntityMixin extends Entity
     @Shadow
     private int value;
 
-    public ExperienceOrbEntityMixin(EntityType<?> type, Level world)
+    public ExperienceOrb_xpNoCooldownMixin(EntityType<?> type, Level world)
     {
         super(type, world);
     }
diff --git a/src/main/java/carpet/mixins/ExplosionMixin.java b/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ExplosionMixin.java
rename to src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java
index 781b96fa..3d24cf20 100644
--- a/src/main/java/carpet/mixins/ExplosionMixin.java
+++ b/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java
@@ -24,7 +24,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 
 @Mixin(value = Explosion.class)
-public abstract class ExplosionMixin
+public abstract class Explosion_optimizedTntMixin
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java b/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java
index 049d2c84..97ad1e70 100644
--- a/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java
+++ b/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java
@@ -8,11 +8,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.damagesource.DamageSource;
diff --git a/src/main/java/carpet/mixins/FireworkEntity_extremeMixin.java b/src/main/java/carpet/mixins/FireworkRocketEntity_extremeMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/FireworkEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/FireworkRocketEntity_extremeMixin.java
index 7ca3e937..f8b9e9b2 100644
--- a/src/main/java/carpet/mixins/FireworkEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/FireworkRocketEntity_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 
 @Mixin(FireworkRocketEntity.class)
-public class FireworkEntity_extremeMixin
+public class FireworkRocketEntity_extremeMixin
 {
     @Redirect(method = "<init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V", expect = 2, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java b/src/main/java/carpet/mixins/FishingHook_extremeMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/FishingHook_extremeMixin.java
index ede13cb2..bae9a692 100644
--- a/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/FishingHook_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.projectile.FishingHook;
 
 @Mixin(FishingHook.class)
-public class FishingBobberEntity_extremeMixin
+public class FishingHook_extremeMixin
 {
     @Redirect(method = "<init>(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;II)V", expect =3, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java
rename to src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java
index d080bc1b..6bf5940c 100644
--- a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java
+++ b/src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java
@@ -4,7 +4,6 @@ import carpet.CarpetSettings;
 import carpet.helpers.CustomSpawnLists;
 import org.spongepowered.asm.mixin.Mixin;
 
-import java.util.List;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.random.WeightedRandomList;
 import net.minecraft.world.entity.MobCategory;
@@ -22,10 +21,10 @@ import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.levelgen.feature.SwamplandHutFeature;
 
 @Mixin(FlatLevelSource.class)
-public abstract class FlatChunkGeneratorMixin extends ChunkGenerator
+public abstract class FlatLevelSource_structuresMixin extends ChunkGenerator
 {
 
-    public FlatChunkGeneratorMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
+    public FlatLevelSource_structuresMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
     {
         super(biomeSource, structuresConfig);
     }
diff --git a/src/main/java/carpet/mixins/FlowableFluid_liquidDamageDisabledMixin.java b/src/main/java/carpet/mixins/FlowingFluid_liquidDamageDisabledMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/FlowableFluid_liquidDamageDisabledMixin.java
rename to src/main/java/carpet/mixins/FlowingFluid_liquidDamageDisabledMixin.java
index c647cabf..0ce97ecc 100644
--- a/src/main/java/carpet/mixins/FlowableFluid_liquidDamageDisabledMixin.java
+++ b/src/main/java/carpet/mixins/FlowingFluid_liquidDamageDisabledMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(FlowingFluid.class)
-public class FlowableFluid_liquidDamageDisabledMixin
+public class FlowingFluid_liquidDamageDisabledMixin
 {
     @Inject(
             method = "canHoldFluid",
diff --git a/src/main/java/carpet/mixins/GuardianEntityMixin.java b/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java
similarity index 91%
rename from src/main/java/carpet/mixins/GuardianEntityMixin.java
rename to src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java
index 516639b6..4675f6f8 100644
--- a/src/main/java/carpet/mixins/GuardianEntityMixin.java
+++ b/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java
@@ -14,9 +14,9 @@ import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(Guardian.class)
-public abstract class GuardianEntityMixin extends Monster
+public abstract class Guardian_renewableSpongesMixin extends Monster
 {
-    protected GuardianEntityMixin(EntityType<? extends Monster> entityType_1, Level world_1)
+    protected Guardian_renewableSpongesMixin(EntityType<? extends Monster> entityType_1, Level world_1)
     {
         super(entityType_1, world_1);
     }
diff --git a/src/main/java/carpet/mixins/InGameHudMixin.java b/src/main/java/carpet/mixins/Gui_tablistMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/InGameHudMixin.java
rename to src/main/java/carpet/mixins/Gui_tablistMixin.java
index 041a08d4..f6ab98ac 100644
--- a/src/main/java/carpet/mixins/InGameHudMixin.java
+++ b/src/main/java/carpet/mixins/Gui_tablistMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Gui.class)
-public abstract class InGameHudMixin
+public abstract class Gui_tablistMixin
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/HopperBlockEntityMixin.java b/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java
similarity index 91%
rename from src/main/java/carpet/mixins/HopperBlockEntityMixin.java
rename to src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java
index 6ba594c9..1c05b463 100644
--- a/src/main/java/carpet/mixins/HopperBlockEntityMixin.java
+++ b/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java
@@ -23,9 +23,9 @@ import net.minecraft.world.level.block.state.BlockState;
  * The {@link Mixin} which removes items in a hopper if it points into a wool counter, and calls {@link HopperCounter#add}
  */
 @Mixin(HopperBlockEntity.class)
-public abstract class HopperBlockEntityMixin extends RandomizableContainerBlockEntity
+public abstract class HopperBlockEntity_counterMixin extends RandomizableContainerBlockEntity
 {
-    protected HopperBlockEntityMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
+    protected HopperBlockEntity_counterMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
         super(blockEntityType, blockPos, blockState);
     }
 
diff --git a/src/main/java/carpet/mixins/HuskEntityMixin.java b/src/main/java/carpet/mixins/Husk_templesMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/HuskEntityMixin.java
rename to src/main/java/carpet/mixins/Husk_templesMixin.java
index ad5913eb..2c79d30d 100644
--- a/src/main/java/carpet/mixins/HuskEntityMixin.java
+++ b/src/main/java/carpet/mixins/Husk_templesMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Husk.class)
-public class HuskEntityMixin
+public class Husk_templesMixin
 {
     @Redirect(method = "checkHuskSpawnRules", at = @At(value = "INVOKE", target="Lnet/minecraft/world/level/ServerLevelAccessor;canSeeSky(Lnet/minecraft/core/BlockPos;)Z"))
     private static boolean isSkylightOrTempleVisible(ServerLevelAccessor serverWorldAccess, BlockPos pos)
diff --git a/src/main/java/carpet/mixins/InfestedBlockMixin.java b/src/main/java/carpet/mixins/InfestedBlock_gravelMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/InfestedBlockMixin.java
rename to src/main/java/carpet/mixins/InfestedBlock_gravelMixin.java
index 87edd3eb..c9663467 100644
--- a/src/main/java/carpet/mixins/InfestedBlockMixin.java
+++ b/src/main/java/carpet/mixins/InfestedBlock_gravelMixin.java
@@ -13,9 +13,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(InfestedBlock.class)
-public abstract class InfestedBlockMixin extends Block
+public abstract class InfestedBlock_gravelMixin extends Block
 {
-    public InfestedBlockMixin(Properties block$Settings_1)
+    public InfestedBlock_gravelMixin(Properties block$Settings_1)
     {
         super(block$Settings_1);
     }
diff --git a/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java b/src/main/java/carpet/mixins/Inventory_scarpetEventMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java
rename to src/main/java/carpet/mixins/Inventory_scarpetEventMixin.java
index 8ccec7ed..2365a2f2 100644
--- a/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java
+++ b/src/main/java/carpet/mixins/Inventory_scarpetEventMixin.java
@@ -15,7 +15,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
 @Mixin(Inventory.class)
-public abstract class PlayerInventory_scarpetEventMixin
+public abstract class Inventory_scarpetEventMixin
 {
     @Shadow @Final public Player player;
 
diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java
index 00d83547..9866ef3c 100644
--- a/src/main/java/carpet/mixins/ItemEntityMixin.java
+++ b/src/main/java/carpet/mixins/ItemEntityMixin.java
@@ -34,7 +34,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
     @Override
     public void thunderHit(ServerLevel world, LightningBolt lightning) {
         if (CarpetSettings.lightningKillsDropsFix) {
-            if (this.age > 8) { //Only kill item if its older then 8 ticks
+            if (this.age > 8) { //Only kill item if it's older than 8 ticks
                 super.thunderHit(world, lightning);
             }
         } else {
diff --git a/src/main/java/carpet/mixins/ChunkLightProvider_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/ChunkLightProvider_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java
index 82f497d6..d2f82647 100644
--- a/src/main/java/carpet/mixins/ChunkLightProvider_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java
@@ -12,7 +12,7 @@ import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.lighting.LayerLightSectionStorage;
 
 @Mixin(LayerLightEngine.class)
-public abstract class ChunkLightProvider_scarpetChunkCreationMixin implements Lighting_scarpetChunkCreationInterface, ChunkLightProviderInterface
+public abstract class LayerLightEngine_scarpetChunkCreationMixin implements Lighting_scarpetChunkCreationInterface, ChunkLightProviderInterface
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/LightStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/LightStorage_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java
index fd2de4c7..5dea17c0 100644
--- a/src/main/java/carpet/mixins/LightStorage_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java
@@ -20,7 +20,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 
 @Mixin(LayerLightSectionStorage.class)
-public abstract class LightStorage_scarpetChunkCreationMixin implements LightStorageInterface
+public abstract class LayerLightSectionStorage_scarpetChunkCreationMixin implements LightStorageInterface
 {
     @Shadow
     protected abstract DataLayer getDataLayer(final long sectionPos, final boolean cached);
diff --git a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java b/src/main/java/carpet/mixins/LevelChunk_fillUpdatesMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java
rename to src/main/java/carpet/mixins/LevelChunk_fillUpdatesMixin.java
index 1a6fc418..52b345a8 100644
--- a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/LevelChunk_fillUpdatesMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LevelChunk.class)
-public class WorldChunk_fillUpdatesMixin
+public class LevelChunk_fillUpdatesMixin
 {
     // todo onStateReplaced needs a bit more love since it removes be which is needed
     @Redirect(method = "setBlockState", at = @At(
diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java
rename to src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java
index 1ff5ff80..9ea44301 100644
--- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java
@@ -27,13 +27,13 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LevelChunk.class)
-public abstract class WorldChunk_movableTEMixin extends ChunkAccess implements WorldChunkInterface
+public abstract class LevelChunk_movableBEMixin extends ChunkAccess implements WorldChunkInterface
 {
     @Shadow
     @Final
     Level level;
 
-    public WorldChunk_movableTEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) {
+    public LevelChunk_movableBEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) {
         super(pos, upgradeData, heightLimitView, biome, inhabitedTime, sectionArrayInitializer, blendingData);
     }
 
diff --git a/src/main/java/carpet/mixins/SimpleEntityLookup_scarpetMixin.java b/src/main/java/carpet/mixins/LevelEntityGetterAdapter_scarpetMixin.java
similarity index 88%
rename from src/main/java/carpet/mixins/SimpleEntityLookup_scarpetMixin.java
rename to src/main/java/carpet/mixins/LevelEntityGetterAdapter_scarpetMixin.java
index eff37250..f7f9dd4d 100644
--- a/src/main/java/carpet/mixins/SimpleEntityLookup_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/LevelEntityGetterAdapter_scarpetMixin.java
@@ -14,7 +14,7 @@ import net.minecraft.world.level.entity.EntitySectionStorage;
 import net.minecraft.world.level.entity.LevelEntityGetterAdapter;
 
 @Mixin(LevelEntityGetterAdapter.class)
-public class SimpleEntityLookup_scarpetMixin<T extends EntityAccess> implements SimpleEntityLookupInterface
+public class LevelEntityGetterAdapter_scarpetMixin<T extends EntityAccess> implements SimpleEntityLookupInterface
 {
 
     @Shadow @Final private EntitySectionStorage<T> sectionStorage;
diff --git a/src/main/java/carpet/mixins/LightingProvider_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/LevelLightEngine_scarpetChunkCreationMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/LightingProvider_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/LevelLightEngine_scarpetChunkCreationMixin.java
index 52b396d0..f61c23a9 100644
--- a/src/main/java/carpet/mixins/LightingProvider_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/LevelLightEngine_scarpetChunkCreationMixin.java
@@ -9,7 +9,7 @@ import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 
 @Mixin(LevelLightEngine.class)
-public abstract class LightingProvider_scarpetChunkCreationMixin implements Lighting_scarpetChunkCreationInterface
+public abstract class LevelLightEngine_scarpetChunkCreationMixin implements Lighting_scarpetChunkCreationInterface
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/WorldRenderer_creativeNoClipMixin.java b/src/main/java/carpet/mixins/LevelRenderer_creativeNoClipMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/WorldRenderer_creativeNoClipMixin.java
rename to src/main/java/carpet/mixins/LevelRenderer_creativeNoClipMixin.java
index 14bfa153..a281c7ac 100644
--- a/src/main/java/carpet/mixins/WorldRenderer_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/LevelRenderer_creativeNoClipMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LevelRenderer.class)
-public class WorldRenderer_creativeNoClipMixin
+public class LevelRenderer_creativeNoClipMixin
 {
     @Redirect(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isSpectator()Z"))
     private boolean canSeeWorld(LocalPlayer clientPlayerEntity)
diff --git a/src/main/java/carpet/mixins/WorldRenderer_fogOffMixin.java b/src/main/java/carpet/mixins/LevelRenderer_fogOffMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/WorldRenderer_fogOffMixin.java
rename to src/main/java/carpet/mixins/LevelRenderer_fogOffMixin.java
index e132926e..d754a8e0 100644
--- a/src/main/java/carpet/mixins/WorldRenderer_fogOffMixin.java
+++ b/src/main/java/carpet/mixins/LevelRenderer_fogOffMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = LevelRenderer.class, priority = 69420)
-public class WorldRenderer_fogOffMixin
+public class LevelRenderer_fogOffMixin
 {
     @Redirect(method = "renderLevel", require = 0, expect = 0, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java b/src/main/java/carpet/mixins/LevelRenderer_pausedShakeMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java
rename to src/main/java/carpet/mixins/LevelRenderer_pausedShakeMixin.java
index 0e3794bd..40eb1933 100644
--- a/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java
+++ b/src/main/java/carpet/mixins/LevelRenderer_pausedShakeMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(value = LevelRenderer.class, priority = 69420)
-public class WorldRenderer_pausedShakeMixin
+public class LevelRenderer_pausedShakeMixin
 {
     @Shadow @Final private Minecraft minecraft;
 
diff --git a/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java b/src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
rename to src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java
index 9d4d5d2e..33dd4846 100644
--- a/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
+++ b/src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LevelRenderer.class)
-public class WorldRenderer_scarpetRenderMixin
+public class LevelRenderer_scarpetRenderMixin
 {
     @Inject(method = "<init>", at = @At("RETURN"))
     private void addRenderers(Minecraft client, RenderBuffers bufferBuilders, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java b/src/main/java/carpet/mixins/Level_fillUpdatesMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/World_fillUpdatesMixin.java
rename to src/main/java/carpet/mixins/Level_fillUpdatesMixin.java
index 0c7b76fc..cb050c7a 100644
--- a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/Level_fillUpdatesMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Level.class)
-public abstract class World_fillUpdatesMixin
+public abstract class Level_fillUpdatesMixin
 {
     @ModifyConstant(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", //setBlockState main
             constant = @Constant(intValue = 16))
diff --git a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java b/src/main/java/carpet/mixins/Level_getOtherEntitiesLimited.java
similarity index 97%
rename from src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java
rename to src/main/java/carpet/mixins/Level_getOtherEntitiesLimited.java
index 597d8b22..dbe06add 100644
--- a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java
+++ b/src/main/java/carpet/mixins/Level_getOtherEntitiesLimited.java
@@ -18,7 +18,7 @@ import net.minecraft.world.level.entity.LevelEntityGetter;
 import net.minecraft.world.phys.AABB;
 
 @Mixin(Level.class)
-public abstract class World_getOtherEntitiesLimited implements WorldInterface {
+public abstract class Level_getOtherEntitiesLimited implements WorldInterface {
 
     private static final RuntimeException CONTROL_FLOW_EXCEPTION = new RuntimeException("Should be caught for control flow in World_getOtherEntitiesLimited!");
 
diff --git a/src/main/java/carpet/mixins/World_movableTEMixin.java b/src/main/java/carpet/mixins/Level_movableBEMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/World_movableTEMixin.java
rename to src/main/java/carpet/mixins/Level_movableBEMixin.java
index 9583d40a..bea6f625 100644
--- a/src/main/java/carpet/mixins/World_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/Level_movableBEMixin.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Level.class)
-public abstract class World_movableTEMixin implements WorldInterface, LevelAccessor
+public abstract class Level_movableBEMixin implements WorldInterface, LevelAccessor
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java b/src/main/java/carpet/mixins/Level_scarpetPlopMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/World_scarpetPlopMixin.java
rename to src/main/java/carpet/mixins/Level_scarpetPlopMixin.java
index 1dc95519..897587d5 100644
--- a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java
+++ b/src/main/java/carpet/mixins/Level_scarpetPlopMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Level.class)
-public class World_scarpetPlopMixin
+public class Level_scarpetPlopMixin
 {
 
     @Redirect(method = "getHeight", at = @At(
diff --git a/src/main/java/carpet/mixins/World_tickMixin.java b/src/main/java/carpet/mixins/Level_tickMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/World_tickMixin.java
rename to src/main/java/carpet/mixins/Level_tickMixin.java
index ea508410..ea1ecb86 100644
--- a/src/main/java/carpet/mixins/World_tickMixin.java
+++ b/src/main/java/carpet/mixins/Level_tickMixin.java
@@ -19,7 +19,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
 @Mixin(Level.class)
-public abstract class World_tickMixin implements WorldInterface
+public abstract class Level_tickMixin implements WorldInterface
 {
     @Shadow @Final public boolean isClientSide;
     CarpetProfiler.ProfilerToken currentSection;
diff --git a/src/main/java/carpet/mixins/World_updateSuppressionCrashFixMixin.java b/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/World_updateSuppressionCrashFixMixin.java
rename to src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
index 4ef14f78..bee8b5bf 100644
--- a/src/main/java/carpet/mixins/World_updateSuppressionCrashFixMixin.java
+++ b/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(Level.class)
-public class World_updateSuppressionCrashFixMixin {
+public class Level_updateSuppressionCrashFixMixin {
 
     @Inject(
             method = "neighborChanged",
diff --git a/src/main/java/carpet/mixins/FluidBlock_renewableBlackstoneMixin.java b/src/main/java/carpet/mixins/LiquidBlock_renewableBlackstoneMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/FluidBlock_renewableBlackstoneMixin.java
rename to src/main/java/carpet/mixins/LiquidBlock_renewableBlackstoneMixin.java
index f6342eca..8f097ff8 100644
--- a/src/main/java/carpet/mixins/FluidBlock_renewableBlackstoneMixin.java
+++ b/src/main/java/carpet/mixins/LiquidBlock_renewableBlackstoneMixin.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LiquidBlock.class)
-public abstract class FluidBlock_renewableBlackstoneMixin
+public abstract class LiquidBlock_renewableBlackstoneMixin
 {
     @Shadow @Final protected FlowingFluid fluid;
 
diff --git a/src/main/java/carpet/mixins/FluidBlock_renewableDeepslateMixin.java b/src/main/java/carpet/mixins/LiquidBlock_renewableDeepslateMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/FluidBlock_renewableDeepslateMixin.java
rename to src/main/java/carpet/mixins/LiquidBlock_renewableDeepslateMixin.java
index f438e1fa..6dd4e296 100644
--- a/src/main/java/carpet/mixins/FluidBlock_renewableDeepslateMixin.java
+++ b/src/main/java/carpet/mixins/LiquidBlock_renewableDeepslateMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LiquidBlock.class)
-public abstract class FluidBlock_renewableDeepslateMixin {
+public abstract class LiquidBlock_renewableDeepslateMixin {
 
     @Shadow protected abstract void fizz(LevelAccessor world, BlockPos pos);
 
diff --git a/src/main/java/carpet/mixins/LivingEntityMixin.java b/src/main/java/carpet/mixins/LivingEntity_cleanLogsMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/LivingEntityMixin.java
rename to src/main/java/carpet/mixins/LivingEntity_cleanLogsMixin.java
index d43f542c..16cf02dd 100644
--- a/src/main/java/carpet/mixins/LivingEntityMixin.java
+++ b/src/main/java/carpet/mixins/LivingEntity_cleanLogsMixin.java
@@ -11,10 +11,10 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LivingEntity.class)
-public abstract class LivingEntityMixin extends Entity
+public abstract class LivingEntity_cleanLogsMixin extends Entity
 {
 
-    public LivingEntityMixin(EntityType<?> type, Level world)
+    public LivingEntity_cleanLogsMixin(EntityType<?> type, Level world)
     {
         super(type, world);
     }
diff --git a/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java b/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java
rename to src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java
index 2d352ab7..2c39cfeb 100644
--- a/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java
+++ b/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LocalPlayer.class)
-public class ClientPlayerEntity_clientCommandMixin
+public class LocalPlayer_clientCommandMixin
 {
     @Inject(method = "chat", at = @At("HEAD"))
     private void inspectMessage(String string, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java b/src/main/java/carpet/mixins/MerchantResultSlot_scarpetEventMixin.java
similarity index 83%
rename from src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java
rename to src/main/java/carpet/mixins/MerchantResultSlot_scarpetEventMixin.java
index c87f71fe..bd7d7389 100644
--- a/src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java
+++ b/src/main/java/carpet/mixins/MerchantResultSlot_scarpetEventMixin.java
@@ -6,8 +6,6 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import static carpet.script.CarpetEventServer.Event.PLAYER_TRADES;
 
@@ -18,8 +16,8 @@ import net.minecraft.world.inventory.MerchantResultSlot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.trading.Merchant;
 
-@Mixin(value = MerchantResultSlot.class)
-public abstract class TradeOutputSlot_scarpetEventMixin {
+@Mixin(MerchantResultSlot.class)
+public abstract class MerchantResultSlot_scarpetEventMixin {
     @Shadow @Final private Merchant merchant;
 
     @Shadow @Final private MerchantContainer slots;
diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/MinecraftClientMixin.java
rename to src/main/java/carpet/mixins/MinecraftMixin.java
index 54656f79..03c086e7 100644
--- a/src/main/java/carpet/mixins/MinecraftClientMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Minecraft.class)
-public class MinecraftClientMixin
+public class MinecraftMixin
 {
     @Shadow public ClientLevel level;
     
diff --git a/src/main/java/carpet/mixins/MinecraftClient_pausedShakeMixin.java b/src/main/java/carpet/mixins/Minecraft_pausedShakeMixin.java
similarity index 81%
rename from src/main/java/carpet/mixins/MinecraftClient_pausedShakeMixin.java
rename to src/main/java/carpet/mixins/Minecraft_pausedShakeMixin.java
index 7560f254..1ba01146 100644
--- a/src/main/java/carpet/mixins/MinecraftClient_pausedShakeMixin.java
+++ b/src/main/java/carpet/mixins/Minecraft_pausedShakeMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Minecraft.class)
-public class MinecraftClient_pausedShakeMixin implements MinecraftClientInferface
+public class Minecraft_pausedShakeMixin implements MinecraftClientInferface
 {
     @Shadow private float pausePartialTick;
 
diff --git a/src/main/java/carpet/mixins/SpawnGroup_spawnMixin.java b/src/main/java/carpet/mixins/MobCategory_spawnMixin.java
similarity index 92%
rename from src/main/java/carpet/mixins/SpawnGroup_spawnMixin.java
rename to src/main/java/carpet/mixins/MobCategory_spawnMixin.java
index d123f62a..dcbf87c9 100644
--- a/src/main/java/carpet/mixins/SpawnGroup_spawnMixin.java
+++ b/src/main/java/carpet/mixins/MobCategory_spawnMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(MobCategory.class)
-public class SpawnGroup_spawnMixin implements SpawnGroupInterface
+public class MobCategory_spawnMixin implements SpawnGroupInterface
 {
     @Shadow @Final private int max;
 
diff --git a/src/main/java/carpet/mixins/MobEntityMixin.java b/src/main/java/carpet/mixins/MobMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/MobEntityMixin.java
rename to src/main/java/carpet/mixins/MobMixin.java
index c58f3606..bd6b217e 100644
--- a/src/main/java/carpet/mixins/MobEntityMixin.java
+++ b/src/main/java/carpet/mixins/MobMixin.java
@@ -12,7 +12,7 @@ import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.goal.GoalSelector;
 
 @Mixin(Mob.class)
-public abstract class MobEntityMixin implements MobEntityInterface
+public abstract class MobMixin implements MobEntityInterface
 {
     @Shadow @Final protected GoalSelector targetSelector;
     @Shadow @Final protected GoalSelector goalSelector;
diff --git a/src/main/java/carpet/mixins/MobEntity_extremeMixin.java b/src/main/java/carpet/mixins/Mob_extremeMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/MobEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/Mob_extremeMixin.java
index f9e42b80..b23d882a 100644
--- a/src/main/java/carpet/mixins/MobEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/Mob_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.Mob;
 
 @Mixin(Mob.class)
-public class MobEntity_extremeMixin
+public class Mob_extremeMixin
 {
     @Redirect(method = "finalizeSpawn", expect = 1, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/SpawnHelperMixin.java b/src/main/java/carpet/mixins/NaturalSpawnerMixin.java
similarity index 99%
rename from src/main/java/carpet/mixins/SpawnHelperMixin.java
rename to src/main/java/carpet/mixins/NaturalSpawnerMixin.java
index df9b9180..277ff3ad 100644
--- a/src/main/java/carpet/mixins/SpawnHelperMixin.java
+++ b/src/main/java/carpet/mixins/NaturalSpawnerMixin.java
@@ -40,7 +40,7 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 @Mixin(NaturalSpawner.class)
-public class SpawnHelperMixin
+public class NaturalSpawnerMixin
 {
     @Shadow @Final private static int MAGIC_NUMBER;
 
diff --git a/src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java b/src/main/java/carpet/mixins/NoiseBasedChunkGenerator_husksSpawnMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java
rename to src/main/java/carpet/mixins/NoiseBasedChunkGenerator_husksSpawnMixin.java
index c34677d0..aad71b58 100644
--- a/src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java
+++ b/src/main/java/carpet/mixins/NoiseBasedChunkGenerator_husksSpawnMixin.java
@@ -7,7 +7,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.List;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.random.WeightedRandomList;
 import net.minecraft.world.entity.MobCategory;
@@ -21,10 +20,9 @@ import net.minecraft.world.level.levelgen.StructureSettings;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 
 @Mixin(NoiseBasedChunkGenerator.class)
-// todo rename mixin after 1.15 is gone
-public abstract class NoiseChunkGenerator_husksSpawnMixin extends ChunkGenerator
+public abstract class NoiseBasedChunkGenerator_husksSpawnMixin extends ChunkGenerator
 {
-    public NoiseChunkGenerator_husksSpawnMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
+    public NoiseBasedChunkGenerator_husksSpawnMixin(BiomeSource biomeSource, StructureSettings structuresConfig)
     {
         super(biomeSource, structuresConfig);
     }
diff --git a/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java b/src/main/java/carpet/mixins/NoiseSampler_scarpetMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java
rename to src/main/java/carpet/mixins/NoiseSampler_scarpetMixin.java
index 46488650..53327359 100644
--- a/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/NoiseSampler_scarpetMixin.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(NoiseSampler.class)
-public abstract class NoiseColumnSamplerMixin_scarpetMixin implements NoiseColumnSamplerInterface {
+public abstract class NoiseSampler_scarpetMixin implements NoiseColumnSamplerInterface {
 
     @Shadow @Final
     private BlendedNoise blendedNoise;
@@ -198,12 +198,12 @@ public abstract class NoiseColumnSamplerMixin_scarpetMixin implements NoiseColum
             }
             case "spaghetti3dFirst" -> {
                 double d = this.spaghetti3DRarityModulator.getValue(x * 2, y, z * 2);
-                double e = CaveScalerMixin_scarpetMixin.invokeGetSpaghettiRarity3D(d);
+                double e = QuantizedSpaghettiRarityMixin_scarpetMixin.invokeGetSpaghettiRarity3D(d);
                 return sampleWithRarity(this.spaghetti3DNoiseSource1, x, y, z, e);
             }
             case "spaghetti3dSecond" -> {
                 double d = this.spaghetti3DRarityModulator.getValue(x * 2, y, z * 2);
-                double e = CaveScalerMixin_scarpetMixin.invokeGetSpaghettiRarity3D(d);
+                double e = QuantizedSpaghettiRarityMixin_scarpetMixin.invokeGetSpaghettiRarity3D(d);
                 return sampleWithRarity(this.spaghetti3DNoiseSource2, x, y, z, e);
             }
             case "spaghetti3dRarity" -> {
diff --git a/src/main/java/carpet/mixins/ScoreboardObjective_scarpetMixin.java b/src/main/java/carpet/mixins/Objective_scarpetMixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/ScoreboardObjective_scarpetMixin.java
rename to src/main/java/carpet/mixins/Objective_scarpetMixin.java
index fc1bc655..1c239613 100644
--- a/src/main/java/carpet/mixins/ScoreboardObjective_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/Objective_scarpetMixin.java
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Objective.class)
-public interface ScoreboardObjective_scarpetMixin {
+public interface Objective_scarpetMixin {
     @Mutable @Accessor("criteria")
     void setCriterion(ObjectiveCriteria criterion);
 }
diff --git a/src/main/java/carpet/mixins/EntityNavigation_pathfindingMixin.java b/src/main/java/carpet/mixins/PathNavigation_pathfindingMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/EntityNavigation_pathfindingMixin.java
rename to src/main/java/carpet/mixins/PathNavigation_pathfindingMixin.java
index 969a5be7..3b4abc82 100644
--- a/src/main/java/carpet/mixins/EntityNavigation_pathfindingMixin.java
+++ b/src/main/java/carpet/mixins/PathNavigation_pathfindingMixin.java
@@ -17,7 +17,7 @@ import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.phys.Vec3;
 
 @Mixin(PathNavigation.class)
-public abstract class EntityNavigation_pathfindingMixin
+public abstract class PathNavigation_pathfindingMixin
 {
 
     @Shadow @Final protected Mob mob;
diff --git a/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java b/src/main/java/carpet/mixins/PersistentEntitySectionManager_scarpetMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
rename to src/main/java/carpet/mixins/PersistentEntitySectionManager_scarpetMixin.java
index aa76162b..dabff91b 100644
--- a/src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/PersistentEntitySectionManager_scarpetMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PersistentEntitySectionManager.class)
-public class ServerEntityManager_scarpetMixin
+public class PersistentEntitySectionManager_scarpetMixin
 {
     @Inject(method = "addEntity(Lnet/minecraft/world/level/entity/EntityAccess;Z)Z", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java b/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java
index d881b612..96cdb355 100644
--- a/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java
+++ b/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java
@@ -10,8 +10,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.injection.At;
-//import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(PickaxeItem.class)
 public class PickaxeItem_missingToolsMixin extends DiggerItem
diff --git a/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java b/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java
rename to src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
index fb7595e3..2805a4ee 100644
--- a/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java
+++ b/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
@@ -9,7 +9,7 @@ import java.util.function.Predicate;
 import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier;
 
 @Mixin(PieceGeneratorSupplier.class)
-public interface StructureGeneratorFactory_plopMixin
+public interface PieceGeneratorSupplier_plopMixin
 {
     @SuppressWarnings("UnresolvedMixinReference")
     @Redirect(method = "method_39845", at = @At(
diff --git a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
rename to src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java
index 439674b0..aa49beb2 100644
--- a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java
@@ -27,9 +27,9 @@ import java.util.List;
 import java.util.Map;
 
 @Mixin(PistonBaseBlock.class)
-public abstract class PistonBlock_movableTEMixin extends DirectionalBlock
+public abstract class PistonBaseBlock_movableBEMixin extends DirectionalBlock
 {
-    protected PistonBlock_movableTEMixin(Properties block$Settings_1)
+    protected PistonBaseBlock_movableBEMixin(Properties block$Settings_1)
     {
         super(block$Settings_1);
     }
diff --git a/src/main/java/carpet/mixins/PistonBlock_qcMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/PistonBlock_qcMixin.java
rename to src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java
index 3d5eccc0..74d46e1f 100644
--- a/src/main/java/carpet/mixins/PistonBlock_qcMixin.java
+++ b/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PistonBaseBlock.class)
-public class PistonBlock_qcMixin
+public class PistonBaseBlock_qcMixin
 {
     @Inject(method = "getNeighborSignal", cancellable = true, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/PistonBlock_rotatorBlockMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java
similarity index 88%
rename from src/main/java/carpet/mixins/PistonBlock_rotatorBlockMixin.java
rename to src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java
index 1a69f671..d857d6b0 100644
--- a/src/main/java/carpet/mixins/PistonBlock_rotatorBlockMixin.java
+++ b/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(PistonBaseBlock.class)
-public abstract class PistonBlock_rotatorBlockMixin implements PistonBlockInterface
+public abstract class PistonBaseBlock_rotatorBlockMixin implements PistonBlockInterface
 {
     @Shadow protected abstract boolean getNeighborSignal(Level world_1, BlockPos blockPos_1, Direction direction_1);
 
diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java b/src/main/java/carpet/mixins/PistonHeadRenderer_movableBEMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
rename to src/main/java/carpet/mixins/PistonHeadRenderer_movableBEMixin.java
index 5316e5bd..87df4e34 100644
--- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/PistonHeadRenderer_movableBEMixin.java
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(PistonHeadRenderer.class)
-public abstract class PistonBlockEntityRenderer_movableTEMixin implements BlockEntityRenderer<PistonMovingBlockEntity>
+public abstract class PistonHeadRenderer_movableBEMixin implements BlockEntityRenderer<PistonMovingBlockEntity>
 {
     BlockEntityRenderDispatcher dispatcher;
     @Inject(method = "<init>", at = @At("TAIL"))
diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java
rename to src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
index 9e49a713..76d11166 100644
--- a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
@@ -20,10 +20,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PistonMovingBlockEntity.class)
-public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity implements PistonBlockEntityInterface
+public abstract class PistonMovingBlockEntity_movableBEMixin extends BlockEntity implements PistonBlockEntityInterface
 {
     @Shadow
     private boolean isSourcePiston;
@@ -34,7 +33,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple
     private boolean renderCarriedBlockEntity = false;
     private boolean renderSet = false;
 
-    public PistonBlockEntity_movableTEMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
+    public PistonMovingBlockEntity_movableBEMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
         super(blockEntityType, blockPos, blockState);
     }
 
diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_playerHandlingMixin.java b/src/main/java/carpet/mixins/PistonMovingBlockEntity_playerHandlingMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/PistonBlockEntity_playerHandlingMixin.java
rename to src/main/java/carpet/mixins/PistonMovingBlockEntity_playerHandlingMixin.java
index 2256a91d..983ef2e7 100644
--- a/src/main/java/carpet/mixins/PistonBlockEntity_playerHandlingMixin.java
+++ b/src/main/java/carpet/mixins/PistonMovingBlockEntity_playerHandlingMixin.java
@@ -20,11 +20,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PistonMovingBlockEntity.class)
-public abstract class PistonBlockEntity_playerHandlingMixin
+public abstract class PistonMovingBlockEntity_playerHandlingMixin
 {
-    @Shadow private BlockState movedState;
-
-    @Shadow public abstract Direction getMovementDirection();
 
     @Inject(method = "moveEntityByPiston", at = @At("HEAD"), cancellable = true)
     private static void dontPushSpectators(Direction direction, Entity entity, double d, Direction direction2, CallbackInfo ci)
@@ -55,13 +52,13 @@ public abstract class PistonBlockEntity_playerHandlingMixin
             Direction direction = pistonBlockEntity.getMovementDirection();
             switch(direction.getAxis()) {
                 case X:
-                    e = (double)direction.getStepX();
+                    e = direction.getStepX();
                     break;
                 case Y:
-                    f = (double)direction.getStepY();
+                    f = direction.getStepY();
                     break;
                 case Z:
-                    g = (double)direction.getStepZ();
+                    g = direction.getStepZ();
             }
 
             entity.setDeltaMovement(e, f, g);
diff --git a/src/main/java/carpet/mixins/PlayerManager_coreMixin.java b/src/main/java/carpet/mixins/PlayerList_coreMixin.java
similarity index 77%
rename from src/main/java/carpet/mixins/PlayerManager_coreMixin.java
rename to src/main/java/carpet/mixins/PlayerList_coreMixin.java
index b670629b..27f095ae 100644
--- a/src/main/java/carpet/mixins/PlayerManager_coreMixin.java
+++ b/src/main/java/carpet/mixins/PlayerList_coreMixin.java
@@ -2,12 +2,9 @@ package carpet.mixins;
 
 import carpet.CarpetServer;
 import net.minecraft.network.Connection;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -15,9 +12,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static carpet.script.CarpetEventServer.Event.PLAYER_CONNECTS;
 
 @Mixin(PlayerList.class)
-public class PlayerManager_coreMixin
+public class PlayerList_coreMixin
 {
-    @Shadow @Final private MinecraftServer server;
 
     @Inject(method = "placeNewPlayer", at = @At("RETURN"))
     private void onPlayerConnected(Connection connection, ServerPlayer player, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java b/src/main/java/carpet/mixins/PlayerList_fakePlayersMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java
rename to src/main/java/carpet/mixins/PlayerList_fakePlayersMixin.java
index 2d0333ce..9b9d6cc2 100644
--- a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java
+++ b/src/main/java/carpet/mixins/PlayerList_fakePlayersMixin.java
@@ -17,7 +17,7 @@ import carpet.patches.NetHandlerPlayServerFake;
 import carpet.patches.EntityPlayerMPFake;
 
 @Mixin(PlayerList.class)
-public abstract class PlayerManager_fakePlayersMixin
+public abstract class PlayerList_fakePlayersMixin
 {
     @Shadow
     @Final
diff --git a/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java b/src/main/java/carpet/mixins/PlayerList_scarpetEventsMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java
rename to src/main/java/carpet/mixins/PlayerList_scarpetEventsMixin.java
index 9da79636..cacfb50c 100644
--- a/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/PlayerList_scarpetEventsMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import static carpet.script.CarpetEventServer.Event.PLAYER_RESPAWNS;
 
 @Mixin(PlayerList.class)
-public class PlayerManager_scarpetEventsMixin
+public class PlayerList_scarpetEventsMixin
 {
     @Inject(method = "respawn", at = @At("HEAD"))
     private void onRespawn(ServerPlayer player, boolean olive, CallbackInfoReturnable<ServerPlayer> cir)
diff --git a/src/main/java/carpet/mixins/PlayerListHudMixin.java b/src/main/java/carpet/mixins/PlayerTabOverlayMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/PlayerListHudMixin.java
rename to src/main/java/carpet/mixins/PlayerTabOverlayMixin.java
index 899e4f50..a8fa51db 100644
--- a/src/main/java/carpet/mixins/PlayerListHudMixin.java
+++ b/src/main/java/carpet/mixins/PlayerTabOverlayMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(PlayerTabOverlay.class)
-public abstract class PlayerListHudMixin implements PlayerListHudInterface
+public abstract class PlayerTabOverlayMixin implements PlayerListHudInterface
 {
     @Shadow private Component footer;
 
diff --git a/src/main/java/carpet/mixins/Team_scarpetMixin.java b/src/main/java/carpet/mixins/PlayerTeam_scarpetMixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/Team_scarpetMixin.java
rename to src/main/java/carpet/mixins/PlayerTeam_scarpetMixin.java
index 019c84fe..779ae8bb 100644
--- a/src/main/java/carpet/mixins/Team_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/PlayerTeam_scarpetMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PlayerTeam.class)
-public interface Team_scarpetMixin
+public interface PlayerTeam_scarpetMixin
 {
     @Accessor("color")
     ChatFormatting getColor();
diff --git a/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java b/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java
rename to src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
index be00f9d7..621f7f4d 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java
+++ b/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_antiCheatDisabled
+public abstract class Player_antiCheatDisabledMixin
 {
     @Shadow public abstract ItemStack getItemBySlot(EquipmentSlot equipmentSlot_1);
 
diff --git a/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java b/src/main/java/carpet/mixins/Player_creativeNoClipMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java
rename to src/main/java/carpet/mixins/Player_creativeNoClipMixin.java
index 5a41f3f7..055f8e55 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/Player_creativeNoClipMixin.java
@@ -10,9 +10,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_creativeNoClipMixin extends LivingEntity
+public abstract class Player_creativeNoClipMixin extends LivingEntity
 {
-    protected PlayerEntity_creativeNoClipMixin(EntityType<? extends LivingEntity> type, Level world)
+    protected Player_creativeNoClipMixin(EntityType<? extends LivingEntity> type, Level world)
     {
         super(type, world);
     }
diff --git a/src/main/java/carpet/mixins/PlayerEntity_fakePlayersMixin.java b/src/main/java/carpet/mixins/Player_fakePlayersMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/PlayerEntity_fakePlayersMixin.java
rename to src/main/java/carpet/mixins/Player_fakePlayersMixin.java
index 71891f05..5004a848 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_fakePlayersMixin.java
+++ b/src/main/java/carpet/mixins/Player_fakePlayersMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_fakePlayersMixin
+public abstract class Player_fakePlayersMixin
 {
     /**
      * To make sure player attacks are able to knockback fake players
diff --git a/src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java b/src/main/java/carpet/mixins/Player_parrotMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java
rename to src/main/java/carpet/mixins/Player_parrotMixin.java
index 82e5ce6c..691230ef 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java
+++ b/src/main/java/carpet/mixins/Player_parrotMixin.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_parrotMixin extends LivingEntity
+public abstract class Player_parrotMixin extends LivingEntity
 {
     @Shadow @Final public Abilities abilities;
     
@@ -34,7 +34,7 @@ public abstract class PlayerEntity_parrotMixin extends LivingEntity
 
     @Shadow protected abstract void respawnEntityOnShoulder(CompoundTag entityNbt);
 
-    protected PlayerEntity_parrotMixin(EntityType<? extends LivingEntity> entityType_1, Level world_1)
+    protected Player_parrotMixin(EntityType<? extends LivingEntity> entityType_1, Level world_1)
     {
         super(entityType_1, world_1);
     }
diff --git a/src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java b/src/main/java/carpet/mixins/Player_portalDelayMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java
rename to src/main/java/carpet/mixins/Player_portalDelayMixin.java
index fce0ce41..01cd7924 100644
--- a/src/main/java/carpet/mixins/PlayerEntityMixin_portalDelayMixin.java
+++ b/src/main/java/carpet/mixins/Player_portalDelayMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(Player.class)
-public abstract class PlayerEntityMixin_portalDelayMixin
+public abstract class Player_portalDelayMixin
 {
     @Final @Shadow public Abilities abilities;
 
diff --git a/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java
rename to src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
index 621ac1d2..7ef8b1ea 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
@@ -25,9 +25,9 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_TAKES_DAMAGE;
 import static carpet.script.CarpetEventServer.Event.PLAYER_COLLIDES_WITH_ENTITY;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_scarpetEventsMixin extends LivingEntity
+public abstract class Player_scarpetEventsMixin extends LivingEntity
 {
-    protected PlayerEntity_scarpetEventsMixin(EntityType<? extends LivingEntity> type, Level world)
+    protected Player_scarpetEventsMixin(EntityType<? extends LivingEntity> type, Level world)
     {
         super(type, world);
     }
diff --git a/src/main/java/carpet/mixins/PlayerEntity_xpNoCooldownMixin.java b/src/main/java/carpet/mixins/Player_xpNoCooldownMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/PlayerEntity_xpNoCooldownMixin.java
rename to src/main/java/carpet/mixins/Player_xpNoCooldownMixin.java
index 9ace2e5c..0cd8e006 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_xpNoCooldownMixin.java
+++ b/src/main/java/carpet/mixins/Player_xpNoCooldownMixin.java
@@ -11,7 +11,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 
 @Mixin(Player.class)
-public abstract class PlayerEntity_xpNoCooldownMixin {
+public abstract class Player_xpNoCooldownMixin {
 
     @Shadow
     protected abstract void touch(Entity entity);
diff --git a/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java b/src/main/java/carpet/mixins/PoiRecord_scarpetMixin.java
similarity index 88%
rename from src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java
rename to src/main/java/carpet/mixins/PoiRecord_scarpetMixin.java
index 43d2053c..72466dca 100644
--- a/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/PoiRecord_scarpetMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(PoiRecord.class)
-public interface PointOfInterest_scarpetMixin
+public interface PoiRecord_scarpetMixin
 {
     @Accessor("freeTickets")
     int getFreeTickets();
diff --git a/src/main/java/carpet/mixins/TntEntityMixin.java b/src/main/java/carpet/mixins/PrimedTntMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/TntEntityMixin.java
rename to src/main/java/carpet/mixins/PrimedTntMixin.java
index 0aaef2c0..14706051 100644
--- a/src/main/java/carpet/mixins/TntEntityMixin.java
+++ b/src/main/java/carpet/mixins/PrimedTntMixin.java
@@ -18,7 +18,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 
 @Mixin(PrimedTnt.class)
-public abstract class TntEntityMixin extends Entity implements TntEntityInterface
+public abstract class PrimedTntMixin extends Entity implements TntEntityInterface
 {
     //@Shadow private int fuseTimer;
 
@@ -28,7 +28,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
     private boolean mergeBool = false;
     private int mergedTNT = 1;
 
-    public TntEntityMixin(EntityType<?> entityType_1, Level world_1)
+    public PrimedTntMixin(EntityType<?> entityType_1, Level world_1)
     {
         super(entityType_1, world_1);
     }
diff --git a/src/main/java/carpet/mixins/CaveScalerMixin_scarpetMixin.java b/src/main/java/carpet/mixins/QuantizedSpaghettiRarityMixin_scarpetMixin.java
similarity index 84%
rename from src/main/java/carpet/mixins/CaveScalerMixin_scarpetMixin.java
rename to src/main/java/carpet/mixins/QuantizedSpaghettiRarityMixin_scarpetMixin.java
index 9a249d61..260c7f3d 100644
--- a/src/main/java/carpet/mixins/CaveScalerMixin_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/QuantizedSpaghettiRarityMixin_scarpetMixin.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 
 
 @Mixin(NoiseSampler.QuantizedSpaghettiRarity.class)
-public interface CaveScalerMixin_scarpetMixin {
+public interface QuantizedSpaghettiRarityMixin_scarpetMixin {
     @Invoker
     static double invokeGetSpaghettiRarity3D(double d) {
         throw new AssertionError();
diff --git a/src/main/java/carpet/mixins/AbstractRecipeScreenHandler_scarpetMixin.java b/src/main/java/carpet/mixins/RecipeBookMenu_scarpetMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/AbstractRecipeScreenHandler_scarpetMixin.java
rename to src/main/java/carpet/mixins/RecipeBookMenu_scarpetMixin.java
index 86da2daf..d9b291bb 100644
--- a/src/main/java/carpet/mixins/AbstractRecipeScreenHandler_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/RecipeBookMenu_scarpetMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(RecipeBookMenu.class)
-public class AbstractRecipeScreenHandler_scarpetMixin {
+public class RecipeBookMenu_scarpetMixin {
     @Inject(method = "handlePlacement",at = @At("HEAD"), cancellable = true)
     private void selectRecipeCallback(boolean craftAll, Recipe<?> recipe, ServerPlayer player, CallbackInfo ci) {
         if(((ScreenHandlerInterface) this).callSelectRecipeListener(player,recipe,craftAll))
diff --git a/src/main/java/carpet/mixins/RedstoneWireBlockMixin.java b/src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/RedstoneWireBlockMixin.java
rename to src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java
index 8a602999..d80a3f08 100644
--- a/src/main/java/carpet/mixins/RedstoneWireBlockMixin.java
+++ b/src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java
@@ -4,16 +4,13 @@ import carpet.CarpetSettings;
 import carpet.fakes.RedstoneWireBlockInterface;
 import carpet.helpers.RedstoneWireTurbo;
 import com.google.common.collect.Sets;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -28,7 +25,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import static net.minecraft.world.level.block.RedStoneWireBlock.POWER;
 
 @Mixin(RedStoneWireBlock.class)
-public abstract class RedstoneWireBlockMixin implements RedstoneWireBlockInterface {
+public abstract class RedstoneWireBlock_fastMixin implements RedstoneWireBlockInterface {
 
     @Shadow
     private void updatePowerStrength(Level world_1, BlockPos blockPos_1, BlockState blockState_1) { }
diff --git a/src/main/java/carpet/mixins/SaplingBlockMixin.java b/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/SaplingBlockMixin.java
rename to src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java
index 58a7085a..79363e30 100644
--- a/src/main/java/carpet/mixins/SaplingBlockMixin.java
+++ b/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java
@@ -16,7 +16,7 @@ import net.minecraft.world.level.block.SaplingBlock;
 import net.minecraft.world.level.block.state.BlockState;
 
 @Mixin(SaplingBlock.class)
-public abstract class SaplingBlockMixin
+public abstract class SaplingBlock_desertShrubsMixin
 {
     @Inject(method = "advanceTree", at = @At(value = "INVOKE", shift = At.Shift.BEFORE,
             target = "Lnet/minecraft/world/level/block/grower/AbstractTreeGrower;growTree(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/Random;)Z"),
diff --git a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java b/src/main/java/carpet/mixins/ServerChunkCacheMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ServerChunkManagerMixin.java
rename to src/main/java/carpet/mixins/ServerChunkCacheMixin.java
index 93e940c1..a07f7087 100644
--- a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java
+++ b/src/main/java/carpet/mixins/ServerChunkCacheMixin.java
@@ -22,7 +22,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.storage.LevelData;
 
 @Mixin(ServerChunkCache.class)
-public abstract class ServerChunkManagerMixin implements ServerChunkManagerInterface
+public abstract class ServerChunkCacheMixin implements ServerChunkManagerInterface
 {
     @Shadow @Final private ServerLevel level;
 
diff --git a/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java b/src/main/java/carpet/mixins/ServerChunkCache_tickMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java
rename to src/main/java/carpet/mixins/ServerChunkCache_tickMixin.java
index ddb5ad8c..38ae777c 100644
--- a/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java
+++ b/src/main/java/carpet/mixins/ServerChunkCache_tickMixin.java
@@ -22,7 +22,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
 import com.google.common.collect.Lists;
 
 @Mixin(ServerChunkCache.class)
-public abstract class ServerChunkManager_tickMixin
+public abstract class ServerChunkCache_tickMixin
 {
 
     @Shadow @Final private ServerLevel level;
diff --git a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java b/src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java
rename to src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java
index a96d1460..d2d71423 100644
--- a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java
+++ b/src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java
@@ -16,7 +16,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
 
 @Mixin(ServerEntity.class)
-public class EntityTrackerEntry_leashFixMixin
+public class ServerEntity_leashFixMixin
 {
     @Shadow @Final private Entity entity;
 
diff --git a/src/main/java/carpet/mixins/CommandFunctionManager_tickMixin.java b/src/main/java/carpet/mixins/ServerFunctionManager_tickMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/CommandFunctionManager_tickMixin.java
rename to src/main/java/carpet/mixins/ServerFunctionManager_tickMixin.java
index ab292bde..a1b46112 100644
--- a/src/main/java/carpet/mixins/CommandFunctionManager_tickMixin.java
+++ b/src/main/java/carpet/mixins/ServerFunctionManager_tickMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerFunctionManager.class)
-public class CommandFunctionManager_tickMixin
+public class ServerFunctionManager_tickMixin
 {
     CarpetProfiler.ProfilerToken currentSection;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandlerMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImplMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandlerMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImplMixin.java
index 6dc1c8bc..6c329268 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandlerMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImplMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class ServerPlayNetworkHandlerMixin
+public class ServerGamePacketListenerImplMixin
 {
     @Shadow public ServerPlayer player;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_antiCheatDisabledMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImpl_antiCheatDisabledMixin.java
index 2e8301d1..c49186d9 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_antiCheatDisabledMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerPlayNetworkHandler_antiCheatDisabledMixin
+public abstract class ServerGamePacketListenerImpl_antiCheatDisabledMixin
 {
     @Shadow private int aboveGroundTickCount;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_coreMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImpl_coreMixin.java
index b7919f57..5048105c 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_coreMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static carpet.script.CarpetEventServer.Event.PLAYER_DISCONNECTS;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class ServerPlayNetworkHandler_coreMixin {
+public class ServerGamePacketListenerImpl_coreMixin {
     @Shadow
     public ServerPlayer player;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_interactionUpdatesMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImpl_interactionUpdatesMixin.java
index 85b5188a..227c4e93 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_interactionUpdatesMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class ServerPlayNetworkHandler_interactionUpdatesMixin
+public class ServerGamePacketListenerImpl_interactionUpdatesMixin
 {
     @Inject(method = "handleUseItemOn", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
index 630155c7..fd4d5167 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
@@ -7,13 +7,11 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static carpet.script.CarpetEventServer.Event.PLAYER_ATTACKS_ENTITY;
 import static carpet.script.CarpetEventServer.Event.PLAYER_CLICKS_BLOCK;
 import static carpet.script.CarpetEventServer.Event.PLAYER_DEPLOYS_ELYTRA;
 import static carpet.script.CarpetEventServer.Event.PLAYER_DROPS_ITEM;
 import static carpet.script.CarpetEventServer.Event.PLAYER_DROPS_STACK;
 import static carpet.script.CarpetEventServer.Event.PLAYER_ESCAPES_SLEEP;
-import static carpet.script.CarpetEventServer.Event.PLAYER_INTERACTS_WITH_ENTITY;
 import static carpet.script.CarpetEventServer.Event.PLAYER_RELEASED_ITEM;
 import static carpet.script.CarpetEventServer.Event.PLAYER_RIDES;
 import static carpet.script.CarpetEventServer.Event.PLAYER_JUMPS;
@@ -47,7 +45,7 @@ import net.minecraft.world.phys.BlockHitResult;
 
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class ServerPlayNetworkHandler_scarpetEventsMixin
+public class ServerGamePacketListenerImpl_scarpetEventsMixin
 {
     @Shadow public ServerPlayer player;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_tickMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java
rename to src/main/java/carpet/mixins/ServerGamePacketListenerImpl_tickMixin.java
index 4c5c29d5..b1b7e6d0 100644
--- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_tickMixin.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class ServerPlayNetworkHandler_tickMixin
+public class ServerGamePacketListenerImpl_tickMixin
 {
     @Shadow public ServerPlayer player;
 
diff --git a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java b/src/main/java/carpet/mixins/ServerLevel_scarpetMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
rename to src/main/java/carpet/mixins/ServerLevel_scarpetMixin.java
index 6b0206a0..1f3ac7bd 100644
--- a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/ServerLevel_scarpetMixin.java
@@ -1,8 +1,6 @@
 package carpet.mixins;
 
-import carpet.CarpetSettings;
 import carpet.fakes.ServerWorldInterface;
-import carpet.script.CarpetEventServer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
@@ -22,7 +20,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@@ -31,7 +28,7 @@ import static carpet.script.CarpetEventServer.Event.EXPLOSION;
 import static carpet.script.CarpetEventServer.Event.LIGHTNING;
 
 @Mixin(ServerLevel.class)
-public class ServerWorld_scarpetMixin implements ServerWorldInterface
+public class ServerLevel_scarpetMixin implements ServerWorldInterface
 {
     @Inject(method = "tickChunk", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/ServerWorld_spawnChunksMixin.java b/src/main/java/carpet/mixins/ServerLevel_spawnChunksMixin.java
similarity index 92%
rename from src/main/java/carpet/mixins/ServerWorld_spawnChunksMixin.java
rename to src/main/java/carpet/mixins/ServerLevel_spawnChunksMixin.java
index fe729f60..c00b6dc3 100644
--- a/src/main/java/carpet/mixins/ServerWorld_spawnChunksMixin.java
+++ b/src/main/java/carpet/mixins/ServerLevel_spawnChunksMixin.java
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 @Mixin(ServerLevel.class)
-public class ServerWorld_spawnChunksMixin
+public class ServerLevel_spawnChunksMixin
 {
     @ModifyConstant(method = "setDefaultSpawnPos", constant = @Constant(intValue = 11), expect = 2)
     private int pushLimit(int original)
diff --git a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java b/src/main/java/carpet/mixins/ServerLevel_tickMixin.java
similarity index 98%
rename from src/main/java/carpet/mixins/ServerWorld_tickMixin.java
rename to src/main/java/carpet/mixins/ServerLevel_tickMixin.java
index d7042d2d..1883d308 100644
--- a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java
+++ b/src/main/java/carpet/mixins/ServerLevel_tickMixin.java
@@ -21,9 +21,9 @@ import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.storage.WritableLevelData;
 
 @Mixin(ServerLevel.class)
-public abstract class ServerWorld_tickMixin extends Level
+public abstract class ServerLevel_tickMixin extends Level
 {
-    protected ServerWorld_tickMixin(WritableLevelData properties, ResourceKey<Level> registryKey, DimensionType dimensionType, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l)
+    protected ServerLevel_tickMixin(WritableLevelData properties, ResourceKey<Level> registryKey, DimensionType dimensionType, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l)
     {
         super(properties, registryKey, dimensionType, supplier, bl, bl2, l);
     }
diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java
rename to src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java
index ca2254ac..fb5dd970 100644
--- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = ServerPlayerGameMode.class, priority = 69420) // not that important for carpet
-public class ServerPlayerInteractionManager_antiCheatMixin
+public class ServerPlayerGameMode_antiCheatMixin
 {
     /*
     @ModifyConstant(method = "processBlockBreakingAction", require = 0,
diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_cactusMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ServerPlayerInteractionManager_cactusMixin.java
rename to src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java
index b215d33b..75527042 100644
--- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_cactusMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerPlayerGameMode.class)
-public class ServerPlayerInteractionManager_cactusMixin
+public class ServerPlayerGameMode_cactusMixin
 {
 
     @Redirect(method = "useItemOn", at = @At(
diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
rename to src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
index 927a5168..1ad57ea1 100644
--- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
@@ -26,7 +26,7 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_INTERACTS_WITH_BLOCK;
 
 
 @Mixin(ServerPlayerGameMode.class)
-public class ServerPlayerInteractionManager_scarpetEventsMixin implements ServerPlayerInteractionManagerInterface
+public class ServerPlayerGameMode_scarpetEventsMixin implements ServerPlayerInteractionManagerInterface
 {
     @Shadow public ServerPlayer player;
 
diff --git a/src/main/java/carpet/mixins/ServerPlayerEntityMixin.java b/src/main/java/carpet/mixins/ServerPlayerMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/ServerPlayerEntityMixin.java
rename to src/main/java/carpet/mixins/ServerPlayerMixin.java
index 5b8b5108..5900c7b8 100644
--- a/src/main/java/carpet/mixins/ServerPlayerEntityMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayerMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerPlayer.class)
-public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface
+public abstract class ServerPlayerMixin implements ServerPlayerEntityInterface
 {
     @Unique
     public EntityPlayerActionPack actionPack;
diff --git a/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java b/src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
rename to src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java
index 369ba244..1ee3d69b 100644
--- a/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java
@@ -31,14 +31,14 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_FINISHED_USING_ITEM;
 import static carpet.script.CarpetEventServer.Event.STATISTICS;
 
 @Mixin(ServerPlayer.class)
-public abstract class ServerPlayerEntity_scarpetEventMixin extends Player implements ServerPlayerEntityInterface
+public abstract class ServerPlayer_scarpetEventMixin extends Player implements ServerPlayerEntityInterface
 {
     // to denote if the player reference is valid
 
     @Unique
     private boolean isInvalidReference = false;
 
-    public ServerPlayerEntity_scarpetEventMixin(Level world, BlockPos blockPos, float f, GameProfile gameProfile)
+    public ServerPlayer_scarpetEventMixin(Level world, BlockPos blockPos, float f, GameProfile gameProfile)
     {
         super(world, blockPos, f, gameProfile);
     }
diff --git a/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java b/src/main/java/carpet/mixins/ServerPlayer_updateSuppressionCrashFixMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java
rename to src/main/java/carpet/mixins/ServerPlayer_updateSuppressionCrashFixMixin.java
index 5d177801..f0acd5a3 100644
--- a/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayer_updateSuppressionCrashFixMixin.java
@@ -16,9 +16,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerPlayer.class)
-public abstract class ServerPlayerEntity_updateSuppressionCrashFixMixin extends Player {
+public abstract class ServerPlayer_updateSuppressionCrashFixMixin extends Player {
 
-    public ServerPlayerEntity_updateSuppressionCrashFixMixin(Level world, BlockPos pos, float yaw, GameProfile profile) {
+    public ServerPlayer_updateSuppressionCrashFixMixin(Level world, BlockPos pos, float yaw, GameProfile profile) {
         super(world, pos, yaw, profile);
     }
 
diff --git a/src/main/java/carpet/mixins/ServerMetadata_motdMixin.java b/src/main/java/carpet/mixins/ServerStatus_motdMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ServerMetadata_motdMixin.java
rename to src/main/java/carpet/mixins/ServerStatus_motdMixin.java
index 1aff6cad..c73512c6 100644
--- a/src/main/java/carpet/mixins/ServerMetadata_motdMixin.java
+++ b/src/main/java/carpet/mixins/ServerStatus_motdMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ServerStatus.class)
-public class ServerMetadata_motdMixin
+public class ServerStatus_motdMixin
 {
     @Inject(method = "getDescription", at = @At("HEAD"), cancellable = true)
     private void getDescriptionAlternative(CallbackInfoReturnable<Component> cir)
diff --git a/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java b/src/main/java/carpet/mixins/ServerboundPlayerActionPacketMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java
rename to src/main/java/carpet/mixins/ServerboundPlayerActionPacketMixin.java
index 9ad21549..0d1367d6 100644
--- a/src/main/java/carpet/mixins/PlayerActionC2SPacketMixin.java
+++ b/src/main/java/carpet/mixins/ServerboundPlayerActionPacketMixin.java
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ServerboundPlayerActionPacket.class)
-public interface PlayerActionC2SPacketMixin
+public interface ServerboundPlayerActionPacketMixin
 {
     @Accessor("pos")
     void setPos(BlockPos pos);
diff --git a/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java b/src/main/java/carpet/mixins/ServerboundSetStructureBlockPacketMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java
rename to src/main/java/carpet/mixins/ServerboundSetStructureBlockPacketMixin.java
index 61cc35c7..6f313e10 100644
--- a/src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java
+++ b/src/main/java/carpet/mixins/ServerboundSetStructureBlockPacketMixin.java
@@ -1,8 +1,6 @@
 package carpet.mixins;
 
-import carpet.CarpetServer;
 import carpet.CarpetSettings;
-import carpet.network.CarpetClient;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.network.FriendlyByteBuf;
@@ -17,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerboundSetStructureBlockPacket.class)
-public class UpdateStructureBlockC2SPacketMixin {
+public class ServerboundSetStructureBlockPacketMixin {
     @Mutable @Final @Shadow
     private BlockPos offset;
     @Mutable @Final @Shadow
diff --git a/src/main/java/carpet/mixins/SetBlockCommandMixin.java b/src/main/java/carpet/mixins/SetBlockCommand_fillUpdatesMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/SetBlockCommandMixin.java
rename to src/main/java/carpet/mixins/SetBlockCommand_fillUpdatesMixin.java
index 30928c29..95df92ef 100644
--- a/src/main/java/carpet/mixins/SetBlockCommandMixin.java
+++ b/src/main/java/carpet/mixins/SetBlockCommand_fillUpdatesMixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(SetBlockCommand.class)
-public class SetBlockCommandMixin
+public class SetBlockCommand_fillUpdatesMixin
 {
     @Redirect(method = "setBlock", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/SkeletonHorseTrapTriggerGoal_extremeMixin.java b/src/main/java/carpet/mixins/SkeletonTrapGoal_extremeMixin.java
similarity index 91%
rename from src/main/java/carpet/mixins/SkeletonHorseTrapTriggerGoal_extremeMixin.java
rename to src/main/java/carpet/mixins/SkeletonTrapGoal_extremeMixin.java
index a5ae8324..a1cf9126 100644
--- a/src/main/java/carpet/mixins/SkeletonHorseTrapTriggerGoal_extremeMixin.java
+++ b/src/main/java/carpet/mixins/SkeletonTrapGoal_extremeMixin.java
@@ -9,7 +9,7 @@ import java.util.Random;
 import net.minecraft.world.entity.animal.horse.SkeletonTrapGoal;
 
 @Mixin(SkeletonTrapGoal.class)
-public class SkeletonHorseTrapTriggerGoal_extremeMixin
+public class SkeletonTrapGoal_extremeMixin
 {
     @Redirect(method = "tick", expect = 2, at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/SkyLightSectionStorage_scarpetChunkCreationMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/SkyLightSectionStorage_scarpetChunkCreationMixin.java
index 4e41b9fa..35d9ba7f 100644
--- a/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/SkyLightSectionStorage_scarpetChunkCreationMixin.java
@@ -19,9 +19,9 @@ import net.minecraft.world.level.lighting.LayerLightSectionStorage;
 import net.minecraft.world.level.lighting.SkyLightSectionStorage;
 
 @Mixin(SkyLightSectionStorage.class)
-public abstract class SkyLightStorage_scarpetChunkCreationMixin extends LayerLightSectionStorage<BlockDataLayerStorageMap> implements LightStorageInterface
+public abstract class SkyLightSectionStorage_scarpetChunkCreationMixin extends LayerLightSectionStorage<BlockDataLayerStorageMap> implements LightStorageInterface
 {
-    protected SkyLightStorage_scarpetChunkCreationMixin(final LightLayer lightType, final LightChunkGetter chunkProvider, final BlockDataLayerStorageMap lightData)
+    protected SkyLightSectionStorage_scarpetChunkCreationMixin(final LightLayer lightType, final LightChunkGetter chunkProvider, final BlockDataLayerStorageMap lightData)
     {
         super(lightType, chunkProvider, lightData);
     }
@@ -59,7 +59,7 @@ public abstract class SkyLightStorage_scarpetChunkCreationMixin extends LayerLig
     @Override
     public void processRelight(final LayerLightEngine<?, ?> lightProvider, final long cPos)
     {
-        final LevelPropagator_resetChunkInterface levelPropagator = (LevelPropagator_resetChunkInterface) lightProvider;
+        final DynamicGraphMinFixedPoint_resetChunkInterface levelPropagator = (DynamicGraphMinFixedPoint_resetChunkInterface) lightProvider;
 
         for (int y = -1; y < 17; ++y)
         {
diff --git a/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java b/src/main/java/carpet/mixins/SoundEngine_cleanLogsMixin.java
similarity index 71%
rename from src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java
rename to src/main/java/carpet/mixins/SoundEngine_cleanLogsMixin.java
index ec47b34b..ab5e5dd2 100644
--- a/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java
+++ b/src/main/java/carpet/mixins/SoundEngine_cleanLogsMixin.java
@@ -1,14 +1,10 @@
 package carpet.mixins;
 
-import carpet.CarpetSettings;
 import net.minecraft.client.sounds.SoundEngine;
-import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = SoundEngine.class, priority = 69420)
-public class SoundSystem_cleanLogsMixin
+public class SoundEngine_cleanLogsMixin
 {
     /*@Redirect(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", require = 0, at = @At( remap = false,
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java b/src/main/java/carpet/mixins/SpawnStateMixin.java
similarity index 77%
rename from src/main/java/carpet/mixins/SpawnHelperInnerMixin.java
rename to src/main/java/carpet/mixins/SpawnStateMixin.java
index 9ffb9db1..44d68cf6 100644
--- a/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java
+++ b/src/main/java/carpet/mixins/SpawnStateMixin.java
@@ -1,19 +1,14 @@
 package carpet.mixins;
 
 import carpet.fakes.SpawnHelperInnerInterface;
-import carpet.utils.SpawnReporter;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.world.level.NaturalSpawner;
 import net.minecraft.world.level.PotentialCalculator;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(NaturalSpawner.SpawnState.class)
-public class SpawnHelperInnerMixin implements SpawnHelperInnerInterface
+public class SpawnStateMixin implements SpawnHelperInnerInterface
 {
     @Shadow @Final private int spawnableChunkCount;
 
diff --git a/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java b/src/main/java/carpet/mixins/StandingAndWallBlockItem_creativeNoClipMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java
rename to src/main/java/carpet/mixins/StandingAndWallBlockItem_creativeNoClipMixin.java
index a838f10d..5d076ae1 100644
--- a/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/StandingAndWallBlockItem_creativeNoClipMixin.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(StandingAndWallBlockItem.class)
-public class WallStandingBlockItem_creativeNoClipMixin
+public class StandingAndWallBlockItem_creativeNoClipMixin
 {
     @Redirect(method = "getPlacementState", at = @At(
                 value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureBlockEntity_fillUpdatesMixin.java
similarity index 96%
rename from src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java
rename to src/main/java/carpet/mixins/StructureBlockEntity_fillUpdatesMixin.java
index 0bc156ae..568609d9 100644
--- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/StructureBlockEntity_fillUpdatesMixin.java
@@ -13,7 +13,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlac
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 
 @Mixin(StructureBlockEntity.class)
-public abstract class StructureBlockBlockEntity_fillUpdatesMixin
+public abstract class StructureBlockEntity_fillUpdatesMixin
 {
     @Redirect(method = "Lnet/minecraft/world/level/block/entity/StructureBlockEntity;loadStructure(Lnet/minecraft/server/level/ServerLevel;ZLnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;)Z", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java b/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
similarity index 92%
rename from src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java
rename to src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
index 6d129df9..458bf47d 100644
--- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java
+++ b/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
@@ -1,8 +1,6 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.StructureBlockEntity;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 @Mixin(StructureBlockEntity.class)
-public abstract class StructureBlockBlockEntity_limitsMixin
+public abstract class StructureBlockEntity_limitsMixin
 {
     @ModifyConstant(
             method = "load",
diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java b/src/main/java/carpet/mixins/StructureBlockRenderer_mixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java
rename to src/main/java/carpet/mixins/StructureBlockRenderer_mixin.java
index c6f044fc..56bd7974 100644
--- a/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java
+++ b/src/main/java/carpet/mixins/StructureBlockRenderer_mixin.java
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(StructureBlockRenderer.class)
-public abstract class StructureBlockBlockEntityRenderer_mixin implements BlockEntityRenderer<StructureBlockEntity>
+public abstract class StructureBlockRenderer_mixin implements BlockEntityRenderer<StructureBlockEntity>
 {
     @Inject(method = "getViewDistance", at = @At("HEAD"), cancellable = true)
     void newLimit(CallbackInfoReturnable<Integer> cir)
diff --git a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureTemplate_fillUpdatesMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java
rename to src/main/java/carpet/mixins/StructureTemplate_fillUpdatesMixin.java
index 5836d55b..572f6d3e 100644
--- a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/StructureTemplate_fillUpdatesMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(StructureTemplate.class)
-public class Structure_fillUpdatesMixin
+public class StructureTemplate_fillUpdatesMixin
 {
     @Redirect( method = "placeInWorld(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings;Ljava/util/Random;I)Z", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/SummonCommandMixin.java b/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/SummonCommandMixin.java
rename to src/main/java/carpet/mixins/SummonCommand_lightningMixin.java
index b0d3468c..c71037af 100644
--- a/src/main/java/carpet/mixins/SummonCommandMixin.java
+++ b/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(SummonCommand.class)
-public class SummonCommandMixin
+public class SummonCommand_lightningMixin
 {
     @Redirect(method = "spawnEntity", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java b/src/main/java/carpet/mixins/SystemReport_addScarpetAppsMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java
rename to src/main/java/carpet/mixins/SystemReport_addScarpetAppsMixin.java
index 6478744b..b449059e 100644
--- a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java
+++ b/src/main/java/carpet/mixins/SystemReport_addScarpetAppsMixin.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import carpet.CarpetServer;
 
 @Mixin(SystemReport.class)
-public abstract class CrashReport_addScarpetAppsMixin
+public abstract class SystemReport_addScarpetAppsMixin
 {
     @Shadow public abstract void setDetail(String name, Supplier<String> valueSupplier);
 
diff --git a/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java b/src/main/java/carpet/mixins/TheEndGatewayBlockEntity_creativeNoClipMixin.java
similarity index 92%
rename from src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java
rename to src/main/java/carpet/mixins/TheEndGatewayBlockEntity_creativeNoClipMixin.java
index 8ae40e65..635269db 100644
--- a/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/TheEndGatewayBlockEntity_creativeNoClipMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TheEndGatewayBlockEntity.class)
-public class EndGatewayBlockEntity_creativeNoClipMixin
+public class TheEndGatewayBlockEntity_creativeNoClipMixin
 {
     @Inject(method = "canEntityTeleport", cancellable = true, at = @At("HEAD"))
     private static void checkFlyingCreative(Entity entity, CallbackInfoReturnable<Boolean> cir)
diff --git a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetChunkCreationMixin.java
similarity index 90%
rename from src/main/java/carpet/mixins/ServerLightingProvider_scarpetChunkCreationMixin.java
rename to src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetChunkCreationMixin.java
index fd3bab2c..5f67c20b 100644
--- a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetChunkCreationMixin.java
@@ -21,9 +21,9 @@ import carpet.fakes.ServerLightingProviderInterface;
 import carpet.fakes.ThreadedAnvilChunkStorageInterface;
 
 @Mixin(ThreadedLevelLightEngine.class)
-public abstract class ServerLightingProvider_scarpetChunkCreationMixin extends LevelLightEngine implements ServerLightingProviderInterface
+public abstract class ThreadedLevelLightEngine_scarpetChunkCreationMixin extends LevelLightEngine implements ServerLightingProviderInterface
 {
-    private ServerLightingProvider_scarpetChunkCreationMixin(final LightChunkGetter chunkProvider, final boolean hasBlockLight, final boolean hasSkyLight)
+    private ThreadedLevelLightEngine_scarpetChunkCreationMixin(final LightChunkGetter chunkProvider, final boolean hasBlockLight, final boolean hasSkyLight)
     {
         super(chunkProvider, hasBlockLight, hasSkyLight);
     }
diff --git a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java b/src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetMixin.java
similarity index 88%
rename from src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java
rename to src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetMixin.java
index 7ba1d418..bc87dd51 100644
--- a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/ThreadedLevelLightEngine_scarpetMixin.java
@@ -14,11 +14,11 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ThreadedLevelLightEngine.class)
-public abstract class ServerLightingProvider_scarpetMixin extends LevelLightEngine implements ServerLightingProviderInterface
+public abstract class ThreadedLevelLightEngine_scarpetMixin extends LevelLightEngine implements ServerLightingProviderInterface
 {
     @Shadow public abstract void checkBlock(BlockPos pos);
 
-    public ServerLightingProvider_scarpetMixin(LightChunkGetter chunkProvider, boolean hasBlockLight, boolean hasSkyLight)
+    public ThreadedLevelLightEngine_scarpetMixin(LightChunkGetter chunkProvider, boolean hasBlockLight, boolean hasSkyLight)
     {
         super(chunkProvider, hasBlockLight, hasSkyLight);
     }
diff --git a/src/main/java/carpet/mixins/ThrownEntityMixin.java b/src/main/java/carpet/mixins/ThrowableProjectileMixin.java
similarity index 89%
rename from src/main/java/carpet/mixins/ThrownEntityMixin.java
rename to src/main/java/carpet/mixins/ThrowableProjectileMixin.java
index e82c5a32..20533e20 100644
--- a/src/main/java/carpet/mixins/ThrownEntityMixin.java
+++ b/src/main/java/carpet/mixins/ThrowableProjectileMixin.java
@@ -13,10 +13,10 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ThrowableProjectile.class)
-public abstract class ThrownEntityMixin extends Entity
+public abstract class ThrowableProjectileMixin extends Entity
 {
     private TrajectoryLogHelper logHelper;
-    public ThrownEntityMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
+    public ThrowableProjectileMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
 
     @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN"))
     private void addLogger(EntityType<? extends Projectile> entityType_1, Level world_1, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java b/src/main/java/carpet/mixins/Timer_tickSpeedMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java
rename to src/main/java/carpet/mixins/Timer_tickSpeedMixin.java
index 038d54fa..57994cac 100644
--- a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java
+++ b/src/main/java/carpet/mixins/Timer_tickSpeedMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Timer.class)
-public class RenderTickCounter_tickSpeedMixin {
+public class Timer_tickSpeedMixin {
     @Redirect(method = "advanceTime", at = @At(
             value = "FIELD",
             target = "Lnet/minecraft/client/Timer;msPerTick:F"
diff --git a/src/main/java/carpet/mixins/TntBlockMixin.java b/src/main/java/carpet/mixins/TntBlock_noUpdateMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/TntBlockMixin.java
rename to src/main/java/carpet/mixins/TntBlock_noUpdateMixin.java
index 02f238ac..691ae973 100644
--- a/src/main/java/carpet/mixins/TntBlockMixin.java
+++ b/src/main/java/carpet/mixins/TntBlock_noUpdateMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(TntBlock.class)
-public abstract class TntBlockMixin
+public abstract class TntBlock_noUpdateMixin
 {
     // Add carpet rule check for tntDoNotUpdate to an if statement.
     @Redirect(method = "onPlace", at = @At(value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/ItemUsageContext_cactusMixin.java b/src/main/java/carpet/mixins/UseOnContext_cactusMixin.java
similarity index 95%
rename from src/main/java/carpet/mixins/ItemUsageContext_cactusMixin.java
rename to src/main/java/carpet/mixins/UseOnContext_cactusMixin.java
index df0ecc23..ded31175 100644
--- a/src/main/java/carpet/mixins/ItemUsageContext_cactusMixin.java
+++ b/src/main/java/carpet/mixins/UseOnContext_cactusMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(UseOnContext.class)
-public class ItemUsageContext_cactusMixin
+public class UseOnContext_cactusMixin
 {
     @Redirect(method = "getHorizontalDirection", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/Villager_aiMixin.java
similarity index 97%
rename from src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
rename to src/main/java/carpet/mixins/Villager_aiMixin.java
index 3539b879..c48f2dc4 100644
--- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
+++ b/src/main/java/carpet/mixins/Villager_aiMixin.java
@@ -40,7 +40,7 @@ import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.phys.Vec3;
 
 @Mixin(Villager.class)
-public abstract class VillagerEntity_aiMixin extends AbstractVillager
+public abstract class Villager_aiMixin extends AbstractVillager
 {
     @Shadow protected abstract void setUnhappy();
 
@@ -52,7 +52,7 @@ public abstract class VillagerEntity_aiMixin extends AbstractVillager
     boolean hasBed;
     int displayAge;
 
-    public VillagerEntity_aiMixin(EntityType<? extends AbstractVillager> entityType_1, Level world_1)
+    public Villager_aiMixin(EntityType<? extends AbstractVillager> entityType_1, Level world_1)
     {
         super(entityType_1, world_1);
     }
diff --git a/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java b/src/main/java/carpet/mixins/WitherBoss_extremeMixin.java
similarity index 94%
rename from src/main/java/carpet/mixins/WitherEntity_extremeMixin.java
rename to src/main/java/carpet/mixins/WitherBoss_extremeMixin.java
index 860be204..2d07fbd1 100644
--- a/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java
+++ b/src/main/java/carpet/mixins/WitherBoss_extremeMixin.java
@@ -10,7 +10,7 @@ import java.util.Random;
 import net.minecraft.world.entity.boss.wither.WitherBoss;
 
 @Mixin(WitherBoss.class)
-public class WitherEntity_extremeMixin
+public class WitherBoss_extremeMixin
 {
     @Redirect(method = "performRangedAttack(ILnet/minecraft/world/entity/LivingEntity;)V", at = @At(
             value = "INVOKE",
diff --git a/src/main/java/carpet/mixins/CarpetBlockMixin.java b/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java
similarity index 87%
rename from src/main/java/carpet/mixins/CarpetBlockMixin.java
rename to src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java
index 887e8930..e5a3239c 100644
--- a/src/main/java/carpet/mixins/CarpetBlockMixin.java
+++ b/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java
@@ -9,10 +9,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(WoolCarpetBlock.class) // WoolCarpetBlock
-public abstract class CarpetBlockMixin extends Block
+public abstract class WoolCarpetBlock_placeMixin extends Block
 {
 
-    public CarpetBlockMixin(Properties block$Settings_1)
+    public WoolCarpetBlock_placeMixin(Properties block$Settings_1)
     {
         super(block$Settings_1);
     }
diff --git a/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java b/src/main/java/carpet/mixins/WorldGenRegion_scarpetPlopMixin.java
similarity index 93%
rename from src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java
rename to src/main/java/carpet/mixins/WorldGenRegion_scarpetPlopMixin.java
index 8558a966..23bb45ec 100644
--- a/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java
+++ b/src/main/java/carpet/mixins/WorldGenRegion_scarpetPlopMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(WorldGenRegion.class)
-public class ChunkRegion_scarpetPlopMixin
+public class WorldGenRegion_scarpetPlopMixin
 {
     @Inject(method = "markPosForPostprocessing", at = @At("HEAD"), cancellable = true)
     private void markOrNot(BlockPos blockPos, CallbackInfo ci)
diff --git a/src/main/java/carpet/script/api/Scoreboards.java b/src/main/java/carpet/script/api/Scoreboards.java
index 9d9029db..51af6ab5 100644
--- a/src/main/java/carpet/script/api/Scoreboards.java
+++ b/src/main/java/carpet/script/api/Scoreboards.java
@@ -1,11 +1,10 @@
 package carpet.script.api;
 
-import carpet.mixins.ScoreboardObjective_scarpetMixin;
+import carpet.mixins.Objective_scarpetMixin;
 import carpet.mixins.Scoreboard_scarpetMixin;
-import carpet.mixins.Team_scarpetMixin;
+import carpet.mixins.PlayerTeam_scarpetMixin;
 import carpet.script.CarpetContext;
 import carpet.script.Expression;
-import carpet.script.LazyValue;
 import carpet.script.exception.InternalExpressionException;
 import carpet.script.exception.ThrowStatement;
 import carpet.script.exception.Throwables;
@@ -148,7 +147,7 @@ public class Scoreboards {
                 if(lv.size() == 1) return StringValue.of(objective.getCriteria().getName());
                 if(objective.getCriteria().equals(criterion) || lv.size() == 1) return Value.NULL;
                 ((Scoreboard_scarpetMixin)scoreboard).getObjectivesByCriterion().get(objective.getCriteria()).remove(objective);
-                ((ScoreboardObjective_scarpetMixin) objective).setCriterion(criterion);
+                ((Objective_scarpetMixin) objective).setCriterion(criterion);
                 (((Scoreboard_scarpetMixin)scoreboard).getObjectivesByCriterion().computeIfAbsent(criterion, (criterion1) -> Lists.newArrayList())).add(objective);
                 scoreboard.onObjectiveAdded(objective);
                 return Value.FALSE;
@@ -179,7 +178,7 @@ public class Scoreboards {
                         if (criterion==null) throw new InternalExpressionException("Unknown scoreboard criterion: "+ setValue.getString());
                         if(objective.getCriteria().equals(criterion) || lv.size() == 1) return Value.FALSE;
                         ((Scoreboard_scarpetMixin)scoreboard).getObjectivesByCriterion().get(objective.getCriteria()).remove(objective);
-                        ((ScoreboardObjective_scarpetMixin) objective).setCriterion(criterion);
+                        ((Objective_scarpetMixin) objective).setCriterion(criterion);
                         (((Scoreboard_scarpetMixin)scoreboard).getObjectivesByCriterion().computeIfAbsent(criterion, (criterion1) -> Lists.newArrayList())).add(objective);
                         scoreboard.onObjectiveAdded(objective);
                         return Value.TRUE;
@@ -337,7 +336,7 @@ public class Scoreboards {
                     team.setCollisionRule(collisionRule);
                     break;
                 case "color":
-                    if(!modifying) return new StringValue(((Team_scarpetMixin) team).getColor().getName());
+                    if(!modifying) return new StringValue(((PlayerTeam_scarpetMixin) team).getColor().getName());
                     if(!(settingVal instanceof StringValue)) throw new InternalExpressionException("'team_property' requires a string as the third argument for the property " + propertyVal.getString());
                     ChatFormatting color = ChatFormatting.getByName(settingVal.getString().toUpperCase());
                     if(color == null || !color.isColor()) throw new InternalExpressionException("Unknown value for property " + propertyVal.getString() + ": " + settingVal.getString());
diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java
index e67c66f7..8f54e8d0 100644
--- a/src/main/java/carpet/script/api/WorldAccess.java
+++ b/src/main/java/carpet/script/api/WorldAccess.java
@@ -2,7 +2,6 @@ package carpet.script.api;
 
 import carpet.CarpetServer;
 import carpet.CarpetSettings;
-import carpet.fakes.BiomeArrayInterface;
 import carpet.fakes.ChunkGeneratorInterface;
 import carpet.fakes.ChunkTicketManagerInterface;
 import carpet.fakes.NoiseColumnSamplerInterface;
@@ -11,12 +10,11 @@ import carpet.fakes.ServerWorldInterface;
 import carpet.fakes.SpawnHelperInnerInterface;
 import carpet.fakes.ThreadedAnvilChunkStorageInterface;
 import carpet.helpers.FeatureGenerator;
-import carpet.mixins.PointOfInterest_scarpetMixin;
+import carpet.mixins.PoiRecord_scarpetMixin;
 import carpet.script.CarpetContext;
 import carpet.script.Context;
 import carpet.script.Expression;
 import carpet.script.Fluff;
-import carpet.script.LazyValue;
 import carpet.script.annotation.Locator;
 import carpet.script.annotation.ScarpetFunction;
 import carpet.script.argument.BlockArgument;
@@ -295,7 +293,7 @@ public class WorldAccess {
                     return Value.NULL;
                 return ListValue.of(
                         new StringValue(poi.getPoiType().toString()),
-                        new NumericValue(poiType.getMaxTickets() - ((PointOfInterest_scarpetMixin)poi).getFreeTickets())
+                        new NumericValue(poiType.getMaxTickets() - ((PoiRecord_scarpetMixin)poi).getFreeTickets())
                 );
             }
             int radius = NumericValue.asNumber(lv.get(locator.offset+0)).getInt();
@@ -335,7 +333,7 @@ public class WorldAccess {
             return ListValue.wrap(pois.sorted(Comparator.comparingDouble(p -> p.getPos().distSqr(pos))).map(p ->
                     ListValue.of(
                             new StringValue(p.getPoiType().toString()),
-                            new NumericValue(p.getPoiType().getMaxTickets() - ((PointOfInterest_scarpetMixin)p).getFreeTickets()),
+                            new NumericValue(p.getPoiType().getMaxTickets() - ((PoiRecord_scarpetMixin)p).getFreeTickets()),
                             ListValue.of(new NumericValue(p.getPos().getX()), new NumericValue(p.getPos().getY()), new NumericValue(p.getPos().getZ()))
                     )
             ).collect(Collectors.toList()));
@@ -375,7 +373,7 @@ public class WorldAccess {
                 int finalO = occupancy;
                 store.getInSquare((tt) -> tt==type, pos, 1, PoiManager.Occupancy.ANY
                 ).filter(p -> p.getPos().equals(pos)).findFirst().ifPresent(p -> {
-                    for (int i=0; i < finalO; i++) ((PointOfInterest_scarpetMixin)p).callAcquireTicket();
+                    for (int i=0; i < finalO; i++) ((PoiRecord_scarpetMixin)p).callAcquireTicket();
                 });
             }
             return Value.TRUE;
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 69ec16f8..adcca9b3 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -5,244 +5,216 @@
   "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BarrierBlock_updateSuppressionBlockMixin",
-
-    "SpawnHelperInnerMixin",
-    "SpawnGroup_spawnMixin",
-    "CommandManagerMixin",
-
-    "ServerPlayNetworkHandlerMixin",
+    "SpawnStateMixin",
+    "MobCategory_spawnMixin",
+    "Commands_customCommandsMixin",
+    "ServerGamePacketListenerImplMixin",
 
     "PerfCommand_permissionMixin",
     "FillCommandMixin",
-    "CloneCommandMixin",
-    "SetBlockCommandMixin",
+    "CloneCommands_fillUpdatesMixin",
+    "SetBlockCommand_fillUpdatesMixin",
     "ForceLoadCommand_forceLoadLimitMixin",
-    "BlockStateArgument_fillUpdatesMixin",
-    "World_fillUpdatesMixin",
-    "WorldChunk_fillUpdatesMixin",
-    "StructureBlockBlockEntity_fillUpdatesMixin",
-    "StructureBlockBlockEntity_limitsMixin",
-    "UpdateStructureBlockC2SPacketMixin",
-    "Structure_fillUpdatesMixin",
-    "ServerPlayNetworkHandler_interactionUpdatesMixin",
-
-    "FlowableFluid_liquidDamageDisabledMixin",
-
-    "ServerMetadata_motdMixin",
+    "BlockInput_fillUpdatesMixin",
+    "Level_fillUpdatesMixin",
+    "LevelChunk_fillUpdatesMixin",
+    "StructureBlockEntity_fillUpdatesMixin",
+    "StructureBlockEntity_limitsMixin",
+    "ServerboundSetStructureBlockPacketMixin",
+    "StructureTemplate_fillUpdatesMixin",
+    "ServerGamePacketListenerImpl_interactionUpdatesMixin",
+    "FlowingFluid_liquidDamageDisabledMixin",
+    "ServerStatus_motdMixin",
     "MinecraftServer_pingPlayerSampleLimit",
 
     "MinecraftServer_coreMixin",
 
     "MinecraftServer_tickspeedMixin",
-    "World_tickMixin",
-    "ServerWorld_tickMixin",
-    "WorldChunkBEList_tickMixin",
-    "ServerChunkManager_tickMixin",
-    "ThreadedAnvilChunkStorage_tickMixin",
-    "ChunkTicketManager_tickMixin",
-    "CommandFunctionManager_tickMixin",
-
-    "ThreadedAnvilChunkStorage_scarpetChunkCreationMixin",
-    "SimpleEntityLookup_scarpetMixin",
+    "Level_tickMixin",
+    "ServerLevel_tickMixin",
+    "BoundTickingBlockEntity_tickMixin",
+    "ServerChunkCache_tickMixin",
+    "ChunkMap_tickMixin",
+    "DistanceManager_tickMixin",
+    "ServerFunctionManager_tickMixin",
+    "ChunkMap_scarpetChunkCreationMixin",
+    "LevelEntityGetterAdapter_scarpetMixin",
     "ChunkHolder_scarpetChunkCreationMixin",
-    "ServerLightingProvider_scarpetMixin",
-    "LevelPropagator_resetChunkInterface",
-    "ChunkTicketManager_scarpetChunkCreationMixin",
-    "LightingProvider_scarpetChunkCreationMixin",
-    "ChunkLightProvider_scarpetChunkCreationMixin",
-    "LightStorage_scarpetChunkCreationMixin",
-    "BlockLightStorage_scarpetChunkCreationMixin",
-    "SkyLightStorage_scarpetChunkCreationMixin",
-
-    "ChunkTicketManager_spawnChunksMixin",
-    "ServerWorld_spawnChunksMixin",
-    "ServerLightingProvider_scarpetChunkCreationMixin",
-
-    "ChunkTicketManager_spawnChunksMixin",
-    "ServerWorld_spawnChunksMixin",
-
-    "LivingEntityMixin",
-
-    "MobEntityMixin",
-    "EntityTrackerEntry_leashFixMixin",
-
-    "VillagerEntity_aiMixin",
-
-    "PlayerEntity_fakePlayersMixin",
-
-    "ServerPlayNetworkHandler_coreMixin",
-
-    "ServerPlayNetworkHandler_tickMixin",
+    "ThreadedLevelLightEngine_scarpetMixin",
+    "DynamicGraphMinFixedPoint_resetChunkInterface",
+    "DistanceManager_scarpetChunkCreationMixin",
+    "LevelLightEngine_scarpetChunkCreationMixin",
+    "LayerLightEngine_scarpetChunkCreationMixin",
+    "LayerLightSectionStorage_scarpetChunkCreationMixin",
+    "BlockLightSectionStorage_scarpetChunkCreationMixin",
+    "SkyLightSectionStorage_scarpetChunkCreationMixin",
+    "DistanceManager_spawnChunksMixin",
+    "ServerLevel_spawnChunksMixin",
+    "ThreadedLevelLightEngine_scarpetChunkCreationMixin",
+    "DistanceManager_spawnChunksMixin",
+    "ServerLevel_spawnChunksMixin",
+    "LivingEntity_cleanLogsMixin",
+    "MobMixin",
+    "ServerEntity_leashFixMixin",
+    "Villager_aiMixin",
+    "Player_fakePlayersMixin",
+    "ServerGamePacketListenerImpl_coreMixin",
+    "ServerGamePacketListenerImpl_tickMixin",
     "MinecraftServer_scarpetMixin",
-    "PlayerListHeaderS2CPacketMixin",
-    "ExperienceOrbEntityMixin",
-    "PlayerEntity_xpNoCooldownMixin",
-    "PlayerActionC2SPacketMixin",
-    "ServerPlayerEntityMixin",
-    "PlayerManager_coreMixin",
-    "PlayerManager_fakePlayersMixin",
-    "RedstoneWireBlockMixin",
-    "CarpetBlockMixin",
-    "SummonCommandMixin",
+    "ClientboundTabListPacketMixin",
+    "ExperienceOrb_xpNoCooldownMixin",
+    "Player_xpNoCooldownMixin",
+    "ServerboundPlayerActionPacketMixin",
+    "ServerPlayerMixin",
+    "PlayerList_coreMixin",
+    "PlayerList_fakePlayersMixin",
+    "RedstoneWireBlock_fastMixin",
+    "WoolCarpetBlock_placeMixin",
+    "SummonCommand_lightningMixin",
     "PistonHandler_pushLimitMixin",
     "PoweredRailBlock_powerLimitMixin",
     "LivingEntity_maxCollisionsMixin",
-    "World_getOtherEntitiesLimited",
-    "CoralBlockMixin",
-    "CoralFanBlockMixin",
-    "CoralFeatureMixin",
+    "Level_getOtherEntitiesLimited",
+    "CoralPlantBlock_renewableCoralMixin",
+    "CoralFanBlock_renewableCoralMixin",
+    "CoralFeature_renewableCoralMixin",
     "BuddingAmethystBlock_movableAmethystMixin",
-    "FluidBlock_renewableBlackstoneMixin",
-    "FluidBlock_renewableDeepslateMixin",
+    "LiquidBlock_renewableBlackstoneMixin",
+    "LiquidBlock_renewableDeepslateMixin",
     "LavaFluid_renewableDeepslateMixin",
     "StructureFeatureMixin",
-    "World_scarpetPlopMixin",
-    "ChunkRegion_scarpetPlopMixin",
+    "Level_scarpetPlopMixin",
+    "WorldGenRegion_scarpetPlopMixin",
     "StructurePiece_scarpetPlopMixin",
     "PlacedFeature_scarpetMixin",
-    "StructureGeneratorFactory_plopMixin",
-
-    "ServerPlayNetworkHandler_scarpetEventsMixin",
-    "ServerPlayerInteractionManager_scarpetEventsMixin",
-    "PlayerEntity_parrotMixin",
-    "SaplingBlockMixin",
+    "PieceGeneratorSupplier_plopMixin",
+    "ServerGamePacketListenerImpl_scarpetEventsMixin",
+    "ServerPlayerGameMode_scarpetEventsMixin",
+    "Player_parrotMixin",
+    "SaplingBlock_desertShrubsMixin",
     "EntityMixin",
-    "FlatChunkGeneratorMixin",
+    "FlatLevelSource_structuresMixin",
     "ChunkGenerator_scarpetMixin",
-
-    "GuardianEntityMixin",
+    "Guardian_renewableSpongesMixin",
     "DesertPyramidFeatureMixin",
-    "HuskEntityMixin",
-
-    "NoiseChunkGenerator_husksSpawnMixin",
-
-    "ServerChunkManagerMixin",
-    "SpawnHelperMixin",
+    "Husk_templesMixin",
+    "NoiseBasedChunkGenerator_husksSpawnMixin",
+    "ServerChunkCacheMixin",
+    "NaturalSpawnerMixin",
 
     "DirectionMixin",
-    "ServerPlayerInteractionManager_cactusMixin",
+    "ServerPlayerGameMode_cactusMixin",
     "HopperBlock_cactusMixin",
-    "ItemUsageContext_cactusMixin",
+    "UseOnContext_cactusMixin",
     "DispenserBlock_cactusMixin",
-    "PistonBlock_rotatorBlockMixin",
-
-    "ServerPlayNetworkHandler_antiCheatDisabledMixin",
-    "PlayerEntity_antiCheatDisabled",
-
-    "ServerPlayerInteractionManager_antiCheatMixin",
-
-    "HopperBlockEntityMixin",
-    "ContainerMixin",
-    "ClientConnectionMixin",
+    "PistonBaseBlock_rotatorBlockMixin",
+    "ServerGamePacketListenerImpl_antiCheatDisabledMixin",
+    "Player_antiCheatDisabledMixin",
+    "ServerPlayerGameMode_antiCheatMixin",
+    "HopperBlockEntity_counterMixin",
+    "AbstractContainerMenu_ctrlQCraftingMixin",
+    "Connection_packetCounterMixin",
     "CauldronBlock_stackableSBoxesMixin",
     "AbstractCauldronBlock_stackableSBoxesMixin",
     "Slot_stackableSBoxesMixin",
-    "ScreenHandler_stackableSBoxesMixin",
+    "AbstractContainerMenu_stackableSBoxesMixin",
     "ItemEntityMixin",
-    "TntBlockMixin",
-    "ExplosionMixin",
+    "TntBlock_noUpdateMixin",
+    "Explosion_optimizedTntMixin",
     "ExplosionAccessor",
     "Explosion_scarpetEventMixin",
-
-    "TntEntityMixin",
-    "ProjectileEntityMixin",
+    "PrimedTntMixin",
+    "AbstractArrowMixin",
     "FallingBlockEntityMixin",
-    "ThrownEntityMixin",
-    "EntityNavigation_pathfindingMixin",
+    "ThrowableProjectileMixin",
+    "PathNavigation_pathfindingMixin",
 
     "EndCityFeatureMixin",
-    "BastionRemnantFeatureMixin",
-
-    "InfestedBlockMixin",
-    "PlayerEntityMixin_portalDelayMixin",
-
-    "PistonBlock_qcMixin",
+    "BastionFeatureMixin",
+    "InfestedBlock_gravelMixin",
+    "Player_portalDelayMixin",
+    "PistonBaseBlock_qcMixin",
     "DispenserBlock_qcMixin",
 
     "PickaxeItem_missingToolsMixin",
-
-    "ItemDispenserBehaviour_extremeBehavioursMixin",
-    "ItemScatterer_extremeMixin",
-    "FishingBobberEntity_extremeMixin",
-    "SkeletonHorseTrapTriggerGoal_extremeMixin",
-    "FireworkEntity_extremeMixin",
-    "BlazeEntity_extremeMixin",
-    "BlazeEntityShootFireballGoal_extremeMixin",
-    "MobEntity_extremeMixin",
-    "ProjectileEntity_extremeMixin",
+    "DefaultDispenseItemBehavior_extremeBehavioursMixin",
+    "Containers_extremeMixin",
+    "FishingHook_extremeMixin",
+    "SkeletonTrapGoal_extremeMixin",
+    "FireworkRocketEntity_extremeMixin",
+    "Blaze_extremeMixin",
+    "BlazeAttackGoal_extremeMixin",
+    "Mob_extremeMixin",
+    "AbstractArrow_extremeMixin",
     "Projectile_extremeMixin",
-    "WitherEntity_extremeMixin",
-
-    "ArmorStandEntity_scarpetMarkerMixin",
+    "WitherBoss_extremeMixin",
+    "ArmorStand_scarpetMarkerMixin",
     "Entity_scarpetEventsMixin",
     "LivingEntity_scarpetEventsMixin",
-    "PlayerEntity_scarpetEventsMixin",
-    "ServerPlayerEntity_scarpetEventMixin",
+    "Player_scarpetEventsMixin",
+    "ServerPlayer_scarpetEventMixin",
     "FallingBlockEntity_scarpetEventsMixin",
     "BlockItem_scarpetEventMixin",
-    "PlayerManager_scarpetEventsMixin",
-    "PlayerInventory_scarpetEventMixin",
-    "ScoreboardObjective_scarpetMixin",
+    "PlayerList_scarpetEventsMixin",
+    "Inventory_scarpetEventMixin",
+    "Objective_scarpetMixin",
     "Scoreboard_scarpetMixin",
-    "Team_scarpetMixin",
-    "TradeOutputSlot_scarpetEventMixin",
-    "ScreenHandler_scarpetMixin",
-    "ScreenHandlerSubclasses_scarpetMixin",
-    "AbstractRecipeScreenHandler_scarpetMixin",
-
-
-    "ChunkTicketManager_scarpetMixin",
-    "PointOfInterest_scarpetMixin",
-    "ServerWorld_scarpetMixin",
-    "ServerEntityManager_scarpetMixin",
+    "PlayerTeam_scarpetMixin",
+    "MerchantResultSlot_scarpetEventMixin",
+    "AbstractContainerMenu_scarpetMixin",
+    "AbstractContainerMenuSubclasses_scarpetMixin",
+    "RecipeBookMenu_scarpetMixin",
+    "DistanceManager_scarpetMixin",
+    "PoiRecord_scarpetMixin",
+    "ServerLevel_scarpetMixin",
+    "PersistentEntitySectionManager_scarpetMixin",
     "ReloadCommand_reloadAppsMixin",
-    "CrashReport_addScarpetAppsMixin",
+    "SystemReport_addScarpetAppsMixin",
 
     "RecipeManager_scarpetMixin",
     "Ingredient_scarpetMixin",
-    "BlockStateArgument_scarpetMixin",
-    "StatePredicate_scarpetMixin",
+    "BlockInput_scarpetMixin",
+    "BlockPredicate_scarpetMixin",
     "TagPredicate_scarpetMixin",
     "HorseBaseEntity_scarpetMixin",
-    "NoiseColumnSamplerMixin_scarpetMixin",
-    "CaveScalerMixin_scarpetMixin",
+    "NoiseSampler_scarpetMixin",
+    "QuantizedSpaghettiRarityMixin_scarpetMixin",
 
     "BlockEntity_movableBEMixin",
-    "PistonBlock_movableTEMixin",
-    "PistonBlockEntity_movableTEMixin",
-    "World_movableTEMixin",
-    "WorldChunk_movableTEMixin",
+    "PistonBaseBlock_movableBEMixin",
+    "PistonMovingBlockEntity_movableBEMixin",
+    "Level_movableBEMixin",
+    "LevelChunk_movableBEMixin",
     "PistonHandler_customStickyMixin",
-    "PlayerEntity_creativeNoClipMixin",
-    "PistonBlockEntity_playerHandlingMixin",
+    "Player_creativeNoClipMixin",
+    "PistonMovingBlockEntity_playerHandlingMixin",
     "BlockItem_creativeNoClipMixin",
-    "WallStandingBlockItem_creativeNoClipMixin",
+    "StandingAndWallBlockItem_creativeNoClipMixin",
     "ShulkerBoxBlockEntity_creativeNoClipMixin",
-    "EndGatewayBlockEntity_creativeNoClipMixin",
+    "TheEndGatewayBlockEntity_creativeNoClipMixin",
     "LivingEntity_creativeFlyMixin",
-
-    "World_updateSuppressionCrashFixMixin",
+    "Level_updateSuppressionCrashFixMixin",
     "MinecraftServer_updateSuppressionCrashFixMixin",
-    "ServerPlayerEntity_updateSuppressionCrashFixMixin"
+    "ServerPlayer_updateSuppressionCrashFixMixin"
   ],
   "client": [
-    "RenderTickCounter_tickSpeedMixin",
-    "MinecraftClientMixin",
-    "MinecraftClient_pausedShakeMixin",
-    "WorldRenderer_pausedShakeMixin",
-    "InGameHudMixin",
-    "PlayerListHudMixin",
-    "PistonBlockEntityRenderer_movableTEMixin",
-    "StructureBlockBlockEntityRenderer_mixin",
-    "ClientPlayerEntity_clientCommandMixin",
-    "WorldRenderer_fogOffMixin",
-    "WorldRenderer_creativeNoClipMixin",
-    "ClientPlayNetworkHandlerMixin",
+    "Timer_tickSpeedMixin",
+    "MinecraftMixin",
+    "Minecraft_pausedShakeMixin",
+    "LevelRenderer_pausedShakeMixin",
+    "Gui_tablistMixin",
+    "PlayerTabOverlayMixin",
+    "PistonHeadRenderer_movableBEMixin",
+    "StructureBlockRenderer_mixin",
+    "LocalPlayer_clientCommandMixin",
+    "LevelRenderer_fogOffMixin",
+    "LevelRenderer_creativeNoClipMixin",
+    "ClientPacketListener_customPacketsMixin",
     "DebugRenderer_scarpetRenderMixin",
-    "WorldRenderer_scarpetRenderMixin",
+    "LevelRenderer_scarpetRenderMixin",
 
     "SoundEngineInt_cleanLogsMixin",
-    "SoundSystem_cleanLogsMixin"
+    "SoundEngine_cleanLogsMixin"
   ],
   "server": [
   ],