aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCal <cwolfson58@gmail.com>2024-10-24 20:35:57 +1100
committerCal <cwolfson58@gmail.com>2024-10-24 20:35:57 +1100
commit36fb1bfff0429bdf9407b0946ce71a153b016ffb (patch)
treec684bcb1e23c0d4efa5673c7896073754b8b7396
parent1e31f82f7d3afb28c9367b7e99ad01b7592f4f1b (diff)
downloadSkyHanni-36fb1bfff0429bdf9407b0946ce71a153b016ffb.tar.gz
SkyHanni-36fb1bfff0429bdf9407b0946ce71a153b016ffb.tar.bz2
SkyHanni-36fb1bfff0429bdf9407b0946ce71a153b016ffb.zip
enable some of the shots annotations
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt2
-rw-r--r--versions/1.8.9/shots.txt124
4 files changed, 66 insertions, 66 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
index d8593047e..2f982e52c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
@@ -142,7 +142,7 @@ object SensitivityReducer {
if (!LockMouseLook.lockedMouse) {
storage.savedMouseloweredSensitivity = gameSettings.mouseSensitivity
val newSens = doTheMath(storage.savedMouseloweredSensitivity)
- gameSettings?.mouseSensitivity = newSens
+ gameSettings.mouseSensitivity = newSens
} else {
storage.savedMouseloweredSensitivity = storage.savedMouselockedSensitivity
}
@@ -150,7 +150,7 @@ object SensitivityReducer {
}
private fun restoreSensitivity(showMessage: Boolean = false) {
- if (!LockMouseLook.lockedMouse) gameSettings?.mouseSensitivity = storage.savedMouseloweredSensitivity
+ if (!LockMouseLook.lockedMouse) gameSettings.mouseSensitivity = storage.savedMouseloweredSensitivity
if (showMessage) ChatUtils.chat("§bMouse sensitivity is now restored.")
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
index dd9e3d91e..05cdf94c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
@@ -141,7 +141,7 @@ object HarpFeatures {
private var isGUIScaled = false
private fun setGUIScale() {
- val gameSettings = Minecraft.getMinecraft().gameSettings ?: return
+ val gameSettings = Minecraft.getMinecraft().gameSettings
guiSetting = gameSettings.guiScale
gameSettings.guiScale = 0
isGUIScaled = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
index 0691b9702..c84192a02 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LockMouseLook.kt
@@ -49,7 +49,7 @@ object LockMouseLook {
fun toggleLock() {
lockedMouse = !lockedMouse
- val gameSettings = Minecraft.getMinecraft().gameSettings ?: return
+ val gameSettings = Minecraft.getMinecraft().gameSettings
var mouseSensitivity = gameSettings.mouseSensitivity
if (SensitivityReducer.isEnabled()) mouseSensitivity = SensitivityReducer.doTheMath(mouseSensitivity, true)
diff --git a/versions/1.8.9/shots.txt b/versions/1.8.9/shots.txt
index 971186264..302e99545 100644
--- a/versions/1.8.9/shots.txt
+++ b/versions/1.8.9/shots.txt
@@ -1,78 +1,78 @@
-#net.minecraft.client.entity.EntityPlayerSP:
-# sendQueue:
-# annotate org.jetbrains.annotations.NotNull
-#net.minecraft.client.Minecraft:
-# renderEngine:
-# annotate org.jetbrains.annotations.NotNull
-# renderGlobal:
-# annotate org.jetbrains.annotations.NotNull
+net.minecraft.client.entity.EntityPlayerSP:
+ sendQueue:
+ annotate org.jetbrains.annotations.NotNull
+net.minecraft.client.Minecraft:
+ renderEngine:
+ annotate org.jetbrains.annotations.NotNull
+ renderGlobal:
+ annotate org.jetbrains.annotations.NotNull
+ effectRenderer:
+ annotate org.jetbrains.annotations.NotNull
+ fontRendererObj:
+ annotate org.jetbrains.annotations.NotNull
+ standardGalacticFontRenderer:
+ annotate org.jetbrains.annotations.NotNull
+ entityRenderer:
+ annotate org.jetbrains.annotations.NotNull
+ guiAchievement:
+ annotate org.jetbrains.annotations.NotNull
+ ingameGUI:
+ annotate org.jetbrains.annotations.NotNull
+ gameSettings:
+ annotate org.jetbrains.annotations.NotNull
+ mouseHelper:
+ annotate org.jetbrains.annotations.NotNull
+ mcDataDir:
+ annotate org.jetbrains.annotations.NotNull
+ frameTimer:
+ annotate org.jetbrains.annotations.NotNull
+ mcProfiler:
+ annotate org.jetbrains.annotations.NotNull
+ mcDefaultResourcePack:
+ annotate org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.client.main.GameConfiguration):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ getFrameBuffer():
+ annotate org.jetbrains.annotations.NotNull
+ getVersion():
+ annotate org.jetbrains.annotations.NotNull
+ drawSplashScreen(net.minecraft.client.renderer.texture.TextureManager):
+ annotate org.jetbrains.annotations.NotNull
+ getSaveLoader():
+ annotate org.jetbrains.annotations.NotNull
+ getMusicTicker():
+ annotate org.jetbrains.annotations.NotNull
+ displayGuiScreen(net.minecraft.client.gui.GuiScreen):
+ annotateParameter 0 org.jetbrains.annotations.Nullable
# thePlayer:
# annotate org.jetbrains.annotations.Nullable
# pointedEntity:
# annotate org.jetbrains.annotations.Nullable
-# effectRenderer:
-# annotate org.jetbrains.annotations.NotNull
-# fontRendererObj:
-# annotate org.jetbrains.annotations.NotNull
-# standardGalacticFontRenderer:
-# annotate org.jetbrains.annotations.NotNull
# currentScreen:
# annotate org.jetbrains.annotations.Nullable
-# entityRenderer:
-# annotate org.jetbrains.annotations.NotNull
-# guiAchievement:
-# annotate org.jetbrains.annotations.NotNull
-# ingameGUI:
-# annotate org.jetbrains.annotations.NotNull
# objectMouseOver:
# annotate org.jetbrains.annotations.Nullable
-# gameSettings:
-# annotate org.jetbrains.annotations.NotNull
-# mouseHelper:
-# annotate org.jetbrains.annotations.NotNull
-# mcDataDir:
-# annotate org.jetbrains.annotations.NotNull
-# frameTimer:
-# annotate org.jetbrains.annotations.NotNull
-# mcProfiler:
-# annotate org.jetbrains.annotations.NotNull
-# mcDefaultResourcePack:
-# annotate org.jetbrains.annotations.NotNull
# theWorld:
# annotate org.jetbrains.annotations.Nullable
-# <init>(net.minecraft.client.main.GameConfiguration):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# getFrameBuffer():
-# annotate org.jetbrains.annotations.NotNull
-# getVersion():
-# annotate org.jetbrains.annotations.NotNull
-# drawSplashScreen(net.minecraft.client.renderer.texture.TextureManager):
-# annotate org.jetbrains.annotations.NotNull
-# getSaveLoader():
-# annotate org.jetbrains.annotations.NotNull
-# displayGuiScreen(net.minecraft.client.gui.GuiScreen):
-# annotateParameter 0 org.jetbrains.annotations.Nullable
-# getMusicTicker():
-# annotate org.jetbrains.annotations.NotNull
#net.minecraft.util.ChatStyle:
# getChatClickEvent():
# annotate org.jetbrains.annotations.Nullable
# getChatHoverEvent():
# annotate org.jetbrains.annotations.Nullable
#
-#net.minecraft.item.ItemStack:
-# <init>(net.minecraft.block.Block):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.block.Block, int):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.block.Block, int, int):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.item.Item):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.item.Item, int):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.item.Item, int, int):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# <init>(net.minecraft.item.Item, int, int, net.minecraft.nbt.NBTTagCompound):
-# annotateParameter 0 org.jetbrains.annotations.NotNull
-# annotateParameter 3 org.jetbrains.annotations.Nullable
+net.minecraft.item.ItemStack:
+ <init>(net.minecraft.block.Block):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.block.Block, int):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.block.Block, int, int):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.item.Item):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.item.Item, int):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.item.Item, int, int):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ <init>(net.minecraft.item.Item, int, int, net.minecraft.nbt.NBTTagCompound):
+ annotateParameter 0 org.jetbrains.annotations.NotNull
+ annotateParameter 3 org.jetbrains.annotations.Nullable