From 05e8a2985eca799bb767af7d7376e5120ce0fc71 Mon Sep 17 00:00:00 2001 From: "Josiah (Gaming32) Glosson" Date: Sat, 3 Jun 2023 00:20:31 -0500 Subject: [PATCH] Rename mixins --- ...rerExt.java => ItemInHandRendererExt.java} | 2 +- ...amebufferExt.java => RenderTargetExt.java} | 2 +- .../RocketTurretBlockEntity.java | 2 +- .../portalcubed/client/PortalCubedClient.java | 8 +-- .../entity/ExperimentalPortalRenderer.java | 10 ++-- ...Accessor.java => ClipContextAccessor.java} | 2 +- ...tMixin.java => CollisionContextMixin.java} | 2 +- ...nventoryMixin.java => InventoryMixin.java} | 2 +- .../{WorldMixin.java => LevelMixin.java} | 2 +- ...ldViewMixin.java => LevelReaderMixin.java} | 2 +- ...layerEntityMixin.java => PlayerMixin.java} | 15 ++--- ...=> ServerGamePacketListenerImplMixin.java} | 2 +- ...in.java => ServerPlayerGameModeMixin.java} | 2 +- ...java => AbstractContainerScreenMixin.java} | 2 +- ...Mixin.java => ClientAdvancementMixin.java} | 2 +- ...tWorldMixin.java => ClientLevelMixin.java} | 2 +- ...in.java => ClientPacketListenerMixin.java} | 2 +- ...ndererMixin.java => FogRendererMixin.java} | 2 +- .../{InGameHudMixin.java => GuiMixin.java} | 2 +- ...ixin.java => ItemInHandRendererMixin.java} | 4 +- ...dAccessor.java => KeyMappingAccessor.java} | 2 +- ...rdMixin.java => KeyboardHandlerMixin.java} | 4 +- ...EntityMixin.java => LocalPlayerMixin.java} | 4 +- ...ftClientMixin.java => MinecraftMixin.java} | 2 +- ...LoaderMixin.java => ModelBakeryMixin.java} | 2 +- ...MouseMixin.java => MouseHandlerMixin.java} | 2 +- ...xin.java => MultiPlayerGameModeMixin.java} | 2 +- ...ccessor.java => MusicManagerAccessor.java} | 2 +- ...gerMixin.java => ParticleEngineMixin.java} | 2 +- ...rerMixin.java => PlayerRendererMixin.java} | 2 +- ...ufferMixin.java => RenderTargetMixin.java} | 4 +- ...in.java => ScreenEffectRendererMixin.java} | 2 +- ...SystemMixin.java => SoundEngineMixin.java} | 2 +- .../util/AdvancedEntityRaycast.java | 8 +-- .../portalcubed/util/HolderComponent.java | 4 +- src/main/resources/portalcubed.mixins.json | 56 +++++++++---------- 36 files changed, 84 insertions(+), 85 deletions(-) rename src/main/java/com/fusionflux/portalcubed/accessor/{HeldItemRendererExt.java => ItemInHandRendererExt.java} (64%) rename src/main/java/com/fusionflux/portalcubed/accessor/{FramebufferExt.java => RenderTargetExt.java} (79%) rename src/main/java/com/fusionflux/portalcubed/mixin/{RaycastContextAccessor.java => ClipContextAccessor.java} (90%) rename src/main/java/com/fusionflux/portalcubed/mixin/{ShapeContextMixin.java => CollisionContextMixin.java} (94%) rename src/main/java/com/fusionflux/portalcubed/mixin/{PlayerInventoryMixin.java => InventoryMixin.java} (97%) rename src/main/java/com/fusionflux/portalcubed/mixin/{WorldMixin.java => LevelMixin.java} (91%) rename src/main/java/com/fusionflux/portalcubed/mixin/{WorldViewMixin.java => LevelReaderMixin.java} (77%) rename src/main/java/com/fusionflux/portalcubed/mixin/{PlayerEntityMixin.java => PlayerMixin.java} (96%) rename src/main/java/com/fusionflux/portalcubed/mixin/{ServerPlayNetworkHandlerMixin.java => ServerGamePacketListenerImplMixin.java} (98%) rename src/main/java/com/fusionflux/portalcubed/mixin/{ServerPlayerInteractionManagerMixin.java => ServerPlayerGameModeMixin.java} (95%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{HandledScreenMixin.java => AbstractContainerScreenMixin.java} (94%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ClientAdvancementManagerMixin.java => ClientAdvancementMixin.java} (96%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ClientWorldMixin.java => ClientLevelMixin.java} (97%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ClientPlayNetworkHandlerMixin.java => ClientPacketListenerMixin.java} (95%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{BackgroundRendererMixin.java => FogRendererMixin.java} (98%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{InGameHudMixin.java => GuiMixin.java} (98%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{HeldItemRendererMixin.java => ItemInHandRendererMixin.java} (96%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{KeyBindAccessor.java => KeyMappingAccessor.java} (91%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{KeyboardMixin.java => KeyboardHandlerMixin.java} (91%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ClientPlayerEntityMixin.java => LocalPlayerMixin.java} (91%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{MinecraftClientMixin.java => MinecraftMixin.java} (99%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ModelLoaderMixin.java => ModelBakeryMixin.java} (97%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{MouseMixin.java => MouseHandlerMixin.java} (98%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ClientPlayerInteractionManagerMixin.java => MultiPlayerGameModeMixin.java} (96%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{MusicTrackerAccessor.java => MusicManagerAccessor.java} (90%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{ParticleManagerMixin.java => ParticleEngineMixin.java} (98%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{PlayerEntityRendererMixin.java => PlayerRendererMixin.java} (95%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{FramebufferMixin.java => RenderTargetMixin.java} (94%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{InGameOverlayRendererMixin.java => ScreenEffectRendererMixin.java} (96%) rename src/main/java/com/fusionflux/portalcubed/mixin/client/{SoundSystemMixin.java => SoundEngineMixin.java} (97%) diff --git a/src/main/java/com/fusionflux/portalcubed/accessor/HeldItemRendererExt.java b/src/main/java/com/fusionflux/portalcubed/accessor/ItemInHandRendererExt.java similarity index 64% rename from src/main/java/com/fusionflux/portalcubed/accessor/HeldItemRendererExt.java rename to src/main/java/com/fusionflux/portalcubed/accessor/ItemInHandRendererExt.java index c64e232b..ab08fdec 100644 --- a/src/main/java/com/fusionflux/portalcubed/accessor/HeldItemRendererExt.java +++ b/src/main/java/com/fusionflux/portalcubed/accessor/ItemInHandRendererExt.java @@ -1,5 +1,5 @@ package com.fusionflux.portalcubed.accessor; -public interface HeldItemRendererExt { +public interface ItemInHandRendererExt { void startHandFaker(); } diff --git a/src/main/java/com/fusionflux/portalcubed/accessor/FramebufferExt.java b/src/main/java/com/fusionflux/portalcubed/accessor/RenderTargetExt.java similarity index 79% rename from src/main/java/com/fusionflux/portalcubed/accessor/FramebufferExt.java rename to src/main/java/com/fusionflux/portalcubed/accessor/RenderTargetExt.java index d2763518..ade08737 100644 --- a/src/main/java/com/fusionflux/portalcubed/accessor/FramebufferExt.java +++ b/src/main/java/com/fusionflux/portalcubed/accessor/RenderTargetExt.java @@ -1,6 +1,6 @@ package com.fusionflux.portalcubed.accessor; -public interface FramebufferExt { +public interface RenderTargetExt { boolean isStencilBufferEnabled(); void setStencilBufferEnabled(boolean enabled); diff --git a/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/RocketTurretBlockEntity.java b/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/RocketTurretBlockEntity.java index d3482b0c..61723b86 100644 --- a/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/RocketTurretBlockEntity.java +++ b/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/RocketTurretBlockEntity.java @@ -212,7 +212,7 @@ public void tick(Level world, BlockPos pos, BlockState state) { aimDests = PortalDirectionUtils.raycast(world, new ClipContext( gunPos, gunPos.add(Vec3.directionFromRotation(pitch, yaw - 90).scale(127)), ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, - // We can pass null here because of ShapeContextMixin + // We can pass null here because of CollisionContextMixin null )).rays().stream().map(r -> new Tuple<>(r.start(), r.end())).toList(); return; diff --git a/src/main/java/com/fusionflux/portalcubed/client/PortalCubedClient.java b/src/main/java/com/fusionflux/portalcubed/client/PortalCubedClient.java index 72c03d4a..77c494e1 100644 --- a/src/main/java/com/fusionflux/portalcubed/client/PortalCubedClient.java +++ b/src/main/java/com/fusionflux/portalcubed/client/PortalCubedClient.java @@ -26,7 +26,7 @@ import com.fusionflux.portalcubed.items.PortalGun; import com.fusionflux.portalcubed.mixin.client.AbstractSoundInstanceAccessor; import com.fusionflux.portalcubed.mixin.client.DeathScreenAccessor; -import com.fusionflux.portalcubed.mixin.client.MusicTrackerAccessor; +import com.fusionflux.portalcubed.mixin.client.MusicManagerAccessor; import com.fusionflux.portalcubed.optionslist.OptionsListScreen; import com.fusionflux.portalcubed.packet.PortalCubedServerPackets; import com.fusionflux.portalcubed.sound.PortalCubedSounds; @@ -220,7 +220,7 @@ public void onInitializeClient(ModContainer mod) { client.getSoundManager().play(excursionFunnelMusic); } else if (excursionFunnelMusic.getVolume() < 1f && excursionFunnelMusic instanceof AbstractSoundInstanceAccessor access) { access.setVolume(excursionFunnelMusic.getVolume() + 0.05f); - if (((MusicTrackerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor cAccess) { + if (((MusicManagerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor cAccess) { cAccess.setVolume(1f - excursionFunnelMusic.getVolume() / 2); } client.getSoundManager().updateSourceVolume(null, 0); // If first argument is null, all it does is refresh SoundInstance volumes @@ -229,13 +229,13 @@ public void onInitializeClient(ModContainer mod) { if (excursionFunnelMusic.getVolume() <= 0f) { client.getSoundManager().stop(excursionFunnelMusic); excursionFunnelMusic = null; - if (((MusicTrackerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor access) { + if (((MusicManagerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor access) { access.setVolume(1f); client.getSoundManager().updateSourceVolume(null, 0); // See above } } else if (excursionFunnelMusic instanceof AbstractSoundInstanceAccessor access) { access.setVolume(excursionFunnelMusic.getVolume() - 0.05f); - if (((MusicTrackerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor cAccess) { + if (((MusicManagerAccessor)client.getMusicManager()).getCurrentMusic() instanceof AbstractSoundInstanceAccessor cAccess) { cAccess.setVolume(1f - excursionFunnelMusic.getVolume() / 2); } client.getSoundManager().updateSourceVolume(null, 0); // See above diff --git a/src/main/java/com/fusionflux/portalcubed/client/render/entity/ExperimentalPortalRenderer.java b/src/main/java/com/fusionflux/portalcubed/client/render/entity/ExperimentalPortalRenderer.java index f0f6cd6e..1baa153b 100644 --- a/src/main/java/com/fusionflux/portalcubed/client/render/entity/ExperimentalPortalRenderer.java +++ b/src/main/java/com/fusionflux/portalcubed/client/render/entity/ExperimentalPortalRenderer.java @@ -1,7 +1,7 @@ package com.fusionflux.portalcubed.client.render.entity; import com.fusionflux.portalcubed.accessor.CameraExt; -import com.fusionflux.portalcubed.accessor.FramebufferExt; +import com.fusionflux.portalcubed.accessor.RenderTargetExt; import com.fusionflux.portalcubed.client.render.entity.model.ExperimentalPortalModel; import com.fusionflux.portalcubed.config.PortalCubedConfig; import com.fusionflux.portalcubed.entity.ExperimentalPortal; @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; import static com.fusionflux.portalcubed.PortalCubed.id; import static org.lwjgl.opengl.GL11.*; @@ -39,7 +40,7 @@ public ExperimentalPortalRenderer(EntityRendererProvider.Context dispatcher) { } @Override - public void render(ExperimentalPortal entity, float yaw, float tickDelta, PoseStack matrices, MultiBufferSource vertexConsumers, int light) { + public void render(@NotNull ExperimentalPortal entity, float yaw, float tickDelta, @NotNull PoseStack matrices, @NotNull MultiBufferSource vertexConsumers, int light) { super.render(entity, yaw, tickDelta, matrices, vertexConsumers, light); matrices.pushPose(); matrices.mulPose(Vector3f.XP.rotationDegrees(entity.getYRot())); @@ -84,7 +85,7 @@ private void renderPortal( final boolean renderPortal = portalLayer < MAX_PORTAL_LAYER && entity.getActive(); if (renderPortal) { // TODO: PortingLib compat - ((FramebufferExt)Minecraft.getInstance().getMainRenderTarget()).setStencilBufferEnabled(true); + ((RenderTargetExt)Minecraft.getInstance().getMainRenderTarget()).setStencilBufferEnabled(true); glEnable(GL_STENCIL_TEST); RenderSystem.colorMask(false, false, false, false); RenderSystem.depthMask(false); @@ -140,8 +141,9 @@ private void renderAxis(PoseStack.Pose entry, VertexConsumer vertices, Vec3 axis .endVertex(); } + @NotNull @Override - public ResourceLocation getTextureLocation(ExperimentalPortal entity) { + public ResourceLocation getTextureLocation(@NotNull ExperimentalPortal entity) { if (PortalCubedConfig.enableRoundPortals) { return !renderingTracers ? ROUND_TEXTURE : ROUND_TEXTURE_TRACER; } else { diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/RaycastContextAccessor.java b/src/main/java/com/fusionflux/portalcubed/mixin/ClipContextAccessor.java similarity index 90% rename from src/main/java/com/fusionflux/portalcubed/mixin/RaycastContextAccessor.java rename to src/main/java/com/fusionflux/portalcubed/mixin/ClipContextAccessor.java index cc2fcfab..23f7946f 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/RaycastContextAccessor.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/ClipContextAccessor.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ClipContext.class) -public interface RaycastContextAccessor { +public interface ClipContextAccessor { @Accessor ClipContext.Block getBlock(); diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/ShapeContextMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/CollisionContextMixin.java similarity index 94% rename from src/main/java/com/fusionflux/portalcubed/mixin/ShapeContextMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/CollisionContextMixin.java index d0220b1b..e7ad9ebc 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/ShapeContextMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/CollisionContextMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(CollisionContext.class) -public interface ShapeContextMixin { +public interface CollisionContextMixin { @Inject(method = "of", at = @At("HEAD"), cancellable = true) private static void ofNullable(Entity entity, CallbackInfoReturnable cir) { if (entity == null) { diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/PlayerInventoryMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/InventoryMixin.java similarity index 97% rename from src/main/java/com/fusionflux/portalcubed/mixin/PlayerInventoryMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/InventoryMixin.java index 5e7401ef..30e607b3 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/PlayerInventoryMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/InventoryMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Inventory.class) -public class PlayerInventoryMixin { +public class InventoryMixin { @Shadow @Final public Player player; @Inject(method = "swapPaint", at = @At("HEAD"), cancellable = true) diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/WorldMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/LevelMixin.java similarity index 91% rename from src/main/java/com/fusionflux/portalcubed/mixin/WorldMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/LevelMixin.java index d7d9af5b..d7330897 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/WorldMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/LevelMixin.java @@ -11,7 +11,7 @@ import java.util.UUID; @Mixin(Level.class) -public abstract class WorldMixin implements Accessors { +public abstract class LevelMixin implements Accessors { @Shadow protected abstract LevelEntityGetter getEntities(); diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/WorldViewMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/LevelReaderMixin.java similarity index 77% rename from src/main/java/com/fusionflux/portalcubed/mixin/WorldViewMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/LevelReaderMixin.java index 941561d1..d96e25ef 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/WorldViewMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/LevelReaderMixin.java @@ -5,5 +5,5 @@ import org.spongepowered.asm.mixin.Mixin; @Mixin(LevelReader.class) -public interface WorldViewMixin extends CustomCollisionView { +public interface LevelReaderMixin extends CustomCollisionView { } diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/PlayerEntityMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/PlayerMixin.java similarity index 96% rename from src/main/java/com/fusionflux/portalcubed/mixin/PlayerEntityMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/PlayerMixin.java index 434f267e..de2433a1 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/PlayerEntityMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/PlayerMixin.java @@ -1,6 +1,5 @@ package com.fusionflux.portalcubed.mixin; -import com.fusionflux.portalcubed.PortalCubed; import com.fusionflux.portalcubed.PortalCubedGameRules; import com.fusionflux.portalcubed.accessor.CalledValues; import com.fusionflux.portalcubed.blocks.PortalCubedBlocks; @@ -32,6 +31,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; import org.quiltmc.loader.api.minecraft.ClientOnly; @@ -51,25 +51,22 @@ import java.util.Set; @Mixin(Player.class) -public abstract class PlayerEntityMixin extends LivingEntity implements EntityAttachments { +public abstract class PlayerMixin extends LivingEntity implements EntityAttachments { @Unique private boolean cfg; - protected PlayerEntityMixin(EntityType entityType, Level world) { + protected PlayerMixin(EntityType entityType, Level world) { super(entityType, world); - throw new AssertionError( - PortalCubed.MOD_ID + "'s PlayerEntityMixin dummy constructor was called, " + - "something is very wrong here!" - ); } + @NotNull @Shadow @Override - public abstract ItemStack getItemBySlot(EquipmentSlot slot); + public abstract ItemStack getItemBySlot(@NotNull EquipmentSlot slot); @Shadow @Override - public abstract void playSound(SoundEvent sound, float volume, float pitch); + public abstract void playSound(@NotNull SoundEvent sound, float volume, float pitch); @Shadow @Override diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/ServerGamePacketListenerImplMixin.java similarity index 98% rename from src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayNetworkHandlerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/ServerGamePacketListenerImplMixin.java index 6ec6ae5a..a9eba29b 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayNetworkHandlerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/ServerGamePacketListenerImplMixin.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerGamePacketListenerImpl.class) -public abstract class ServerPlayNetworkHandlerMixin { +public abstract class ServerGamePacketListenerImplMixin { @Shadow public ServerPlayer player; diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerInteractionManagerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerGameModeMixin.java similarity index 95% rename from src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerInteractionManagerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerGameModeMixin.java index d6b9e040..59f6cf0d 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerInteractionManagerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/ServerPlayerGameModeMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = ServerPlayerGameMode.class, priority = 1001) -public abstract class ServerPlayerInteractionManagerMixin { +public abstract class ServerPlayerGameModeMixin { @Shadow @Final protected ServerPlayer player; diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/HandledScreenMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/AbstractContainerScreenMixin.java similarity index 94% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/HandledScreenMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/AbstractContainerScreenMixin.java index 7bc03d8f..67dfc426 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/HandledScreenMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/AbstractContainerScreenMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(AbstractContainerScreen.class) -public class HandledScreenMixin { +public class AbstractContainerScreenMixin { @Inject(method = "onClose", at = @At("HEAD")) private void floorButtonEasterEgg(CallbackInfo ci) { //noinspection ConstantValue diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementManagerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementMixin.java similarity index 96% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementManagerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementMixin.java index 1edd5675..975e5763 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementManagerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientAdvancementMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ClientAdvancements.class) -public class ClientAdvancementManagerMixin { +public class ClientAdvancementMixin { @Inject( method = "update", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientWorldMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientLevelMixin.java similarity index 97% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ClientWorldMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ClientLevelMixin.java index 615b1fc8..124b34c7 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientWorldMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientLevelMixin.java @@ -13,7 +13,7 @@ import java.util.Set; @Mixin(ClientLevel.class) -public class ClientWorldMixin { +public class ClientLevelMixin { @WrapOperation( method = "getMarkerParticleTarget", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayNetworkHandlerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPacketListenerMixin.java similarity index 95% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayNetworkHandlerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPacketListenerMixin.java index d7da388b..8a7de6eb 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPacketListenerMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(ClientPacketListener.class) -public class ClientPlayNetworkHandlerMixin { +public class ClientPacketListenerMixin { @WrapOperation( method = "handlePlayerCombatKill", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/BackgroundRendererMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/FogRendererMixin.java similarity index 98% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/BackgroundRendererMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/FogRendererMixin.java index 5d9e1f1f..90fa7a13 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/BackgroundRendererMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/FogRendererMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(FogRenderer.class) -public abstract class BackgroundRendererMixin { +public abstract class FogRendererMixin { @Shadow private static float fogRed; @Shadow diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/InGameHudMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/GuiMixin.java similarity index 98% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/InGameHudMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/GuiMixin.java index b9a6f244..4095431c 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/InGameHudMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/GuiMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Gui.class) -public class InGameHudMixin { +public class GuiMixin { @Inject(method = "renderHotbar", at = @At("HEAD"), cancellable = true) private void notWithPortalHudRH(float tickDelta, PoseStack matrices, CallbackInfo ci) { if (PortalCubedClient.isPortalHudMode()) { diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/HeldItemRendererMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ItemInHandRendererMixin.java similarity index 96% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/HeldItemRendererMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ItemInHandRendererMixin.java index 6cf472a4..bc7dba7f 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/HeldItemRendererMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ItemInHandRendererMixin.java @@ -1,6 +1,6 @@ package com.fusionflux.portalcubed.mixin.client; -import com.fusionflux.portalcubed.accessor.HeldItemRendererExt; +import com.fusionflux.portalcubed.accessor.ItemInHandRendererExt; import com.fusionflux.portalcubed.client.PortalCubedClient; import com.fusionflux.portalcubed.items.PortalCubedItems; import com.fusionflux.portalcubed.util.PortalCubedComponents; @@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemInHandRenderer.class) -public class HeldItemRendererMixin implements HeldItemRendererExt { +public class ItemInHandRendererMixin implements ItemInHandRendererExt { @Shadow @Final private Minecraft minecraft; private boolean isHoldingInvisible; private boolean handFaker; diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyBindAccessor.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyMappingAccessor.java similarity index 91% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/KeyBindAccessor.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/KeyMappingAccessor.java index fdc3ae1b..ca66600d 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyBindAccessor.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyMappingAccessor.java @@ -8,7 +8,7 @@ import java.util.Map; @Mixin(KeyMapping.class) -public interface KeyBindAccessor { +public interface KeyMappingAccessor { @Accessor("MAP") static Map getMAP() { throw new AssertionError(); diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardHandlerMixin.java similarity index 91% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardHandlerMixin.java index 89052822..3aee82ab 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/KeyboardHandlerMixin.java @@ -15,7 +15,7 @@ import static org.lwjgl.glfw.GLFW.GLFW_REPEAT; @Mixin(KeyboardHandler.class) -public class KeyboardMixin { +public class KeyboardHandlerMixin { @Shadow @Final private Minecraft minecraft; @WrapWithCondition( @@ -29,7 +29,7 @@ private boolean dontSpamGrab(InputConstants.Key instance, long window, int key, if (action != GLFW_REPEAT) { return true; } - final KeyMapping keybind = KeyBindAccessor.getMAP().get(instance); + final KeyMapping keybind = KeyMappingAccessor.getMAP().get(instance); return keybind != PortalCubedKeyBindings.GRAB && (!PortalCubedClient.isPortalHudMode() || keybind != minecraft.options.keyInventory); } } diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerEntityMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/LocalPlayerMixin.java similarity index 91% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerEntityMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/LocalPlayerMixin.java index 26f12d5b..fca650dc 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerEntityMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/LocalPlayerMixin.java @@ -26,13 +26,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LocalPlayer.class) -public class ClientPlayerEntityMixin extends AbstractClientPlayer implements HasMovementInputAccessor { +public class LocalPlayerMixin extends AbstractClientPlayer implements HasMovementInputAccessor { @Shadow @Final protected Minecraft minecraft; @Shadow public Input input; - public ClientPlayerEntityMixin(ClientLevel clientWorld, GameProfile gameProfile, @Nullable ProfilePublicKey playerPublicKey) { + public LocalPlayerMixin(ClientLevel clientWorld, GameProfile gameProfile, @Nullable ProfilePublicKey playerPublicKey) { super(clientWorld, gameProfile, playerPublicKey); } diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftClientMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftMixin.java similarity index 99% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftClientMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftMixin.java index d508c217..98c9de57 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftClientMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/MinecraftMixin.java @@ -30,7 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) -public abstract class MinecraftClientMixin { +public abstract class MinecraftMixin { @Shadow @Final public Options options; @Shadow public LocalPlayer player; diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ModelLoaderMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ModelBakeryMixin.java similarity index 97% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ModelLoaderMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ModelBakeryMixin.java index a1d9c6c3..10618348 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ModelBakeryMixin.java @@ -19,7 +19,7 @@ import java.util.Map; @Mixin(ModelBakery.class) -public abstract class ModelLoaderMixin { +public abstract class ModelBakeryMixin { @Shadow @Final diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/MouseMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/MouseHandlerMixin.java similarity index 98% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/MouseMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/MouseHandlerMixin.java index b6e7d78d..b2f78a32 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/MouseMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/MouseHandlerMixin.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(MouseHandler.class) -public class MouseMixin { +public class MouseHandlerMixin { @Shadow @Final private Minecraft minecraft; @WrapWithCondition( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerInteractionManagerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/MultiPlayerGameModeMixin.java similarity index 96% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerInteractionManagerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/MultiPlayerGameModeMixin.java index 280e994e..c64d9431 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/MultiPlayerGameModeMixin.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(MultiPlayerGameMode.class) -public class ClientPlayerInteractionManagerMixin { +public class MultiPlayerGameModeMixin { @WrapOperation( method = "performUseItemOn", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/MusicTrackerAccessor.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/MusicManagerAccessor.java similarity index 90% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/MusicTrackerAccessor.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/MusicManagerAccessor.java index 4c42d8c2..d6db75d1 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/MusicTrackerAccessor.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/MusicManagerAccessor.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(MusicManager.class) -public interface MusicTrackerAccessor { +public interface MusicManagerAccessor { @Accessor @Nullable SoundInstance getCurrentMusic(); diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleManagerMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleEngineMixin.java similarity index 98% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleManagerMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleEngineMixin.java index ef069501..93a8459b 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleManagerMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ParticleEngineMixin.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; @Mixin(ParticleEngine.class) -public class ParticleManagerMixin { +public class ParticleEngineMixin { @WrapOperation( method = "crack", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerEntityRendererMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerRendererMixin.java similarity index 95% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerEntityRendererMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerRendererMixin.java index 9a91f6b3..5442f453 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerEntityRendererMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/PlayerRendererMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(PlayerRenderer.class) -public class PlayerEntityRendererMixin { +public class PlayerRendererMixin { @WrapOperation( method = "setModelProperties", at = @At( diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/FramebufferMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/RenderTargetMixin.java similarity index 94% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/FramebufferMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/RenderTargetMixin.java index 5da5d172..7c89f2fa 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/FramebufferMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/RenderTargetMixin.java @@ -1,6 +1,6 @@ package com.fusionflux.portalcubed.mixin.client; -import com.fusionflux.portalcubed.accessor.FramebufferExt; +import com.fusionflux.portalcubed.accessor.RenderTargetExt; import com.mojang.blaze3d.pipeline.RenderTarget; import net.minecraft.client.Minecraft; import org.lwjgl.opengl.ARBFramebufferObject; @@ -15,7 +15,7 @@ // Based on https://github.com/iPortalTeam/ImmersivePortalsMod/blob/55c9c1e7e298e09d8d43b0114e64e30271aa43b6/imm_ptl_core/src/main/java/qouteall/imm_ptl/core/mixin/client/render/framebuffer/MixinRenderTarget.java#L3 @Mixin(RenderTarget.class) -public abstract class FramebufferMixin implements FramebufferExt { +public abstract class RenderTargetMixin implements RenderTargetExt { @Shadow public abstract void resize(int width, int height, boolean getError); @Shadow public int width; diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/InGameOverlayRendererMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/ScreenEffectRendererMixin.java similarity index 96% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/InGameOverlayRendererMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/ScreenEffectRendererMixin.java index 55b903ed..71fedce7 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/InGameOverlayRendererMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/ScreenEffectRendererMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(ScreenEffectRenderer.class) -public class InGameOverlayRendererMixin { +public class ScreenEffectRendererMixin { @WrapWithCondition( method = "renderScreenEffect", diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/client/SoundSystemMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/client/SoundEngineMixin.java similarity index 97% rename from src/main/java/com/fusionflux/portalcubed/mixin/client/SoundSystemMixin.java rename to src/main/java/com/fusionflux/portalcubed/mixin/client/SoundEngineMixin.java index b95ac8fd..1a092679 100644 --- a/src/main/java/com/fusionflux/portalcubed/mixin/client/SoundSystemMixin.java +++ b/src/main/java/com/fusionflux/portalcubed/mixin/client/SoundEngineMixin.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(SoundEngine.class) -public abstract class SoundSystemMixin { +public abstract class SoundEngineMixin { @Shadow public abstract void play(SoundInstance sound); @Inject( diff --git a/src/main/java/com/fusionflux/portalcubed/util/AdvancedEntityRaycast.java b/src/main/java/com/fusionflux/portalcubed/util/AdvancedEntityRaycast.java index 8cf56c01..1b32d6e4 100644 --- a/src/main/java/com/fusionflux/portalcubed/util/AdvancedEntityRaycast.java +++ b/src/main/java/com/fusionflux/portalcubed/util/AdvancedEntityRaycast.java @@ -1,6 +1,6 @@ package com.fusionflux.portalcubed.util; -import com.fusionflux.portalcubed.mixin.RaycastContextAccessor; +import com.fusionflux.portalcubed.mixin.ClipContextAccessor; import com.google.common.base.Suppliers; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -138,9 +138,9 @@ public static ClipContext withStartEnd(ClipContext context, Vec3 start, Vec3 end //noinspection DataFlowIssue return new ClipContext( start, end, - ((RaycastContextAccessor)context).getBlock(), - ((RaycastContextAccessor)context).getFluid(), - ((RaycastContextAccessor)context).getCollisionContext() instanceof EntityCollisionContext esc + ((ClipContextAccessor)context).getBlock(), + ((ClipContextAccessor)context).getFluid(), + ((ClipContextAccessor)context).getCollisionContext() instanceof EntityCollisionContext esc ? esc.getEntity() : null ); } diff --git a/src/main/java/com/fusionflux/portalcubed/util/HolderComponent.java b/src/main/java/com/fusionflux/portalcubed/util/HolderComponent.java index d29c36b8..352631b8 100644 --- a/src/main/java/com/fusionflux/portalcubed/util/HolderComponent.java +++ b/src/main/java/com/fusionflux/portalcubed/util/HolderComponent.java @@ -1,7 +1,7 @@ package com.fusionflux.portalcubed.util; import com.fusionflux.portalcubed.accessor.Accessors; -import com.fusionflux.portalcubed.accessor.HeldItemRendererExt; +import com.fusionflux.portalcubed.accessor.ItemInHandRendererExt; import com.fusionflux.portalcubed.compat.rayon.RayonIntegration; import com.fusionflux.portalcubed.entity.CorePhysicsEntity; import com.fusionflux.portalcubed.items.PortalCubedItems; @@ -112,7 +112,7 @@ public void writeSyncPacket(FriendlyByteBuf buf, ServerPlayer recipient) { private void handHideRefresh() { if (owner.getMainHandItem().is(PortalCubedItems.HOLDS_OBJECT)) return; owner.resetAttackStrengthTicker(); - ((HeldItemRendererExt)Minecraft.getInstance().gameRenderer.itemInHandRenderer).startHandFaker(); + ((ItemInHandRendererExt)Minecraft.getInstance().gameRenderer.itemInHandRenderer).startHandFaker(); } } diff --git a/src/main/resources/portalcubed.mixins.json b/src/main/resources/portalcubed.mixins.json index 9349c8b0..709f40e3 100644 --- a/src/main/resources/portalcubed.mixins.json +++ b/src/main/resources/portalcubed.mixins.json @@ -5,46 +5,46 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "BlockHitResultMixin", + "ClipContextAccessor", + "CollisionContextMixin", "EntityMixin", + "InventoryMixin", + "LevelMixin", + "LevelReaderMixin", "LivingEntityMixin", - "PlayerEntityMixin", - "PlayerInventoryMixin", - "RaycastContextAccessor", - "ServerPlayerInteractionManagerMixin", - "ServerPlayNetworkHandlerMixin", - "ShapeContextMixin", - "WorldMixin", - "WorldViewMixin" + "PlayerMixin", + "ServerGamePacketListenerImplMixin", + "ServerPlayerGameModeMixin" ], "client": [ + "client.AbstractContainerScreenMixin", "client.AbstractSoundInstanceAccessor", - "client.BackgroundRendererMixin", "client.CameraMixin", - "client.ClientAdvancementManagerMixin", - "client.ClientPlayerEntityMixin", - "client.ClientPlayerInteractionManagerMixin", - "client.ClientPlayNetworkHandlerMixin", - "client.ClientWorldMixin", + "client.ClientAdvancementMixin", + "client.ClientLevelMixin", + "client.ClientPacketListenerMixin", "client.DeathScreenAccessor", "client.DeathScreenMixin", - "client.FramebufferMixin", + "client.FogRendererMixin", "client.GameRendererMixin", - "client.HandledScreenMixin", - "client.HeldItemRendererMixin", - "client.InGameHudMixin", - "client.InGameOverlayRendererMixin", + "client.GuiMixin", "client.ItemEntityRendererMixin", - "client.KeyBindAccessor", + "client.ItemInHandRendererMixin", + "client.KeyboardHandlerMixin", "client.KeyboardInputMixin", - "client.KeyboardMixin", - "client.MinecraftClientMixin", - "client.ModelLoaderMixin", - "client.MouseMixin", - "client.MusicTrackerAccessor", - "client.ParticleManagerMixin", - "client.PlayerEntityRendererMixin", + "client.KeyMappingAccessor", + "client.LocalPlayerMixin", + "client.MinecraftMixin", + "client.ModelBakeryMixin", + "client.MouseHandlerMixin", + "client.MultiPlayerGameModeMixin", + "client.MusicManagerAccessor", + "client.ParticleEngineMixin", + "client.PlayerRendererMixin", "client.RenderSystemMixin", - "client.SoundSystemMixin", + "client.RenderTargetMixin", + "client.ScreenEffectRendererMixin", + "client.SoundEngineMixin", "client.TitleScreenMixin", "client.VertexConsumerMixin" ],