Got forge working

ValkyrienSkies · Sep 27, 2024 · c372f07 · c372f07
1 parent 6be3966
commit c372f07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...src/main/java/org/valkyrienskies/mod/forge/mixin/compat/cc_tweaked/MixinSpeakerSound.java b/...src/main/java/org/valkyrienskies/mod/forge/mixin/compat/cc_tweaked/MixinSpeakerSound.java
@@ -5,6 +5,7 @@
 import net.minecraft.client.resources.sounds.AbstractSoundInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3d;
@@ -23,8 +24,8 @@ public abstract class MixinSpeakerSound extends AbstractSoundInstance implements
     @Unique private SpeakerPosition speakerPosition;
     @Unique private Ship ship;
 
-    protected MixinSpeakerSound(ResourceLocation arg, SoundSource arg2) {
-        super(arg, arg2);
+    protected MixinSpeakerSound(ResourceLocation arg, SoundSource arg2, RandomSource arg3) {
+        super(arg, arg2, arg3);
     }
 
     @Inject(

diff --git a/.../java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinTrackBlockOutline.java b/.../java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinTrackBlockOutline.java
@@ -11,7 +11,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.client.event.DrawSelectionEvent;
+import net.minecraftforge.client.event.RenderHighlightEvent;
 import org.joml.Quaterniond;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -99,7 +99,7 @@ private static BlockPos modIsWithinBounds(final BlockPos blockPos) {
     }
 
     @Inject(method = "drawCustomBlockSelection", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;translate(DDD)V"))
-    private static void harvest(DrawSelectionEvent.HighlightBlock event, CallbackInfo ci) {
+    private static void harvest(RenderHighlightEvent.Block event, CallbackInfo ci) {
         valkyrienskies$info = event.getCamera();
         valkyrienskies$hitResult = (BlockHitResult) event.getTarget();
     }

diff --git a/forge/src/main/resources/valkyrienskies-forge.mixins.json b/forge/src/main/resources/valkyrienskies-forge.mixins.json
@@ -12,7 +12,6 @@
     "compat.create.MixinControlledContraptionEntity",
     "compat.immersivengineering.MixinBlockEntityInventory",
     "compat.mekanism.MixinRadiationManager",
-    "compat.modular_routers.MixinContainerModularRouter",
     "compat.tfc.MixinTFCChunkGenerator",
     "compat.thermalexpansion.MixinTileCoFH",
     "compat.tis3d.MixinInfraredPacketEntity",