Skip to content

Commit 0f0b30b

Browse files
dev-hydrogendev-hydrogen
committed
fix
1 parent ea3ec5c commit 0f0b30b

File tree

10 files changed

+53
-17
lines changed

10 files changed

+53
-17
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ minecraft_version=1.21.8
77
loader_version=0.16.4
88
kotlin_loader_version=1.13.4+kotlin.2.2.0
99
# Mod Properties
10-
mod_version=1.2.0
10+
mod_version=1.3.0
1111
maven_group=cc.pe3epwithyou
1212
archives_base_name=island++
1313
# Dependencies

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/ChanceDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import cc.pe3epwithyou.trident.client.TridentClient
44
import cc.pe3epwithyou.trident.interfaces.shared.TridentDialog
55
import cc.pe3epwithyou.trident.interfaces.themes.DialogTitle
66
import cc.pe3epwithyou.trident.interfaces.themes.TridentThemed
7+
import cc.pe3epwithyou.trident.state.FontCollection
78
import cc.pe3epwithyou.trident.state.Rarity
89
import cc.pe3epwithyou.trident.state.fishing.UpgradeLine
910
import cc.pe3epwithyou.trident.state.fishing.UpgradeType
@@ -28,7 +29,11 @@ class ChanceDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), Them
2829
}
2930

3031
private fun getWidgetTitle(): DialogTitleWidget {
31-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
32+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
33+
.withStyle(
34+
Style.EMPTY
35+
.withShadowColor(0x0 opacity 0)
36+
)
3237
val text = Component.literal(" CHANCES".uppercase()).mccFont()
3338
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3439
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/ChancePerksDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import com.noxcrew.sheeplib.dialog.title.DialogTitleWidget
1515
import com.noxcrew.sheeplib.layout.grid
1616
import com.noxcrew.sheeplib.theme.Themed
1717
import cc.pe3epwithyou.trident.state.FishRarityColor
18+
import cc.pe3epwithyou.trident.state.FontCollection
1819
import cc.pe3epwithyou.trident.state.PearlQualityColor
1920
import cc.pe3epwithyou.trident.state.TreasureRarityColor
2021
import cc.pe3epwithyou.trident.state.SpiritPurityColor
@@ -32,7 +33,11 @@ class ChancePerksDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key),
3233
}
3334

3435
private fun getWidgetTitle(): DialogTitleWidget {
35-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
36+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
37+
.withStyle(
38+
Style.EMPTY
39+
.withShadowColor(0x0 opacity 0)
40+
)
3641
val text = Component.literal(" CHANCE PERKS".uppercase()).mccFont()
3742
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3843
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/HookChanceDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import cc.pe3epwithyou.trident.interfaces.themes.DialogTitle
66
import cc.pe3epwithyou.trident.interfaces.themes.TridentThemed
77
import cc.pe3epwithyou.trident.state.Rarity
88
import cc.pe3epwithyou.trident.state.FishWeightColor
9+
import cc.pe3epwithyou.trident.state.FontCollection
910
import cc.pe3epwithyou.trident.state.PearlQualityColor
1011
import cc.pe3epwithyou.trident.state.SpiritPurityColor
1112
import cc.pe3epwithyou.trident.state.fishing.PerkStateCalculator
@@ -32,7 +33,11 @@ class HookChanceDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key),
3233
}
3334

3435
private fun getWidgetTitle(): DialogTitleWidget {
35-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
36+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
37+
.withStyle(
38+
Style.EMPTY
39+
.withShadowColor(0x0 opacity 0)
40+
)
3641
val text = Component.literal(" HOOK CHANCES".uppercase()).mccFont()
3742
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3843
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/MagnetChanceDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import net.minecraft.network.chat.Component
2222
import net.minecraft.network.chat.Style
2323
import cc.pe3epwithyou.trident.state.FishRarityColor
2424
import cc.pe3epwithyou.trident.state.FishWeightColor
25+
import cc.pe3epwithyou.trident.state.FontCollection
2526
import cc.pe3epwithyou.trident.state.PearlQualityColor
2627
import cc.pe3epwithyou.trident.state.SpiritPurityColor
2728
import cc.pe3epwithyou.trident.state.TreasureRarityColor
@@ -32,7 +33,11 @@ class MagnetChanceDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key)
3233
}
3334

3435
private fun getWidgetTitle(): DialogTitleWidget {
35-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
36+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
37+
.withStyle(
38+
Style.EMPTY
39+
.withShadowColor(0x0 opacity 0)
40+
)
3641
val text = Component.literal(" MAGNET CHANCES".uppercase()).mccFont()
3742
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3843
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/PotChanceDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import cc.pe3epwithyou.trident.client.TridentClient
44
import cc.pe3epwithyou.trident.interfaces.shared.TridentDialog
55
import cc.pe3epwithyou.trident.interfaces.themes.DialogTitle
66
import cc.pe3epwithyou.trident.interfaces.themes.TridentThemed
7+
import cc.pe3epwithyou.trident.state.FontCollection
78
import cc.pe3epwithyou.trident.state.fishing.PerkStateCalculator
89
import cc.pe3epwithyou.trident.utils.extensions.ComponentExtensions.mccFont
910
import com.noxcrew.sheeplib.LayoutConstants
@@ -25,7 +26,11 @@ class PotChanceDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), T
2526
}
2627

