From 310055367759a2f8f54d77f1bc9bcf454a7a2eaa Mon Sep 17 00:00:00 2001 From: MelanX Date: Sun, 28 Jan 2024 15:20:37 +0100 Subject: [PATCH] remove quark compat (re-adding when released) closes #54 --- build.gradle | 2 +- .../de/melanx/utilitix/compat/quark/QuarkCompat.java | 11 ++++------- .../java/de/melanx/utilitix/mixin/MixinDoorBlock.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index f7ea594..4bbc845 100644 --- 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 index 0fabd3a..aa689a2 100644 --- 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 index b85710f..4cb37b6 100644 --- 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; }