From 135a3f56a5ef8948a34b18d5c2340aeb4b652ff7 Mon Sep 17 00:00:00 2001 From: ToadDev <748280+Toad-Dev@users.noreply.github.com> Date: Thu, 27 May 2021 23:23:05 -0700 Subject: [PATCH] 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). --- .../computercraft/ComputerCraftAPIImpl.java | 2 +- .../api/client/TransformedModel.java | 2 +- .../client/ClientTableFormatter.java | 2 +- .../proxy/ComputerCraftProxyClient.java | 2 +- .../client/render/ItemMapLikeRenderer.java | 2 +- .../client/render/ModelTransformer.java | 2 +- .../events/ClientUnloadWorldEvent.java | 2 +- .../mixin/AffineTransformationAccess.java | 2 +- .../{ => fabric}/mixin/BakedQuadAccess.java | 2 +- .../{ => fabric}/mixin/ChatHudAccess.java | 2 +- .../mixin/HeldItemRendererAccess.java | 2 +- .../mixin/MinecraftServerAccess.java | 2 +- .../{ => fabric}/mixin/MixinBlock.java | 2 +- .../{ => fabric}/mixin/MixinEntity.java | 2 +- .../mixin/MixinHeldItemRenderer.java | 15 ++--------- .../mixin/MixinItemFrameEntityRenderer.java | 2 +- .../mixin/MixinMinecraftClient.java | 4 +-- .../{ => fabric}/mixin/MixinScreen.java | 2 +- .../{ => fabric}/mixin/MixinServerWorld.java | 2 +- .../{ => fabric}/mixin/MixinWorld.java | 2 +- .../mixin/MixinWorldRenderer.java | 2 +- .../mixin/SignBlockEntityAccess.java | 2 +- .../{ => fabric}/mixin/SoundEventAccess.java | 2 +- .../mixin/WorldSavePathAccess.java | 2 +- .../mixed/MixedFirstPersonRenderer.java | 17 ------------ .../client/PlayRecordClientMessage.java | 2 +- .../peripheral/speaker/SpeakerPeripheral.java | 26 +++++++++---------- .../shared/turtle/SignInspectHandler.java | 2 +- .../computercraft/shared/util/IDAssigner.java | 2 +- src/main/resources/computercraft.mixins.json | 2 +- 30 files changed, 43 insertions(+), 71 deletions(-) rename src/main/java/dan200/computercraft/{ => fabric}/events/ClientUnloadWorldEvent.java (91%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/AffineTransformationAccess.java (91%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/BakedQuadAccess.java (86%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/ChatHudAccess.java (88%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/HeldItemRendererAccess.java (94%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MinecraftServerAccess.java (88%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinBlock.java (96%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinEntity.java (96%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinHeldItemRenderer.java (83%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinItemFrameEntityRenderer.java (97%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinMinecraftClient.java (92%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinScreen.java (95%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinServerWorld.java (95%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinWorld.java (97%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinWorldRenderer.java (98%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/SignBlockEntityAccess.java (86%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/SoundEventAccess.java (86%) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/WorldSavePathAccess.java (88%) delete mode 100644 src/main/java/dan200/computercraft/shared/mixed/MixedFirstPersonRenderer.java diff --git a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java index 4dcb559a9..7176f3e61 100644 --- a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/api/client/TransformedModel.java b/src/main/java/dan200/computercraft/api/client/TransformedModel.java index 8f24cfabb..911bfbb90 100644 --- a/src/main/java/dan200/computercraft/api/client/TransformedModel.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java index 13f0ebc24..d3cd9b7bf 100644 --- a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java index da9b965b1..af142d3ff 100644 --- a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java b/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java index 37670d02b..8eb76f6d0 100644 --- a/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java index b8a766e0a..f455fd883 100644 --- a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/events/ClientUnloadWorldEvent.java b/src/main/java/dan200/computercraft/fabric/events/ClientUnloadWorldEvent.java similarity index 91% rename from src/main/java/dan200/computercraft/events/ClientUnloadWorldEvent.java rename to src/main/java/dan200/computercraft/fabric/events/ClientUnloadWorldEvent.java index 081997c68..bd2582dba 100644 --- a/src/main/java/dan200/computercraft/events/ClientUnloadWorldEvent.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/AffineTransformationAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/AffineTransformationAccess.java similarity index 91% rename from src/main/java/dan200/computercraft/mixin/AffineTransformationAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/AffineTransformationAccess.java index a648daa1d..11f98a308 100644 --- a/src/main/java/dan200/computercraft/mixin/AffineTransformationAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/BakedQuadAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/BakedQuadAccess.java similarity index 86% rename from src/main/java/dan200/computercraft/mixin/BakedQuadAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/BakedQuadAccess.java index 11c2abd52..67f8acbf9 100644 --- a/src/main/java/dan200/computercraft/mixin/BakedQuadAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/ChatHudAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/ChatHudAccess.java similarity index 88% rename from src/main/java/dan200/computercraft/mixin/ChatHudAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/ChatHudAccess.java index b2438b78a..08389f84b 100644 --- a/src/main/java/dan200/computercraft/mixin/ChatHudAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/HeldItemRendererAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/HeldItemRendererAccess.java similarity index 94% rename from src/main/java/dan200/computercraft/mixin/HeldItemRendererAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/HeldItemRendererAccess.java index a54b1a51a..c7cb0e3e3 100644 --- a/src/main/java/dan200/computercraft/mixin/HeldItemRendererAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MinecraftServerAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/MinecraftServerAccess.java similarity index 88% rename from src/main/java/dan200/computercraft/mixin/MinecraftServerAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/MinecraftServerAccess.java index 708ae6a1f..a0c5436a1 100644 --- a/src/main/java/dan200/computercraft/mixin/MinecraftServerAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinBlock.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinBlock.java similarity index 96% rename from src/main/java/dan200/computercraft/mixin/MixinBlock.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinBlock.java index 53da08f30..c9eadae2c 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinBlock.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinEntity.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinEntity.java similarity index 96% rename from src/main/java/dan200/computercraft/mixin/MixinEntity.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinEntity.java index 79e3d7ff7..5f57443e8 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinEntity.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinHeldItemRenderer.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinHeldItemRenderer.java similarity index 83% rename from src/main/java/dan200/computercraft/mixin/MixinHeldItemRenderer.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinHeldItemRenderer.java index a3c1fb813..bf0b86295 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinHeldItemRenderer.java +++ b/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 { - @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); - } - +public class MixinHeldItemRenderer { @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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinItemFrameEntityRenderer.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java similarity index 97% rename from src/main/java/dan200/computercraft/mixin/MixinItemFrameEntityRenderer.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java index be54ba591..9480ee9e4 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinItemFrameEntityRenderer.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinMinecraftClient.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinMinecraftClient.java similarity index 92% rename from src/main/java/dan200/computercraft/mixin/MixinMinecraftClient.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinMinecraftClient.java index c468eabbe..d734632a7 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinMinecraftClient.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinScreen.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinScreen.java similarity index 95% rename from src/main/java/dan200/computercraft/mixin/MixinScreen.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinScreen.java index 9d07929b5..eda9d189a 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinScreen.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinServerWorld.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinServerWorld.java similarity index 95% rename from src/main/java/dan200/computercraft/mixin/MixinServerWorld.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinServerWorld.java index bf512b895..b59e42ffc 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinServerWorld.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinWorld.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java similarity index 97% rename from src/main/java/dan200/computercraft/mixin/MixinWorld.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java index be271fca2..80d1aec77 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinWorld.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/MixinWorldRenderer.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinWorldRenderer.java similarity index 98% rename from src/main/java/dan200/computercraft/mixin/MixinWorldRenderer.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinWorldRenderer.java index 76a0b569c..3f2180963 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinWorldRenderer.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/SignBlockEntityAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/SignBlockEntityAccess.java similarity index 86% rename from src/main/java/dan200/computercraft/mixin/SignBlockEntityAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/SignBlockEntityAccess.java index 1bd22ce40..a5b405f8a 100644 --- a/src/main/java/dan200/computercraft/mixin/SignBlockEntityAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/SoundEventAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/SoundEventAccess.java similarity index 86% rename from src/main/java/dan200/computercraft/mixin/SoundEventAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/SoundEventAccess.java index dea532762..3fba7d8e2 100644 --- a/src/main/java/dan200/computercraft/mixin/SoundEventAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/mixin/WorldSavePathAccess.java b/src/main/java/dan200/computercraft/fabric/mixin/WorldSavePathAccess.java similarity index 88% rename from src/main/java/dan200/computercraft/mixin/WorldSavePathAccess.java rename to src/main/java/dan200/computercraft/fabric/mixin/WorldSavePathAccess.java index bc0a67855..06e8eb7a7 100644 --- a/src/main/java/dan200/computercraft/mixin/WorldSavePathAccess.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/shared/mixed/MixedFirstPersonRenderer.java b/src/main/java/dan200/computercraft/shared/mixed/MixedFirstPersonRenderer.java deleted file mode 100644 index c420d8cc4..000000000 --- a/src/main/java/dan200/computercraft/shared/mixed/MixedFirstPersonRenderer.java +++ /dev/null @@ -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); -} diff --git a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java index 35a11419c..0416c9ea5 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java index adbd32598..c39a750a5 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java +++ b/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, - pos.x, - pos.y, - pos.z, - adjVolume > 1.0f ? 16 * adjVolume : 16.0, - world.getRegistryKey(), - new PlaySoundIdS2CPacket(name, SoundCategory.RECORDS, pos, adjVolume, pitch)); + .sendToAround(null, + pos.x, + pos.y, + pos.z, + adjVolume > 1.0f ? 16 * adjVolume : 16.0, + world.getRegistryKey(), + 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(), - volume, - (float) Math.pow(2.0, (pitch - 12.0) / 12.0), - true); + ((SoundEventAccess)instrument.getSound()).getId(), + volume, + (float) Math.pow(2.0, (pitch - 12.0) / 12.0), + true); if (success) { this.m_notesThisTick.incrementAndGet(); } diff --git a/src/main/java/dan200/computercraft/shared/turtle/SignInspectHandler.java b/src/main/java/dan200/computercraft/shared/turtle/SignInspectHandler.java index a55c67df9..a885ced84 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/SignInspectHandler.java +++ b/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; diff --git a/src/main/java/dan200/computercraft/shared/util/IDAssigner.java b/src/main/java/dan200/computercraft/shared/util/IDAssigner.java index 55724aa48..0ef5db760 100644 --- a/src/main/java/dan200/computercraft/shared/util/IDAssigner.java +++ b/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; diff --git a/src/main/resources/computercraft.mixins.json b/src/main/resources/computercraft.mixins.json index 2d45964e1..c9ae3995a 100644 --- a/src/main/resources/computercraft.mixins.json +++ b/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",