Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

you can no longer cheese the spell gui wuth a really thin window

Browse source
This commit is contained in:
gamma-delta 2022-05-08 14:09:09 -05:00 committed by yrsegal@gmail.com
parent cbe2e49986
commit ebbe80b9d1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Common/src/main/java/at/petrak/hexcasting/client/gui/GuiSpellcasting.kt
View file

@ -9,7 +9,6 @@ import at.petrak.hexcasting.api.spell.math.HexCoord
import at.petrak.hexcasting.api.spell.math.HexDir import at.petrak.hexcasting.api.spell.math.HexDir
import at.petrak.hexcasting.api.spell.math.HexPattern import at.petrak.hexcasting.api.spell.math.HexPattern
import at.petrak.hexcasting.api.utils.HexUtils import at.petrak.hexcasting.api.utils.HexUtils
import at.petrak.hexcasting.api.utils.HexUtils.TAU
import at.petrak.hexcasting.client.RenderLib import at.petrak.hexcasting.client.RenderLib
import at.petrak.hexcasting.client.sound.GridSoundInstance import at.petrak.hexcasting.client.sound.GridSoundInstance
import at.petrak.hexcasting.common.items.ItemSpellbook import at.petrak.hexcasting.common.items.ItemSpellbook
@ -32,6 +31,7 @@ import net.minecraft.world.InteractionHand
import net.minecraft.world.phys.Vec2 import net.minecraft.world.phys.Vec2
import kotlin.math.atan2 import kotlin.math.atan2
import kotlin.math.roundToInt import kotlin.math.roundToInt
import kotlin.math.sqrt
class GuiSpellcasting( class GuiSpellcasting(
private val handOpenedWith: InteractionHand, private val handOpenedWith: InteractionHand,
@ -240,7 +240,7 @@ class GuiSpellcasting(
MsgShiftScrollSyn( MsgShiftScrollSyn(
otherHand, otherHand,
pDelta, pDelta,
Screen.hasControlDown() hasControlDown()
) )
) )
@ -352,7 +352,11 @@ class GuiSpellcasting(
fun hexSize(): Float { fun hexSize(): Float {
val hasLens = Minecraft.getInstance().player!! val hasLens = Minecraft.getInstance().player!!
.getItemInHand(HexUtils.OtherHand(this.handOpenedWith)).`is`(HexItems.SCRYING_LENS) .getItemInHand(HexUtils.OtherHand(this.handOpenedWith)).`is`(HexItems.SCRYING_LENS)
return this.width.toFloat() / if (hasLens) 48.0f else 32.0f
// Originally, we allowed 32 dots across. Assuming a 1920x1080 screen this allowed like 500-odd area.
// Let's be generous and give them 512.
val baseScale = sqrt(this.width.toDouble() * this.height / 512.0)
return baseScale.toFloat() * if (hasLens) 0.75f else 1f
} }
fun coordsOffset(): Vec2 = Vec2(this.width.toFloat() * 0.5f, this.height.toFloat() * 0.5f) fun coordsOffset(): Vec2 = Vec2(this.width.toFloat() * 0.5f, this.height.toFloat() * 0.5f)