Skip to content

Commit fe6d1ca

Browse files
nextdayynextdayy
committed
bump
1 parent d5d643d commit fe6d1ca

File tree

6 files changed

+22
-38
lines changed

6 files changed

+22
-38
lines changed

‎build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ plugins {
1616

1717
toolkitLoomHelper {
1818
useOneConfig {
19-
version = "1.0.0-alpha.72"
20-
loaderVersion = "1.1.0-alpha.44"
19+
version = "1.0.0-alpha.115"
20+
loaderVersion = "1.1.0-alpha.48"
2121

2222
usePolyMixin = true
23-
polyMixinVersion = "0.8.4+build.2"
23+
polyMixinVersion = "0.8.4+build.6"
24+
useMixinExtras("0.4.1")
2425

2526
applyLoaderTweaker = true
2627

‎settings.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pluginManagement {
2424

2525
plugins {
2626
kotlin("jvm") version("2.0.0")
27-
id("dev.deftu.gradle.multiversion-root") version("2.35.0")
27+
id("dev.deftu.gradle.multiversion-root") version("2.42.0")
2828
}
2929
}
3030

@@ -41,9 +41,6 @@ rootProject.buildFileName = "root.gradle.kts"
4141
// **REMEMBER TO ALSO UPDATE THE `root.gradle.kts` AND `build.gradle.kts` FILES WITH THE NEW VERSION(S).
4242
listOf(
4343
"1.8.9-forge",
44-
"1.8.9-fabric",
45-
"1.12.2-fabric",
46-
"1.12.2-forge",
4744
).forEach { version ->
4845
include(":$version")
4946
project(":$version").apply {

‎src/main/java/org/polyfrost/crosshair/mixin/GuiIngameMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public abstract class GuiIngameMixin {
2626
@Redirect(method = "renderCrosshairs", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/GuiIngameForge;bind(Lnet/minecraft/util/ResourceLocation;)V"), remap = false)
2727
private void bindTexture(GuiIngameForge it, ResourceLocation res) {
2828
if (CrosshairHUD.INSTANCE.getUseVanilla()) bind(res);
29-
else GlStateManager.bindTexture(CrosshairHUD.INSTANCE.getId());
29+
else GlStateManager.bindTexture(CrosshairHUD.INSTANCE.getTexId());
3030
}
3131

3232
@WrapWithCondition(method = "renderCrosshairs", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;tryBlendFuncSeparate(IIII)V", ordinal = 0))

‎src/main/kotlin/org/polyfrost/crosshair/CrosshairHUD.kt‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import kotlin.io.path.exists
1616
import kotlin.io.path.inputStream
1717
import net.minecraft.client.renderer.GlStateManager as GL
1818

19-
object CrosshairHUD : LegacyHud() {
19+
object CrosshairHUD : LegacyHud("polycrosshair.json", "PolyCrosshair", category = Category.COMBAT) {
2020

2121
@Switch(title = "Use Vanilla")
2222
var useVanilla = false
@@ -42,7 +42,7 @@ object CrosshairHUD : LegacyHud() {
4242
@Button(title = "Open Editor")
4343
fun openEditor() { PolyCrosshairUI.open() }
4444

45-
val id = GL.generateTexture()
45+
val texId = GL.generateTexture()
4646
var texSize = 15f
4747
private set
4848

@@ -54,8 +54,6 @@ object CrosshairHUD : LegacyHud() {
5454
get() = texSize
5555
set(_) {}
5656

57-
override fun category() = Category.COMBAT
58-
5957
override fun initialize() {
6058
val currentCrosshair = currentCrosshair
6159
val stream = when {
@@ -71,23 +69,18 @@ object CrosshairHUD : LegacyHud() {
7169

7270
override fun hasBackground() = false
7371

74-
override fun render(stack: OmniMatrixStack, x: Float, y: Float, scaleX: Float, scaleY: Float) {
72+
override fun render(stack: OmniMatrixStack, x: Float, y: Float, scaleX: Float, scaleY: Float, example: Boolean) {
7573
}
7674

77-
7875
fun setCrosshair(cdata: IntArray, size: Int) {
7976
texSize = size.toFloat()
80-
TextureUtil.allocateTexture(id, size, size)
81-
TextureUtil.uploadTexture(id, cdata, size, size)
77+
TextureUtil.allocateTexture(texId, size, size)
78+
TextureUtil.uploadTexture(texId, cdata, size, size)
8279
}
8380

8481
override fun defaultPosition() = Vec2(1920f / 2f, 1080f / 2f)
8582

8683
override fun multipleInstancesAllowed() = false
8784

88-
override fun id() = "polycrosshair.json"
89-
90-
override fun title() = "PolyCrosshair"
91-
9285
override fun update() = false
9386
}

‎src/main/kotlin/org/polyfrost/crosshair/PolyCrosshair.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.polyfrost.crosshair
33
import net.minecraftforge.fml.common.Mod
44
import net.minecraftforge.fml.common.event.FMLInitializationEvent
55
import org.polyfrost.oneconfig.api.commands.v1.CommandManager
6-
import org.polyfrost.oneconfig.api.commands.v1.factories.annotated.Command
76
import org.polyfrost.oneconfig.api.hud.v1.HudManager
87

98
@Mod(
@@ -20,12 +19,7 @@ object PolyCrosshair {
2019
@Mod.EventHandler
2120
fun onFMLInitialization(event: FMLInitializationEvent) {
2221
HudManager.register(CrosshairHUD)
23-
CommandManager.register(@Command("polycrosshair") object {
24-
@Command
25-
private fun main() {
26-
PolyCrosshairUI.open()
27-
}
28-
})
22+
CommandManager.register(CommandManager.literal("polycrosshair").executes { PolyCrosshairUI.open(); 1 })
2923
}
3024

3125
}

‎src/main/kotlin/org/polyfrost/crosshair/PolyCrosshairUI.kt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.polyfrost.crosshair
22

3-
import dev.deftu.clipboard.Clipboard
4-
import dev.deftu.clipboard.ClipboardImage
53
import org.polyfrost.oneconfig.api.platform.v1.Platform
64
import org.polyfrost.oneconfig.api.ui.v1.OCPolyUIBuilder
75
import org.polyfrost.polyui.animate.Animations
@@ -16,6 +14,7 @@ import org.polyfrost.polyui.component.impl.*
1614
import org.polyfrost.polyui.event.Event
1715
import org.polyfrost.polyui.operations.Recolor
1816
import org.polyfrost.polyui.unit.Align
17+
import org.polyfrost.polyui.unit.Align.Wrap
1918
import org.polyfrost.polyui.unit.Vec2
2019
import org.polyfrost.polyui.unit.by
2120
import org.polyfrost.polyui.unit.seconds
@@ -104,7 +103,7 @@ object PolyCrosshairUI {
104103
Group(
105104
Text("v2.0.0").setPalette { text.secondary },
106105
Image("assets/oneconfig/ico/close.svg").onInit { size = Vec2(24f, 24f) }
107-
.setDestructivePalette().withStates().onClick {
106+
.setDestructivePalette().withHoverStates().onClick {
108107
// will save the crosshair
109108
needsToSave = true
110109
currentCard = null
@@ -127,9 +126,9 @@ object PolyCrosshairUI {
127126
Button("assets/polycrosshair/copy.svg".image(), padding = Vec2(7f, 6f)).onInit {
128127
this[0].size = Vec2(13.25f, 16f)
129128
}.onClick {
130-
Clipboard.getInstance().image = ClipboardImage(canvasSize, canvasSize, genColorData(canvasContainer[0]).toByteArray())
129+
// Clipboard.getInstance().image = ClipboardImage(canvasSize, canvasSize, genColorData(canvasContainer[0]).toByteArray())
131130
},
132-
Image("assets/polycrosshair/trashcan.svg").onInit { this.size = Vec2(14.75f, 16f) }.withStates().setDestructivePalette().onClick {
131+
Image("assets/polycrosshair/trashcan.svg").onInit { this.size = Vec2(14.75f, 16f) }.withHoverStates().setDestructivePalette().onClick {
133132
// generate a new canvas to effectively clear it
134133
canvasContainer[0] = genCanvas(canvasSize)
135134
true
@@ -158,7 +157,7 @@ object PolyCrosshairUI {
158157
).named("CanvasSizeControl"),
159158
Group(
160159
Text("Pen Color", fontSize = 18f),
161-
Block(color = penColor.deref(), size = Vec2(56f, 28f)).withBoarder(3f, color = { page.border20 })
160+
Block(color = penColor.deref(), size = Vec2(56f, 28f)).withBorder(3f, color = { page.border20 })
162161
.onClick { ColorPicker(penColor, null, null, polyUI); true },
163162
alignment = Align(main = Align.Main.SpaceBetween, pad = Vec2(6f, 12f)),
164163
size = Vec2(326f, 40f)
@@ -209,7 +208,7 @@ object PolyCrosshairUI {
209208
size = Vec2(335f, 214f),
210209
alignment = Align(cross = Align.Cross.Start, pad = Vec2.ZERO)
211210
).named("Library"),
212-
alignment = Align(maxRowSize = 1, pad = Vec2(0f, 24f)),
211+
alignment = Align(wrap = Wrap.ALWAYS, pad = Vec2(0f, 24f)),
213212
),
214213
)
215214
if (library.children.isNullOrEmpty()) {
@@ -243,14 +242,14 @@ object PolyCrosshairUI {
243242
Image(fileName),
244243
size = Vec2(48f, 48f),
245244
alignment = Align(main = Align.Main.Center, pad = Vec2.ZERO)
246-
).withBoarder(2f) { page.border10 },
245+
).withBorder(2f) { page.border10 },
247246
Text(name, fontSize = 8f).setPalette { text.secondary }.padded(0f, 6f, 0f, 0f),
248-
alignment = Align(main = Align.Main.Center, maxRowSize = 1, pad = Vec2.ZERO)
247+
alignment = Align(main = Align.Main.Center, wrap = Wrap.ALWAYS, pad = Vec2.ZERO)
249248
).onClick {
250249
currentCard = this
251250
}.onRightClick {
252251
PopupMenu(
253-
Text("Delete").withStates().setDestructivePalette().onClick {
252+
Text("Delete").withHoverStates().setDestructivePalette().onClick {
254253
library.removeChild(this@onRightClick)
255254
Paths.get((this@onRightClick[1] as Text).text.toFileName()).deleteIfExists()
256255
polyUI.unfocus()
@@ -277,7 +276,7 @@ object PolyCrosshairUI {
277276
val cl = colorData?.get(it) ?: 0
278277
val color = if (cl != 0) argb(cl).mutable() else defColor
279278
var toggled = !color.transparent
280-
Block(radii = null, size = Vec2(sqSize, sqSize), color = color).withBoarder(1f) { page.border10 }
279+
Block(radii = null, size = Vec2(sqSize, sqSize), color = color).withBorder(1f) { page.border10 }
281280
.events {
282281
Event.Mouse.Entered then { ev ->
283282
(this.color as PolyColor.Mutable).alpha += 0.05f

0 commit comments

Comments
 (0)