aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVixid <52578495+VixidDev@users.noreply.github.com>2023-08-29 15:44:08 +0100
committerGitHub <noreply@github.com>2023-08-29 16:44:08 +0200
commitac7893950e3fa3b177bab421ccbcd37de2e5e73f (patch)
tree00e46c2a2897b66a8217e0285a47d7809d8a77d3 /src
parent294aa4be9dbafe7e8f82efb2f406661c860a992a (diff)
downloadskyhanni-ac7893950e3fa3b177bab421ccbcd37de2e5e73f.tar.gz
skyhanni-ac7893950e3fa3b177bab421ccbcd37de2e5e73f.tar.bz2
skyhanni-ac7893950e3fa3b177bab421ccbcd37de2e5e73f.zip
Add Garden Plot border feature (#401)
Add Garden Plot border feature #401
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt98
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt1
4 files changed, 104 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 80cb6f414..ee3244d4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -382,6 +382,7 @@ class SkyHanniMod {
loadModule(AccountUpgradeReminder())
loadModule(PetExpTooltip())
loadModule(Translator())
+ loadModule(GardenPlotBorders())
init()
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
index 9aeb8d1a8..403aed763 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
@@ -1398,4 +1398,9 @@ public class GardenConfig {
@Expose
public Position cropSpeedMeterPos = new Position(278, -236, false, true);
+
+ @Expose
+ @ConfigOption(name = "Enable Plot Borders", desc = "Enable the use of F3 + G hotkey to show Garden plot borders. Similar to how later minecraft version render chunk borders.")
+ @ConfigEditorBoolean
+ public boolean plotBorders = true;
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt
new file mode 100644
index 000000000..e97fb59e2
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt
@@ -0,0 +1,98 @@
+package at.hannibal2.skyhanni.features.garden
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
+import net.minecraft.client.Minecraft
+import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.lwjgl.input.Keyboard
+import kotlin.math.floor
+
+class GardenPlotBorders {
+
+ private val config get() = SkyHanniMod.feature.garden.plotBorders
+ private var showBorders = false
+ private val LINE_COLOR = LorenzColor.YELLOW.toColor()
+
+ private fun LorenzVec.addX(x: Int) = add(x, 0, 0)
+ private fun LorenzVec.addZ(z: Int) = add(0, 0, z)
+ private fun LorenzVec.addXZ(x: Int, z: Int) = add(x, 0, z)
+
+ @SubscribeEvent
+ fun onTick(event: LorenzTickEvent) {
+ if (!LorenzUtils.inSkyBlock) return
+ if (!isEnabled()) return
+
+ val keyPressed = if (Keyboard.getEventKey() == 0) Keyboard.getEventCharacter() else Keyboard.getEventKey()
+
+ if (keyPressed == Keyboard.KEY_G && Keyboard.isKeyDown(Keyboard.KEY_F3)) {
+ showBorders = !showBorders
+ }
+ }
+
+ @SubscribeEvent
+ fun render(event: RenderWorldLastEvent) {
+ if (!showBorders) return
+
+ val entity = Minecraft.getMinecraft().renderViewEntity
+
+ // Lowest point in garden
+ val minHeight = 66
+ val maxHeight = 256
+
+ // These don't refer to Minecraft chunks but rather garden plots, but I use
+ // the word chunk as the logic closely represents how chunk borders are rendered in latter mc versions
+ val chunkX = floor((entity.posX + 48) / 96).toInt()
+ val chunkZ = floor((entity.posZ + 48) / 96).toInt()
+ val chunkMinX = (chunkX * 96) - 48
+ val chunkMinZ = (chunkZ * 96) - 48
+
+ // Render 4 vertical corners
+ for (i in 0..96 step 96) {
+ for (j in 0..96 step 96) {
+ val start = LorenzVec(chunkMinX + i, minHeight, chunkMinZ + j)
+ val end = LorenzVec(chunkMinX + i, maxHeight, chunkMinZ + j)
+ event.draw3DLine(start, end, LorenzColor.DARK_BLUE.toColor(), 2, true)
+ }
+ }
+
+ // Render vertical on X-Axis
+ for (x in 4..<96 step 4) {
+ val start = LorenzVec(chunkMinX + x, minHeight, chunkMinZ)
+ val end = LorenzVec(chunkMinX + x, maxHeight, chunkMinZ)
+ // Front lines
+ event.draw3DLine(start, end, LINE_COLOR, 1, true)
+ // Back lines
+ event.draw3DLine(start.addZ(96), end.addZ(96), LINE_COLOR, 1, true)
+ }
+
+ // Render vertical on Z-Axis
+ for (z in 4..<96 step 4) {
+ val start = LorenzVec(chunkMinX, minHeight, chunkMinZ + z)
+ val end = LorenzVec(chunkMinX, maxHeight, chunkMinZ + z)
+ // Left lines
+ event.draw3DLine(start, end, LINE_COLOR, 1, true)
+ // Right lines
+ event.draw3DLine(start.addX(96), end.addX(96), LINE_COLOR, 1, true)
+ }
+
+ // Render horizontal
+ for (y in minHeight..maxHeight step 4) {
+ val start = LorenzVec(chunkMinX, y, chunkMinZ)
+ // (minX, minZ) -> (minX, minZ + 96)
+ event.draw3DLine(start, start.addZ(96), LINE_COLOR, 1, true)
+ // (minX, minZ + 96) -> (minX + 96, minZ + 96)
+ event.draw3DLine(start.addZ(96), start.addXZ(96, 96), LINE_COLOR, 1, true)
+ // (minX + 96, minZ + 96) -> (minX + 96, minZ)
+ event.draw3DLine(start.addXZ(96, 96), start.addX(96), LINE_COLOR, 1, true)
+ // (minX + 96, minZ) -> (minX, minZ)
+ event.draw3DLine(start.addX(96), start, LINE_COLOR, 1, true)
+ }
+ }
+
+ fun isEnabled() = GardenAPI.inGarden() && config
+} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 0150e7311..64e68bec1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -670,7 +670,6 @@ object RenderUtils {
}
fun RenderWorldLastEvent.draw3DLine(p1: LorenzVec, p2: LorenzVec, color: Color, lineWidth: Int, depth: Boolean) {
- GlStateManager.disableDepth()
GlStateManager.disableCull()
val render = Minecraft.getMinecraft().renderViewEntity