Refactor: Begin consolidating fabric only classes.

Made a top-level fabric package so mixins and their ancillary classes
can be grouped together. Also removed a stub duck interface that got
left behind somewhere along the line (MixedFirstPersonRenderer).

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -30,7 +30,7 @@ import dan200.computercraft.core.apis.ApiFactories;
 import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.mixin.MinecraftServerAccess;
+import dan200.computercraft.fabric.mixin.MinecraftServerAccess;
 import dan200.computercraft.shared.BundledRedstone;
 import dan200.computercraft.shared.MediaProviders;
 import dan200.computercraft.shared.Peripherals;

src/main/java/dan200/computercraft/api/client/TransformedModel.java

@@ -10,7 +10,7 @@ import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
-import dan200.computercraft.mixin.AffineTransformationAccess;
+import dan200.computercraft.fabric.mixin.AffineTransformationAccess;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.model.BakedModel;

src/main/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -8,7 +8,7 @@ package dan200.computercraft.client;
 
 import javax.annotation.Nullable;
 
-import dan200.computercraft.mixin.ChatHudAccess;
+import dan200.computercraft.fabric.mixin.ChatHudAccess;
 import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.command.text.TableFormatter;

src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java

@@ -20,7 +20,7 @@ import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtleModelLoader;
 import dan200.computercraft.client.render.TurtlePlayerRenderer;
-import dan200.computercraft.events.ClientUnloadWorldEvent;
+import dan200.computercraft.fabric.events.ClientUnloadWorldEvent;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.common.IColouredItem;

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -6,7 +6,7 @@
 
 package dan200.computercraft.client.render;
 
-import dan200.computercraft.mixin.HeldItemRendererAccess;
+import dan200.computercraft.fabric.mixin.HeldItemRendererAccess;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumerProvider;

src/main/java/dan200/computercraft/client/render/ModelTransformer.java

@@ -8,7 +8,7 @@ package dan200.computercraft.client.render;
 
 import java.util.List;
 
-import dan200.computercraft.mixin.BakedQuadAccess;
+import dan200.computercraft.fabric.mixin.BakedQuadAccess;
 
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormatElement;

src/main/java/dan200/computercraft/fabric/events/ClientUnloadWorldEvent.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.events;
+package dan200.computercraft.fabric.events;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/dan200/computercraft/fabric/mixin/AffineTransformationAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dan200/computercraft/fabric/mixin/BakedQuadAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dan200/computercraft/fabric/mixin/ChatHudAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

src/main/java/dan200/computercraft/fabric/mixin/HeldItemRendererAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

src/main/java/dan200/computercraft/fabric/mixin/MinecraftServerAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dan200/computercraft/fabric/mixin/MixinBlock.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.shared.util.DropConsumer;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dan200/computercraft/fabric/mixin/MixinEntity.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.shared.util.DropConsumer;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dan200/computercraft/fabric/mixin/MixinHeldItemRenderer.java

@@ -4,12 +4,11 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.client.render.ItemPocketRenderer;
 import dan200.computercraft.client.render.ItemPrintoutRenderer;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-import dan200.computercraft.shared.mixed.MixedFirstPersonRenderer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,22 +29,12 @@ import net.fabricmc.api.Environment;
 
 @Mixin (HeldItemRenderer.class)
 @Environment (EnvType.CLIENT)
