Rename mixins so that they match mappings more

apron-compat/src/main/java/io/github/betterthanupdates/apron/compat/mixin/client/aether/TitleScreenMixin.java

@@ -35,10 +35,10 @@
 import net.minecraft.mod_Aether;
 
 import io.github.betterthanupdates.apron.ReflectionUtils;
-import io.github.betterthanupdates.apron.mixin.client.ButtonWidgetAccessor;
-import io.github.betterthanupdates.apron.mixin.EntityAccessor;
-import io.github.betterthanupdates.apron.mixin.client.SoundHelperAccessor;
-import io.github.betterthanupdates.apron.mixin.WorldAccessor;
+import io.github.betterthanupdates.apron.mixin.client.gui.widget.ButtonWidgetAccessor;
+import io.github.betterthanupdates.apron.mixin.entity.EntityAccessor;
+import io.github.betterthanupdates.apron.mixin.client.sound.SoundManagerAccessor;
+import io.github.betterthanupdates.apron.mixin.world.WorldAccessor;
 
 @Mixin(TitleScreen.class)
 public abstract class TitleScreenMixin extends Screen {
@@ -98,8 +98,8 @@ public void initVanillaScreen(CallbackInfo ci) {
 		if (musicId == -1 && !loadingWorld) {
 			this.minecraft.soundManager.method_2009("aether.music.menu", 1.0F, 1.0F);
 
-			musicId = ((SoundHelperAccessor) this.minecraft.soundManager).getField_2671();
-			((SoundHelperAccessor) this.minecraft.soundManager).setField_2675(999999999);
+			musicId = ((SoundManagerAccessor) this.minecraft.soundManager).getField_2671();
+			((SoundManagerAccessor) this.minecraft.soundManager).setField_2675(999999999);
 		}
 
 		if (loadingWorld) {
@@ -241,9 +241,9 @@ public void buttonClicked(ButtonWidget button, CallbackInfo ci) {
 			this.minecraft.setScreen(null);
 			mmactive = false;
 
-			SoundSystem sound = SoundHelperAccessor.getSoundSystem();
+			SoundSystem sound = SoundManagerAccessor.getSoundSystem();
 			sound.stop("sound_" + musicId);
-			((SoundHelperAccessor) this.minecraft.soundManager).setField_2675(6000);
+			((SoundManagerAccessor) this.minecraft.soundManager).setField_2675(6000);
 
 			musicId = -1;
 		}

apron-stapi/src/main/java/io/github/betterthanupdates/apron/stapi/mixin/PortalBlockMixin.java → apron-stapi/src/main/java/io/github/betterthanupdates/apron/stapi/mixin/NetherPortalBlockMixin.java

@@ -1,6 +1,6 @@
 package io.github.betterthanupdates.apron.stapi.mixin;
 
-import io.github.betterthanupdates.shockahpi.block.ShockAhPIPortalBlock;
+import io.github.betterthanupdates.shockahpi.block.ShockAhPINetherPortalBlock;
 import net.minecraft.block.NetherPortalBlock;
 import net.minecraft.class_467;
 import net.minecraft.entity.player.PlayerEntity;
@@ -18,7 +18,7 @@
 import java.util.Optional;
 
 @Mixin(NetherPortalBlock.class)
-public abstract class PortalBlockMixin implements ShockAhPIPortalBlock, TeleportationManager {
+public abstract class NetherPortalBlockMixin implements ShockAhPINetherPortalBlock, TeleportationManager {
 	@Override
 	public void switchDimension(PlayerEntity player) {
 		if (this instanceof CustomPortal) {

apron-stapi/src/main/java/io/github/betterthanupdates/apron/stapi/mixin/client/MinecraftClientMixin.java → apron-stapi/src/main/java/io/github/betterthanupdates/apron/stapi/mixin/client/MinecraftMixin.java

@@ -5,10 +5,10 @@
 import net.minecraft.client.Minecraft;
 
 import io.github.betterthanupdates.apron.stapi.ApronStAPICompat;
-import io.github.betterthanupdates.stapi.StAPIMinecraftClient;
+import io.github.betterthanupdates.stapi.StAPIMinecraft;
 
 @Mixin(Minecraft.class)
-public class MinecraftClientMixin implements StAPIMinecraftClient {
+public class MinecraftMixin implements StAPIMinecraft {
 	@Override
 	public int apron$stapi$registerTextureOverride(String target, String textureFile) {
 		return ApronStAPICompat.registerTextureOverride(target, textureFile);

apron-stapi/src/main/resources/apron-stapi.mixins.json

@@ -13,7 +13,7 @@
     "BlockMixin",
     "ItemMixin",
     "ItemStackMixin",
-    "PortalBlockMixin",
+    "NetherPortalBlockMixin",
     "SchemaAccessor",
     "TranslationStorageAccessor",
     "ami.AMIItemRegistryMixin",
@@ -37,6 +37,6 @@
     "client.BlockRendererMixin",
     "client.DiggingParticleEntityMixin",
     "client.DimensionMixin",
-    "client.MinecraftClientMixin"
+    "client.MinecraftMixin"
   ]
 }

apron/src/main/java/forge/MinecraftForgeClient.java

@@ -16,7 +16,7 @@
 import io.github.betterthanupdates.Legacy;
 import io.github.betterthanupdates.apron.api.ApronApi;
 import io.github.betterthanupdates.apron.impl.client.ApronClientImpl;
-import io.github.betterthanupdates.stapi.StAPIMinecraftClient;
+import io.github.betterthanupdates.stapi.StAPIMinecraft;
 
 @SuppressWarnings("unused")
 @Environment(EnvType.CLIENT)
@@ -45,7 +45,7 @@ public static void unbindTexture() {
 
 	public static void preloadTexture(String texture) {
 		if (FabricLoader.getInstance().isModLoaded("stationapi")) {
-			((StAPIMinecraftClient) ApronApi.getInstance().getGame()).apron$stapi$preloadTexture(texture);
+			((StAPIMinecraft) ApronApi.getInstance().getGame()).apron$stapi$preloadTexture(texture);
 		} else {
 			((ApronClientImpl) ApronApi.getInstance()).getTextureManager().getTextureId(texture);
 		}

apron/src/main/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/block/BlockMixin.java

@@ -1,12 +1,9 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.block;
 
 import io.github.betterthanupdates.stapi.StAPIBlock;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 
 import io.github.betterthanupdates.apron.item.ItemConvertible;
 

apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/MinecraftMixin.java

@@ -4,8 +4,8 @@
 
 import net.minecraft.client.Minecraft;
 
-import io.github.betterthanupdates.stapi.StAPIMinecraftClient;
+import io.github.betterthanupdates.stapi.StAPIMinecraft;
 
 @Mixin(Minecraft.class)
-public class MinecraftClientMixin implements StAPIMinecraftClient {
+public class MinecraftMixin implements StAPIMinecraft {
 }

apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/gui/hud/InGameHudMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin.client;
+package io.github.betterthanupdates.apron.mixin.client.gui.hud;
 
 import static io.github.betterthanupdates.apron.Apron.*;
 

apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/gui/screen/TitleScreenMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin.client;
+package io.github.betterthanupdates.apron.mixin.client.gui.screen;
 
 //import static io.github.betterthanupdates.apron.Apron.fabricModsLoaded;
 //import static io.github.betterthanupdates.apron.Apron.rmlModsLoaded;

apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/gui/widget/ButtonWidgetAccessor.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin.client;
+package io.github.betterthanupdates.apron.mixin.client.gui.widget;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/sound/SoundManagerAccessor.java

@@ -1,12 +1,12 @@
-package io.github.betterthanupdates.apron.mixin.client;
+package io.github.betterthanupdates.apron.mixin.client.sound;
 
 import net.minecraft.client.sound.SoundManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import paulscode.sound.SoundSystem;
 
 @Mixin(SoundManager.class)
-public interface SoundHelperAccessor {
+public interface SoundManagerAccessor {
 	@Accessor
 	int getField_2671();
 	@Accessor

apron/src/main/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/entity/EntityAccessor.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.entity;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/entity/ItemEntityMixin.java

@@ -1,11 +1,8 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.entity;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.entity.ItemEntity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
 import io.github.betterthanupdates.apron.item.ItemConvertible;
 

apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/item/ItemMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 

apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/item/ItemStackMixin.java

@@ -1,9 +1,7 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.item;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import io.github.betterthanupdates.apron.item.ItemConvertible;

apron/src/main/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java → apron/src/main/java/io/github/betterthanupdates/apron/mixin/world/WorldAccessor.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.apron.mixin;
+package io.github.betterthanupdates.apron.mixin.world;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

apron/src/main/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java → apron/src/main/java/io/github/betterthanupdates/audiomod/mixin/client/sound/SoundManagerMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.audiomod.mixin.client;
+package io.github.betterthanupdates.audiomod.mixin.client.sound;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,7 +34,7 @@
  * @see paulscode.sound.codecs.CodecIBXM
  */
 @Mixin(SoundManager.class)
-public abstract class SoundHelperMixin {
+public abstract class SoundManagerMixin {
 	@Shadow
 	private Random field_2674;
 	@Shadow

apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneWireBlockMixin.java

@@ -16,8 +16,8 @@
 import io.github.betterthanupdates.forge.world.ForgeWorld;
 
 @Mixin(RedstoneWireBlock.class)
-public class RedstoneDustBlockMixin extends Block {
-	protected RedstoneDustBlockMixin(int blockId, Material material) {
+public class RedstoneWireBlockMixin extends Block {
+	protected RedstoneWireBlockMixin(int blockId, Material material) {
 		super(blockId, material);
 	}
 

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/InteractionManagerMixin.java

@@ -10,7 +10,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 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.CallbackInfoReturnable;
 import net.minecraft.client.InteractionManager;
 import net.minecraft.entity.player.PlayerEntity;
@@ -19,7 +18,7 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(InteractionManager.class)
-public class ClientInteractionManagerMixin {
+public class InteractionManagerMixin {
 	/**
 	 * @author Eloraam
 	 * @reason implement Forge hooks

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerInteractionManagerMixin.java

@@ -16,8 +16,8 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(MultiplayerInteractionManager.class)
-public abstract class MultiplayerClientInteractionManagerMixin extends InteractionManager {
-	public MultiplayerClientInteractionManagerMixin(Minecraft client) {
+public abstract class MultiplayerInteractionManagerMixin extends InteractionManager {
+	public MultiplayerInteractionManagerMixin(Minecraft client) {
 		super(client);
 	}
 

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/SingleplayerInteractionManagerMixin.java

@@ -17,8 +17,8 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(SingleplayerInteractionManager.class)
-public class SinglePlayerInteractionManagerMixin extends InteractionManager {
-	public SinglePlayerInteractionManagerMixin(Minecraft client) {
+public class SingleplayerInteractionManagerMixin extends InteractionManager {
+	public SingleplayerInteractionManagerMixin(Minecraft client) {
 		super(client);
 	}
 

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/TessellatorMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client;
+package io.github.betterthanupdates.forge.mixin.client.render;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/block/BlockRenderManagerMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client;
+package io.github.betterthanupdates.forge.mixin.client.render.block;
 
 import modloader.ModLoader;
 import net.fabricmc.api.EnvType;
@@ -24,7 +24,7 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(BlockRenderManager.class)
-public abstract class BlockRendererMixin {
+public abstract class BlockRenderManagerMixin {
 	@Shadow
 	public BlockView blockView;
 	@Shadow

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/chunk/ChunkBuilderMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client;
+package io.github.betterthanupdates.forge.mixin.client.render.chunk;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -18,7 +18,7 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(ChunkBuilder.class)
-public abstract class WorldRendererMixin {
+public abstract class ChunkBuilderMixin {
 
 	@Inject(method = "rebuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Tessellator;startQuads()V", shift = At.Shift.BEFORE))
 	public void method_296$beforeRenderPass(CallbackInfo ci, @Local(index = 11) int i2) {

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/entity/PlayerEntityRendererMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client;
+package io.github.betterthanupdates.forge.mixin.client.render.entity;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -16,8 +16,8 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(PlayerEntityRenderer.class)
-public abstract class PlayerRendererMixin extends LivingEntityRenderer {
-	private PlayerRendererMixin(EntityModel entityModel, float f) {
+public abstract class PlayerEntityRendererMixin extends LivingEntityRenderer {
+	private PlayerEntityRendererMixin(EntityModel entityModel, float f) {
 		super(entityModel, f);
 	}
 

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/item/nostation/ItemRendererMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client.nostation;
+package io.github.betterthanupdates.forge.mixin.client.render.item.nostation;
 
 import java.util.Random;
 

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/VanillaTessellatorMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/render/nostation/TessellatorMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client.nostation;
+package io.github.betterthanupdates.forge.mixin.client.render.nostation;
 
 import org.lwjgl.opengl.ARBVertexBufferObject;
 import org.lwjgl.opengl.GL11;
@@ -18,7 +18,7 @@
 import java.util.Arrays;
 
 @Mixin(Tessellator.class)
-public abstract class VanillaTessellatorMixin {
+public abstract class TessellatorMixin {
 	@Shadow
 	private int vertexCount;
 	@Shadow

apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/texture/TextureManagerMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.client;
+package io.github.betterthanupdates.forge.mixin.client.texture;
 
 import forge.MinecraftForge;
 import net.fabricmc.api.EnvType;

apron/src/main/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/screen/slot/CraftingResultSlotMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.container.slot;
+package io.github.betterthanupdates.forge.mixin.screen.slot;
 
 import forge.ForgeHooks;
 import modloader.ModLoader;

apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/ServerInteractionManagerMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.server.server.player;
+package io.github.betterthanupdates.forge.mixin.server;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/nostation/ServerInteractionManagerMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.server.server.player.nostation;
+package io.github.betterthanupdates.forge.mixin.server.nostation;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.betterthanupdates.forge.block.ForgeBlock;

apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java → apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/nostation/ServerPlayerView_class_514Mixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.forge.mixin.server.server.nostation;
+package io.github.betterthanupdates.forge.mixin.server.nostation;
 
 import net.minecraft.class_167;
 import org.spongepowered.asm.mixin.Mixin;

apron/src/main/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java → apron/src/main/java/io/github/betterthanupdates/guiapi/mixin/client/gui/screen/option/OptionsScreenMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.guiapi.mixin.client;
+package io.github.betterthanupdates.guiapi.mixin.client.gui.screen.option;
 
 import guiapi.ModScreen;
 import guiapi.ModSelect;

apron/src/main/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java → apron/src/main/java/io/github/betterthanupdates/modloader/mixin/block/DispenserBlockMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.modloader.mixin;
+package io.github.betterthanupdates.modloader.mixin.block;
 
 import java.util.Random;
 

apron/src/main/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java → apron/src/main/java/io/github/betterthanupdates/modloader/mixin/block/entity/FurnaceBlockEntityMixin.java

@@ -1,4 +1,4 @@
-package io.github.betterthanupdates.modloader.mixin;
+package io.github.betterthanupdates.modloader.mixin.block.entity;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;