v1.4.3

gradle.properties

@@ -25,7 +25,7 @@ loader_version=0.14.17
 #Fabric api
 fabric_version=0.75.3+1.19.4
 # Mod Properties
-mod_version=1.4.2
+mod_version=1.4.3
 maven_group=com.peasenet
 archives_base_name=gavinsmod
 

src/main/java/com/peasenet/mixins/MixinGameRender.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023. Gavin Pease and contributors.
+ * Copyright (c) 2022-2022. Gavin Pease and contributors.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
  * associated documentation files (the "Software"), to deal in the Software without restriction, including
@@ -22,6 +22,7 @@
 
 import com.peasenet.main.GavinsMod;
 import com.peasenet.util.event.CameraBobEvent;
+import com.peasenet.util.event.CameraHurtEvent;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -33,7 +34,7 @@
 public class MixinGameRender {
     @Inject(method = "tiltViewWhenHurt", at = @At("HEAD"), cancellable = true)
     public void checkAntiHurt(MatrixStack stack, float f, CallbackInfo ci) {
-        CameraBobEvent event = new CameraBobEvent();
+        CameraHurtEvent event = new CameraHurtEvent();
         GavinsMod.eventManager.call(event);
         if (event.isCancelled())
             ci.cancel();

src/main/kotlin/com/peasenet/config/EspConfig.kt

@@ -25,7 +25,7 @@ package com.peasenet.config
  * @author gt3ch1
  * @version 03-02-2023
  */
-class EspConfig : TracerEspConfig<EspConfig?>() {
+class EspConfig : TracerEspConfig<EspConfig>() {
     init {
         key = "esp"
     }

src/main/kotlin/com/peasenet/config/TracerConfig.kt

@@ -23,10 +23,16 @@ package com.peasenet.config
  * The configuration for tracers.
  *
  * @author gt3ch1
- * @version 03-02-2023
+ * @version 04-11-2023
  */
-class TracerConfig : TracerEspConfig<EspConfig?>() {
+class TracerConfig : TracerEspConfig<EspConfig>() {
     init {
         key = "tracer"
     }
+
+    var viewBobCancel: Boolean = true
+        set(value) {
+            field = value
+            saveConfig()
+        }
 }

src/main/kotlin/com/peasenet/gui/GuiSettings.kt

@@ -30,12 +30,13 @@ import com.peasenet.main.Mods.Companion.mods
 import com.peasenet.mods.Mod
 import com.peasenet.mods.Type
 import com.peasenet.settings.SlideSetting
+import com.peasenet.settings.ToggleSetting
 import net.minecraft.text.Text
 import java.util.function.Consumer
 
 /**
  * @author gt3ch1
- * @version 03-02-2023
+ * @version 04-11-2023
  * A settings gui to control certain features of the mod.
  */
 class GuiSettings : GuiElement(Text.translatable("gavinsmod.gui.settings")) {
@@ -59,15 +60,15 @@ class GuiSettings : GuiElement(Text.translatable("gavinsmod.gui.settings")) {
         val resetText = Text.translatable("gavinsmod.settings.reset")
         val width = textRenderer.getWidth(resetText)
         if (resetPos == null) resetPos = PointF(titleW.toFloat(), 1f)
-        resetButton.setTitle(resetText);
+        resetButton.title = resetText
         if (resetWidth.toDouble() == 0.0) resetWidth = (width + 4).toFloat()
         resetButton.width = resetWidth
         resetButton.position = resetPos
         resetButton.setDefaultPosition(resetButton.box)
         resetButton.setBackground(Colors.DARK_RED)
         resetButton.setCallback {
-            GavinsMod.gui!!.reset()
-            GavinsMod.guiSettings!!.reset()
+            GavinsMod.gui.reset()
+            GavinsMod.guiSettings.reset()
         }
         resetButton.isHoverable = true
     }
@@ -109,8 +110,7 @@ class GuiSettings : GuiElement(Text.translatable("gavinsmod.gui.settings")) {
     private fun addSettings(parent: Gui, category: Type.Category) {
         val modList = ArrayList<Mod>()
         // get all mods in esp category and have settings then add them to espDropdown
-        mods.stream().filter { m: Mod -> m.category === category && m.hasSettings() }
-            .forEach { e: Mod -> modList.add(e) }
+        mods.stream().filter { m: Mod -> m.category === category && m.hasSettings() }.forEach { e: Mod -> modList.add(e) }
         for (m in modList) {
             val modSettings = m.settings
             for (s in modSettings) {
@@ -157,12 +157,18 @@ class GuiSettings : GuiElement(Text.translatable("gavinsmod.gui.settings")) {
          */
         private fun miscSettings() {
             val espAlpha = SlideSetting("gavinsmod.settings.alpha")
-            espAlpha.setCallback { GavinsMod.espConfig!!.alpha = espAlpha.value }
-            espAlpha.value = GavinsMod.espConfig!!.alpha
+            espAlpha.setCallback { GavinsMod.espConfig.alpha = espAlpha.value }
+            espAlpha.value = GavinsMod.espConfig.alpha
             val tracerAlpha = SlideSetting("gavinsmod.settings.alpha")
-            tracerAlpha.setCallback { GavinsMod.tracerConfig!!.alpha = tracerAlpha.value }
-            tracerAlpha.value = GavinsMod.tracerConfig!!.alpha
+            tracerAlpha.setCallback { GavinsMod.tracerConfig.alpha = tracerAlpha.value }
+            tracerAlpha.value = GavinsMod.tracerConfig.alpha
+
+            val tracerViewBob = ToggleSetting("gavinsmod.settings.tracer.viewbobcancel")
+            tracerViewBob.setCallback { GavinsMod.tracerConfig.viewBobCancel = tracerViewBob.value }
+            tracerViewBob.value = GavinsMod.tracerConfig.viewBobCancel
+
             espDropdown.addElement(espAlpha.gui)
+            tracerDropdown.addElement(tracerViewBob.gui)
             tracerDropdown.addElement(tracerAlpha.gui)
         }
     }