From 63468f6bc8170f92b35b033021c386bb52239ccd Mon Sep 17 00:00:00 2001 From: StewStrong Date: Mon, 16 Oct 2023 08:27:52 -0600 Subject: [PATCH] Fixed forge not launching --- .../behaviour/MixinScrollValueBehaviour.java | 2 +- .../client/MixinScrollValueBehaviour.java | 21 ---------------- .../valkyrienskies-fabric.mixins.json | 1 - .../client/MixinScrollValueBehaviour.java | 25 ------------------- .../valkyrienskies-forge.mixins.json | 1 - 5 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinScrollValueBehaviour.java delete mode 100644 forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinScrollValueBehaviour.java diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/behaviour/MixinScrollValueBehaviour.java b/common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/behaviour/MixinScrollValueBehaviour.java index e0d31a48c..fc052d56d 100644 --- a/common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/behaviour/MixinScrollValueBehaviour.java +++ b/common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/behaviour/MixinScrollValueBehaviour.java @@ -10,7 +10,7 @@ import org.valkyrienskies.mod.common.VSGameUtilsKt; import org.valkyrienskies.mod.common.util.VectorConversionsMCKt; -@Mixin(targets = "com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour") +@Mixin(ScrollValueBehaviour.class) public class MixinScrollValueBehaviour { @Redirect( diff --git a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinScrollValueBehaviour.java b/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinScrollValueBehaviour.java deleted file mode 100644 index 8a9d7a12a..000000000 --- a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinScrollValueBehaviour.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.valkyrienskies.mod.fabric.mixin.compat.create.client; - -import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(ScrollValueBehaviour.class) -public class MixinScrollValueBehaviour { - -// @Redirect( -// at = @At( -// value = "INVOKE", -// target = "Lnet/minecraft/world/phys/Vec3;subtract(Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3;" -// ), -// method = "testHit" -// ) -// private Vec3 transformHitToShip(final Vec3 hitPos, final Vec3 blockPos) { -// final Vec3 inShipHit = VSGameUtilsKt.toShipRenderCoordinates(Minecraft.getInstance().level, blockPos, hitPos); -// return inShipHit.subtract(blockPos); -// } - -} diff --git a/fabric/src/main/resources/valkyrienskies-fabric.mixins.json b/fabric/src/main/resources/valkyrienskies-fabric.mixins.json index e84ccbce9..f9fd54a75 100644 --- a/fabric/src/main/resources/valkyrienskies-fabric.mixins.json +++ b/fabric/src/main/resources/valkyrienskies-fabric.mixins.json @@ -21,7 +21,6 @@ "compat.create.client.MixinContraptionRenderInfo", "compat.create.client.MixinCullingBlockEntityIterator", "compat.create.client.MixinFlwContraption", - "compat.create.client.MixinScrollValueBehaviour", "compat.create.client.MixinSuperGlueSelectionHandler", "compat.create.client.MixinValueBox" ], diff --git a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinScrollValueBehaviour.java b/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinScrollValueBehaviour.java deleted file mode 100644 index dd4cc0125..000000000 --- a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinScrollValueBehaviour.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.valkyrienskies.mod.forge.mixin.compat.create.client; - -import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; -import net.minecraft.client.Minecraft; -import net.minecraft.world.phys.Vec3; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.valkyrienskies.mod.common.VSGameUtilsKt; - -@Mixin(ScrollValueBehaviour.class) -public class MixinScrollValueBehaviour { - - @Redirect( - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/world/phys/Vec3;subtract(Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3;" - ), - method = "testHit" - ) - private Vec3 transformHitToShip(final Vec3 hitPos, final Vec3 blockPos) { - final Vec3 inShipHit = VSGameUtilsKt.toShipRenderCoordinates(Minecraft.getInstance().level, blockPos, hitPos); - return inShipHit.subtract(blockPos); - } -} diff --git a/forge/src/main/resources/valkyrienskies-forge.mixins.json b/forge/src/main/resources/valkyrienskies-forge.mixins.json index 96701e995..3ad4b2842 100644 --- a/forge/src/main/resources/valkyrienskies-forge.mixins.json +++ b/forge/src/main/resources/valkyrienskies-forge.mixins.json @@ -22,7 +22,6 @@ "client.render.MixinLevelRenderer", "compat.create.client.MixinContraptionRenderInfo", "compat.create.client.MixinFlwContraption", - "compat.create.client.MixinScrollValueBehaviour", "compat.create.client.MixinValueBox", "compat.sodium.MixinRenderSectionManager", "compat.tis3d.MixinCasingTileEntityRender",