Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
devOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.29:dev")
compileOnlyApi("com.github.GTNewHorizons:nei-custom-diagram:1.8.30:dev") { transitive = false }
devOnlyNonPublishable("com.github.GTNewHorizons:EnhancedLootBags:1.3.4:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:BetterQuesting:3.8.74-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:BetterQuesting:3.8.77-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Angelica:2.1.53:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:TX-Loader:1.8.11:dev")
devOnlyNonPublishable("curse.maven:cofh-core-69162:2388751")
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/hfstudio/guidenh/mixins/Mixins.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ public enum Mixins implements IMixins {
"minecraft.AccessorSimpleReloadableResourceManager", "forge.AccessorShapedOreRecipe",
"forge.AccessorShapelessOreRecipe"),

BQ_COMPAT(Side.CLIENT, Phase.LATE, Mods.BetterQuesting, "compat.MixinPanelButtonQuest", "compat.MixinPanelTextBox",
"compat.AccessorPanelTextBox", "compat.AccessorPanelTextBoxHotZone"),
BQ_COMPAT(Side.CLIENT, Phase.LATE, Mods.BetterQuesting, "compat.betterquesting.MixinPanelButtonQuest",
"compat.betterquesting.MixinPanelTextBox", "compat.betterquesting.AccessorPanelTextBox",
"compat.betterquesting.AccessorPanelTextBoxHotZone"),

GREGTECH_HATCH_BUILDER(Side.CLIENT, Phase.LATE, Mods.GregTech, "compat.gregtech.AccessorHatchElementBuilder"),

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hfstudio.guidenh.mixins.late.compat;
package com.hfstudio.guidenh.mixins.late.compat.betterquesting;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hfstudio.guidenh.mixins.late.compat;
package com.hfstudio.guidenh.mixins.late.compat.betterquesting;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
Expand All @@ -11,6 +11,6 @@ public interface AccessorPanelTextBoxHotZone {
@Accessor("location")
IGuiRect guidenh$getLocation();

@Accessor("url")
String guidenh$getUrl();
@Accessor("link")
Object guidenh$getLink();
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hfstudio.guidenh.mixins.late.compat;
package com.hfstudio.guidenh.mixins.late.compat.betterquesting;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hfstudio.guidenh.mixins.late.compat;
package com.hfstudio.guidenh.mixins.late.compat.betterquesting;

import java.util.List;

Expand Down Expand Up @@ -33,9 +33,12 @@ public abstract class MixinPanelTextBox {
AccessorPanelTextBoxHotZone accessor = (AccessorPanelTextBoxHotZone) hotZone;
if (accessor.guidenh$getLocation()
.contains(mxt, myt)) {
List<String> tooltip = BqGuidePageLinks.getTooltip(accessor.guidenh$getUrl());
if (tooltip != null && !tooltip.isEmpty()) {
cir.setReturnValue(tooltip);
Object link = accessor.guidenh$getLink();
if (link instanceof String) {
List<String> tooltip = BqGuidePageLinks.getTooltip((String) link);
if (tooltip != null && !tooltip.isEmpty()) {
cir.setReturnValue(tooltip);
}
}
return;
}
Expand Down