2728
private fun getWidgetTitle(): DialogTitleWidget {
28-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
29+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
30+
.withStyle(
31+
Style.EMPTY
32+
.withShadowColor(0x0 opacity 0)
33+
)
2934
val text = Component.literal(" POT CHANCES".uppercase()).mccFont()
3035
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3136
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/RodChanceDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import cc.pe3epwithyou.trident.state.fishing.PerkStateCalculator
1010
import cc.pe3epwithyou.trident.utils.extensions.ComponentExtensions.mccFont
1111
import cc.pe3epwithyou.trident.state.FishRarityColor
1212
import cc.pe3epwithyou.trident.state.FishWeightColor
13+
import cc.pe3epwithyou.trident.state.FontCollection
1314
import cc.pe3epwithyou.trident.state.PearlQualityColor
1415
import cc.pe3epwithyou.trident.state.SpiritPurityColor
1516
import cc.pe3epwithyou.trident.state.TreasureRarityColor
@@ -31,7 +32,11 @@ class RodChanceDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), T
3132
}
3233

3334
private fun getWidgetTitle(): DialogTitleWidget {
34-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
35+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
36+
.withStyle(
37+
Style.EMPTY
38+
.withShadowColor(0x0 opacity 0)
39+
)
3540
val text = Component.literal(" ROD CHANCES".uppercase()).mccFont()
3641
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3742
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/SpotDialog.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import cc.pe3epwithyou.trident.state.PearlQualityColor
1212
import cc.pe3epwithyou.trident.state.SpiritPurityColor
1313
import cc.pe3epwithyou.trident.state.TreasureRarityColor
1414
import cc.pe3epwithyou.trident.state.FishRarityColor
15+
import cc.pe3epwithyou.trident.state.FontCollection
1516
import cc.pe3epwithyou.trident.utils.extensions.ComponentExtensions.mccFont
1617
import com.noxcrew.sheeplib.LayoutConstants
1718
import com.noxcrew.sheeplib.dialog.title.DialogTitleWidget
@@ -31,7 +32,11 @@ class SpotDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), Themed
3132
}
3233

3334
private fun getWidgetTitle(): DialogTitleWidget {
34-
val icon = Component.literal("\uE279").mccFont("icon").withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
35+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
36+
.withStyle(
37+
Style.EMPTY
38+
.withShadowColor(0x0 opacity 0)
39+
)
3540
val text = Component.literal(" SPOT".uppercase()).mccFont()
3641
return DialogTitle(this, icon.append(text), TITLE_COLOR)
3742
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/fishing/UpgradesDialog.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import cc.pe3epwithyou.trident.interfaces.themes.TridentThemed
77
import cc.pe3epwithyou.trident.state.fishing.UpgradeLine
88
import cc.pe3epwithyou.trident.state.FishRarityColor
99
import cc.pe3epwithyou.trident.state.FishWeightColor
10+
import cc.pe3epwithyou.trident.state.FontCollection
1011
import cc.pe3epwithyou.trident.state.PearlQualityColor
1112
import cc.pe3epwithyou.trident.state.SpiritPurityColor
1213
import cc.pe3epwithyou.trident.state.TreasureRarityColor
@@ -34,9 +35,11 @@ class UpgradesDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), Th
3435
}
3536

3637
private fun getWidgetTitle(): DialogTitleWidget {
37-
val icon = Component.literal("\uE279")
38-
.mccFont("icon")
39-
.withStyle(Style.EMPTY.withShadowColor(0x0 opacity 0))
38+
val icon = FontCollection.get("_fonts/icon/quest_log.png")
39+
.withStyle(
40+
Style.EMPTY
41+
.withShadowColor(0x0 opacity 0)
42+
)
4043
val text = Component.literal(" UPGRADES".uppercase()).mccFont()
4144
return DialogTitle(this, icon.append(text), TITLE_COLOR)
4245
}

‎src/main/kotlin/cc/pe3epwithyou/trident/interfaces/meter/MeterDialog.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cc.pe3epwithyou.trident.interfaces.meter
33
import cc.pe3epwithyou.trident.client.TridentClient
44
import cc.pe3epwithyou.trident.interfaces.shared.TridentDialog
55
import cc.pe3epwithyou.trident.interfaces.themes.TridentThemed
6+
import cc.pe3epwithyou.trident.state.FontCollection
67
import cc.pe3epwithyou.trident.utils.extensions.ComponentExtensions.mccFont
78
import com.noxcrew.sheeplib.LayoutConstants
89
import com.noxcrew.sheeplib.layout.grid
@@ -22,12 +23,9 @@ class MeterDialog(x: Int, y: Int, key: String) : TridentDialog(x, y, key), Theme
2223
var row = 0
2324

2425
// Progress bar (styled like QuestWidget)
25-
val PROGRESS_BLANK = '\uE266'
26-
val PROGRESS_HALF = '\uE26C'
27-
val PROGRESS_FULL = '\uE269'
28-
val COMP_BLANK: Component = Component.literal(PROGRESS_BLANK.toString()).mccFont("icon")
29-
val COMP_HALF: Component = Component.literal(PROGRESS_HALF.toString()).mccFont("icon")
30-
val COMP_FULL: Component = Component.literal(PROGRESS_FULL.toString()).mccFont("icon")
26+
val COMP_BLANK = FontCollection.get("_fonts/icon/progress_counter/empty.png", 7, 7)
27+
val COMP_HALF = FontCollection.get("_fonts/icon/progress_counter/half.png", 7, 7)
28+
val COMP_FULL = FontCollection.get("_fonts/icon/progress_counter/full.png", 7, 7)
3129

3230
fun progressBarComponent(progress: Float, width: Int, groups: Int = 0): Component {
3331
if (width <= 0) return Component.empty()

0 commit comments

Comments
 (0)