-public class MixinHeldItemRenderer implements MixedFirstPersonRenderer {
+public class MixinHeldItemRenderer {
-    @Override
-    public void renderArmFirstPerson_CC(MatrixStack stack, VertexConsumerProvider consumerProvider, int light, float equip, float swing, Arm hand) {
-        this.renderArmHoldingItem(stack, consumerProvider, light, equip, swing, hand);
-    }
-
     @Shadow
     private void renderArmHoldingItem(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, float equipProgress, float swingProgress,
                                       Arm arm) {
     }
 
-    @Override
-    public float getMapAngleFromPitch_CC(float pitch) {
-        return this.getMapAngle(pitch);
-    }
-
     @Shadow
     private float getMapAngle(float pitch) {
         return 0;

src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.client.render.ItemPrintoutRenderer;
 import dan200.computercraft.shared.media.items.ItemPrintout;

src/main/java/dan200/computercraft/fabric/mixin/MixinMinecraftClient.java

@@ -4,10 +4,10 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.client.FrameInfo;
-import dan200.computercraft.events.ClientUnloadWorldEvent;
+import dan200.computercraft.fabric.events.ClientUnloadWorldEvent;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dan200/computercraft/fabric/mixin/MixinScreen.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.shared.command.ClientCommands;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dan200/computercraft/fabric/mixin/MixinServerWorld.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.shared.util.DropConsumer;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import java.util.Collection;
 

src/main/java/dan200/computercraft/fabric/mixin/MixinWorldRenderer.java

@@ -4,7 +4,7 @@
  * Send enquiries to dratcliffe@gmail.com
  */
 
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import dan200.computercraft.client.render.CableHighlightRenderer;
 import dan200.computercraft.client.render.MonitorHighlightRenderer;

src/main/java/dan200/computercraft/fabric/mixin/SignBlockEntityAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dan200/computercraft/fabric/mixin/SoundEventAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dan200/computercraft/fabric/mixin/WorldSavePathAccess.java

@@ -1,4 +1,4 @@
-package dan200.computercraft.mixin;
+package dan200.computercraft.fabric.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

src/main/java/dan200/computercraft/shared/mixed/MixedFirstPersonRenderer.java

@@ -1,17 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-
-package dan200.computercraft.shared.mixed;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Arm;
-
-public interface MixedFirstPersonRenderer {
-    void renderArmFirstPerson_CC(MatrixStack stack, VertexConsumerProvider consumerProvider, int light, float equip, float swing, Arm hand);
-
-    float getMapAngleFromPitch_CC(float pitch);
-}

src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.client;
 
 import javax.annotation.Nonnull;
 
-import dan200.computercraft.mixin.SoundEventAccess;
+import dan200.computercraft.fabric.mixin.SoundEventAccess;
 import dan200.computercraft.shared.network.NetworkMessage;
 
 import net.minecraft.client.MinecraftClient;

src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java

@@ -18,7 +18,7 @@ import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.mixin.SoundEventAccess;
+import dan200.computercraft.fabric.mixin.SoundEventAccess;
 
 import net.minecraft.block.enums.Instrument;
 import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket;
@@ -100,13 +100,13 @@ public abstract class SpeakerPeripheral implements IPeripheral {
 
             float adjVolume = Math.min(volume, 3.0f);
             server.getPlayerManager()
-                  .sendToAround(null,
+                .sendToAround(null,
-                                pos.x,
+                    pos.x,
-                                pos.y,
+                    pos.y,
-                                pos.z,
+                    pos.z,
-                                adjVolume > 1.0f ? 16 * adjVolume : 16.0,
+                    adjVolume > 1.0f ? 16 * adjVolume : 16.0,
-                                world.getRegistryKey(),
+                    world.getRegistryKey(),
-                                new PlaySoundIdS2CPacket(name, SoundCategory.RECORDS, pos, adjVolume, pitch));
+                    new PlaySoundIdS2CPacket(name, SoundCategory.RECORDS, pos, adjVolume, pitch));
             return null;
         });
 
@@ -141,7 +141,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
         Instrument instrument = null;
         for (Instrument testInstrument : Instrument.values()) {
             if (testInstrument.asString()
-                              .equalsIgnoreCase(name)) {
+                .equalsIgnoreCase(name)) {
                 instrument = testInstrument;
                 break;
             }
@@ -154,10 +154,10 @@ public abstract class SpeakerPeripheral implements IPeripheral {
 
         // If the resource location for note block notes changes, this method call will need to be updated
         boolean success = this.playSound(context,
-                                         ((SoundEventAccess)instrument.getSound()).getId(),
+            ((SoundEventAccess)instrument.getSound()).getId(),
-                                         volume,
+            volume,
-                                         (float) Math.pow(2.0, (pitch - 12.0) / 12.0),
+            (float) Math.pow(2.0, (pitch - 12.0) / 12.0),
-                                         true);
+            true);
         if (success) {
             this.m_notesThisTick.incrementAndGet();
         }

src/main/java/dan200/computercraft/shared/turtle/SignInspectHandler.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import com.google.common.eventbus.Subscribe;
 
 import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
-import dan200.computercraft.mixin.SignBlockEntityAccess;
+import dan200.computercraft.fabric.mixin.SignBlockEntityAccess;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;

src/main/java/dan200/computercraft/shared/util/IDAssigner.java

@@ -21,7 +21,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.mixin.WorldSavePathAccess;
+import dan200.computercraft.fabric.mixin.WorldSavePathAccess;
 import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils;
 
 import net.minecraft.server.MinecraftServer;

src/main/resources/computercraft.mixins.json

@@ -1,6 +1,6 @@
 {
     "required": true,
-    "package": "dan200.computercraft.mixin",
+    "package": "dan200.computercraft.fabric.mixin",
     "compatibilityLevel": "JAVA_8",
     "mixins": [
         "MinecraftServerAccess",