aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/dulkirmod/mixins/MixinEntityRenderer.java7
-rw-r--r--src/main/kotlin/dulkirmod/config/DulkirConfig.kt25
-rw-r--r--src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt5
3 files changed, 33 insertions, 4 deletions
diff --git a/src/main/java/dulkirmod/mixins/MixinEntityRenderer.java b/src/main/java/dulkirmod/mixins/MixinEntityRenderer.java
index d8cb05c..f754f2c 100644
--- a/src/main/java/dulkirmod/mixins/MixinEntityRenderer.java
+++ b/src/main/java/dulkirmod/mixins/MixinEntityRenderer.java
@@ -1,6 +1,7 @@
package dulkirmod.mixins;
import dulkirmod.features.HurtCamSlider;
+import dulkirmod.features.ViewBobbing;
import net.minecraft.client.renderer.EntityRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -15,4 +16,10 @@ public class MixinEntityRenderer {
if (HurtCamSlider.INSTANCE.renderHurt(partialTicks))
ci.cancel();
}
+
+ @Inject(method = "setupViewBobbing", at = @At("HEAD"), cancellable = true)
+ private void modifyViewBobbing(float partialTicks, CallbackInfo ci) {
+ if (ViewBobbing.INSTANCE.renderBob(partialTicks))
+ ci.cancel();
+ }
}
diff --git a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
index df49b52..2703ee5 100644
--- a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
+++ b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
@@ -47,6 +47,14 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
var abiCallerID = false
@Switch(
+ name = "View Bobbing Features",
+ description = "Global Toggle, make sure view bobbing is turned on in game settings",
+ category = "General",
+ subcategory = "General"
+ )
+ var bobbingFeatures = false
+
+ @Switch(
name = "Hurt Cam Slider",
description = "more or less ouchie",
category = "General",
@@ -719,7 +727,7 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
@Switch(
name = "Display outside garden",
- description = "why do you need this",
+ description = "Useful for something!",
category = "HUD",
subcategory = "Farming"
)
@@ -756,6 +764,21 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
)
var visitorInfo = true
+ @Switch(
+ name = "Steak Display",
+ description = "Show a hitbox around a mob when it can be 1 shot with Steak",
+ category = "Rift",
+ subcategory = "Vamp Slayer"
+ )
+ var steakDisplay = false
+
+ @Switch(
+ name = "Ichor Highlight",
+ description = "Shows a hitbox around current ichors",
+ category = "Rift",
+ subcategory = "Vamp Slayer"
+ )
+ var ichorHighlight = false
fun init() {
diff --git a/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt b/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt
index eb6555b..458ebea 100644
--- a/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt
+++ b/src/main/kotlin/dulkirmod/overlays/YawDisplayHud.kt
@@ -9,9 +9,8 @@ import dulkirmod.utils.Utils
class YawDisplayHud : TextHud(false) {
override fun getLines(lines: MutableList<String>?, example: Boolean) {
if (!Utils.isInSkyblock()) return
- if (!DulkirConfig.showYawEverywhere) {
- if (TabListUtils.area != "Garden") return
- }
+ if (!DulkirConfig.showYawEverywhere && TabListUtils.area != "Garden") return
+
val pitch = mc.thePlayer.rotationPitch
var yaw = mc.thePlayer.rotationYaw % 360f