remove quark compat (re-adding when released)

closes #54
MelanX · Jan 28, 2024 · 3100553 · 3100553
1 parent c521e50
commit 3100553
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     coremods 'org.moddingx:CoreModTypes:5.0.2-2'
 
     // for testing
-    compileOnly fg.deobf("vazkii.quark:Quark:3.4-405.2987") // 1.19.2
+//    compileOnly fg.deobf("vazkii.quark:Quark:3.4-405.2987") // 1.19.2 todo re-add when 1.20.1 version is available
     compileOnly fg.deobf("vazkii.autoreglib:AutoRegLib:1.8.2-55.124")
 //    runtimeOnly curse.mod(443900, 3760255) // Pipez
 //    runtimeOnly curse.mod(254241, 4569291) // mob_grinding_utils-1.19.2-0.4.50

diff --git a/src/main/java/de/melanx/utilitix/compat/quark/QuarkCompat.java b/src/main/java/de/melanx/utilitix/compat/quark/QuarkCompat.java
@@ -3,9 +3,6 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import vazkii.quark.base.handler.GeneralConfig;
-import vazkii.quark.base.module.ModuleLoader;
-import vazkii.quark.content.tweaks.module.DoubleDoorOpeningModule;
 
 public class QuarkCompat {
 
@@ -14,14 +11,14 @@ public class QuarkCompat {
     public static Component warningForGlue() {
         Component component = null;
 
-        if (GeneralConfig.usePistonLogicRepl) {
-            component = WARNING;
-        }
+//        if (GeneralConfig.usePistonLogicRepl) {
+//            component = WARNING;
+//        }
 
         return component;
     }
 
     public static boolean useDoorOpening() {
-        return !ModuleLoader.INSTANCE.isModuleEnabled(DoubleDoorOpeningModule.class);
+        return true; // !ModuleLoader.INSTANCE.isModuleEnabled(DoubleDoorOpeningModule.class);
     }
 }
diff --git a/src/main/java/de/melanx/utilitix/mixin/MixinDoorBlock.java b/src/main/java/de/melanx/utilitix/mixin/MixinDoorBlock.java
@@ -46,7 +46,7 @@ public void openSecondDoor(BlockState state, Level level, BlockPos pos, Player p
         BlockPos neighborPos = pos.relative(hinge == DoorHingeSide.LEFT ? facing.getClockWise() : facing.getCounterClockWise());
 
         BlockState neighborState = level.getBlockState(neighborPos);
-        if (!(neighborState.getBlock() instanceof DoorBlock) && !neighborState.is(BlockTags.DOORS) || neighborState.getValue(DoorBlock.OPEN) != open || isWoodenDoor(neighborState)) {
+        if (!(neighborState.getBlock() instanceof DoorBlock) && !neighborState.is(BlockTags.DOORS) || neighborState.getValue(DoorBlock.OPEN) != open || !isWoodenDoor(neighborState)) {
             return;
         }