From 7c0664b9f247c4ca142bcaf485d134b3863efb70 Mon Sep 17 00:00:00 2001 From: ToadDev <748280+Toad-Dev@users.noreply.github.com> Date: Thu, 3 Jun 2021 21:32:37 -0700 Subject: [PATCH] Fix mixin from latest PR getting left behind in refactor. I refactored the mixin package to be within a fabric package so other fabric specific code could be kept nearby. But a mixin from a recent PR got left behind in the merge. Github's empty merge conflict might have been about this. --- .../{ => fabric}/mixin/MixinServerPlayerInteractionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/dan200/computercraft/{ => fabric}/mixin/MixinServerPlayerInteractionManager.java (97%) diff --git a/src/main/java/dan200/computercraft/mixin/MixinServerPlayerInteractionManager.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinServerPlayerInteractionManager.java similarity index 97% rename from src/main/java/dan200/computercraft/mixin/MixinServerPlayerInteractionManager.java rename to src/main/java/dan200/computercraft/fabric/mixin/MixinServerPlayerInteractionManager.java index 878cb6d70..0e8886ebb 100644 --- a/src/main/java/dan200/computercraft/mixin/MixinServerPlayerInteractionManager.java +++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinServerPlayerInteractionManager.java @@ -1,4 +1,4 @@ -package dan200.computercraft.mixin; +package dan200.computercraft.fabric.mixin; import dan200.computercraft.shared.ComputerCraftRegistry; import net.minecraft.advancement.criterion.Criteria;