From 65253d5199a3824dc88c2de9d3b240e60fe1c879 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Mon, 30 Sep 2024 19:00:00 -0700
Subject: [PATCH] Re-fix dev-time conflict with lithium height overrides

See cfa80c44 and 2acd5cc2
---
 .../spottedleaf/moonrise/mixin/collisions/LevelMixin.java  | 7 +------
 .../ca/spottedleaf/moonrise/mixin/getblock/LevelMixin.java | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java
index 58c48fc1..43865436 100644
--- a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java
+++ b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java
@@ -1,6 +1,5 @@
 package ca.spottedleaf.moonrise.mixin.collisions;
 
-import ca.spottedleaf.moonrise.common.util.WorldUtil;
 import ca.spottedleaf.moonrise.patches.block_counting.BlockCountingChunkSection;
 import ca.spottedleaf.moonrise.patches.collisions.CollisionUtil;
 import ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState;
@@ -34,15 +33,11 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-// Higher priority to apply after Lithium mixin.world.inline_height.WorldMixin
-@Mixin(value = Level.class, priority = 1100)
+@Mixin(Level.class)
 abstract class LevelMixin implements LevelAccessor, AutoCloseable {
 
     @Shadow
diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/getblock/LevelMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/getblock/LevelMixin.java
index 84d46eef..bb75901f 100644
--- a/src/main/java/ca/spottedleaf/moonrise/mixin/getblock/LevelMixin.java
+++ b/src/main/java/ca/spottedleaf/moonrise/mixin/getblock/LevelMixin.java
@@ -11,7 +11,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Level.class)
+// Higher priority to apply after Lithium mixin.world.inline_height.WorldMixin
+@Mixin(value = Level.class, priority = 1100)
 abstract class LevelMixin implements GetBlockLevel, LevelAccessor, AutoCloseable {
 
     @Unique