Skip to content

Commit

Permalink
fix: removed mixinextras for now
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBv committed Dec 29, 2023
1 parent e94be89 commit 698e929
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 20 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ dependencies {
//compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.2.0.25")
//runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge-15.2.0.25")
implementation fg.deobf("curse.maven:citadel-331936:4744075")

implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.2"))
implementation(jarJar("io.github.llamalad7:mixinextras-neoforge:0.3.2")) {
jarJar.ranged(it, "[0.3.2,)")
}
// TODO: Reimplement for 1.20.2 and onwards
//implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.2"))
//implementation(jarJar("io.github.llamalad7:mixinextras-neoforge:0.3.2")) {
// jarJar.ranged(it, "[0.3.2,)")
//}
}

// Example for how to get properties into the manifest for reading by the runtime..
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
package com.github.alexthe666.iceandfire.mixin;

import com.github.alexthe666.iceandfire.entity.EntityAmphithere;
import com.github.alexthe666.iceandfire.entity.EntityHippocampus;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

//TODO: The real solution would be to properly fix the move vehicle moved wrongly stuff, but this is a quick fix for now
@Mixin(ServerGamePacketListenerImpl.class)
//@Mixin(ServerGamePacketListenerImpl.class)
public class SuppressVehicleMovedWronglyMixin {

@Shadow
/*@Shadow
public ServerPlayer player;
@WrapOperation(method = "handleMoveVehicle(Lnet/minecraft/network/protocol/game/ServerboundMoveVehiclePacket;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", ordinal = 1, remap = false))
Expand All @@ -27,6 +16,6 @@ private void iaf_lowerVehicleMovedWronglyLoggingLevel(Logger instance, String s,
} else {
instance.warn(s, o);
}
}
}*/

}
1 change: 0 additions & 1 deletion src/main/resources/iceandfire.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"compatibilityLevel": "JAVA_17",
"refmap": "iceandfire.refmap.json",
"mixins": [
"SuppressVehicleMovedWronglyMixin",
"gen.NoLakesInStructuresMixin",
"gen.WorldGenRegionMixin"
],
Expand Down

0 comments on commit 698e929

Please sign in to comment.