Skip to content

Commit e67444d

Browse files
committed
Externalized MagicPaintjob 2.0 strings.
1 parent 362be69 commit e67444d

8 files changed

Lines changed: 29 additions & 8 deletions

File tree

data/strings/strings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,14 @@
304304
"ml_mp_permanentTooltipRefit":"This paintjob is permanent and cannot be changed.",
305305
"ml_mp_shiny":"This is a rare paintjob.",
306306
"ml_mp_appliedRefit":"Applied: %s",
307+
"ml_mp_refit_paintjob": "Paintjob",
308+
"ml_mp_refit_goBack": "Go Back",
309+
"ml_mp_refit_defaultDesc": "The Standard Paintjob",
310+
"ml_mp_refit_locked": "LOCKED",
311+
# The text on the Vanilla button to add a hullmod to your ship. Used for reflection.
312+
"ml_mp_refit_vanillaHullmodAddButtonText": "Add",
307313

314+
# MagicSubsystem
308315
"subsystemTitleText": "SUBSYSTEMS",
309316
"subsystemNameWithKeyText": "%s [%s]",
310317
"subsystemMoreInfoText": "PRESS %s FOR MORE INFO",

jars/MagicLib.jar

287 Bytes
Binary file not shown.

magiclib.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
{
99
"major": "1",
1010
"minor": "5",
11-
"patch": "2"
11+
"patch": "3-RC01"
1212
}
1313
}

mod_info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "Modding Community: Dark.Revenant, LazyWizard, Nicke, Originem, Rubi, Schaf-Unschaf, Snrasha, Tartiflette, Wisp, Wyvern...",
55
"utility": "false",
66
# Using the long version format lets the game correctly compare major/minor/patch versions.
7-
"version": { "major": '1', "minor": '5', "patch": '2' },
7+
"version": { "major": '1', "minor": '5', "patch": '3-RC01' },
88
"description": "A collection of classes to aid modding. Not a mod in itself, but required by other mods.",
99
"gameVersion": "0.98a-RC04",
1010
"dependencies": [

release_checklist.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
- BetterVariants
33
- Tart's mods
44
- Make sure `mod_info.json` and all fields in the `.version` file are updated.
5+
- Make sure all strings are externalized.
6+
57
- Update wiki.

src/org/magiclib/paintjobs/MagicPaintjobRefitPanel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ import org.magiclib.kotlin.*
1717
import java.awt.Color
1818
import org.magiclib.paintjobs.MagicPaintjobSelector.createPaintjobSelector
1919
import org.magiclib.paintjobs.MagicPaintjobSelector.MagicPaintjobSelectorPlugin
20+
import org.magiclib.util.MagicTxt
2021

22+
/**
23+
* @author Starficz
24+
*/
2125
internal object MagicPaintjobRefitPanel {
2226
private const val BACKGROUND_ALPHA = 0.7f
2327
internal class MagicPaintjobRefitPanelPlugin(private val refitTab: UIPanelAPI) : BaseCustomUIPanelPlugin() {
@@ -135,7 +139,7 @@ internal object MagicPaintjobRefitPanel {
135139
// add tooltip to locked paintjobs
136140
if(!selectorPlugin.isUnlocked && !paintjobSpec?.unlockConditions.isNullOrBlank()){
137141
scrollerTooltip.addTooltip(selectorPanel, TooltipMakerAPI.TooltipLocation.BELOW, 250f) { tooltip ->
138-
tooltip.addTitle("LOCKED")
142+
tooltip.addTitle(MagicTxt.getString("ml_mp_refit_locked"))
139143
tooltip.addPara(paintjobSpec!!.unlockConditions, 0f)
140144
}
141145
}

src/org/magiclib/paintjobs/MagicPaintjobRefitPanelCreator.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import org.magiclib.internalextensions.*
99
import java.awt.Color
1010
import org.magiclib.kotlin.setAlpha
1111
import org.magiclib.paintjobs.MagicPaintjobRefitPanel.createMagicPaintjobRefitPanel
12+
import org.magiclib.util.MagicTxt
1213

14+
/**
15+
* @author Starficz
16+
*/
1317
internal object MagicPaintjobRefitPanelCreator {
1418
private val PAINTJOB_BUTTON_COLOR = Color(240, 160, 0, 130)
1519
private val PAINTJOB_BUTTON_TEXT_COLOR = PAINTJOB_BUTTON_COLOR.brighter().setAlpha(255)
@@ -37,12 +41,12 @@ internal object MagicPaintjobRefitPanelCreator {
3741

3842
// addHullmods button should always exist in hullmodsPanel
3943
val addButton = existingElements.filter { ReflectionUtils.hasMethodOfName("getText", it) }.find {
40-
(ReflectionUtils.invoke("getText", it) as String).contains("Add")
44+
(ReflectionUtils.invoke("getText", it) as String).contains(MagicTxt.getString("ml_mp_refit_vanillaHullmodAddButtonText"))
4145
} ?: return
4246

4347
// make a new button
4448
val newPaintjobButton = hullmodsPanel.addButton(
45-
"Paintjob",
49+
MagicTxt.getString("ml_mp_refit_paintjob"),
4650
"PAINTJOB_BUTTON",
4751
PAINTJOB_BUTTON_TEXT_COLOR,
4852
PAINTJOB_BUTTON_COLOR,
@@ -72,7 +76,7 @@ internal object MagicPaintjobRefitPanelCreator {
7276

7377
// add back button here to make sure its lined up with existing button
7478
val goBackButton = paintjobPanel.addButton(
75-
"Go Back",
79+
MagicTxt.getString("ml_mp_refit_goBack"),
7680
null,
7781
PAINTJOB_BUTTON_TEXT_COLOR,
7882
PAINTJOB_BUTTON_COLOR,

src/org/magiclib/paintjobs/MagicPaintjobSelector.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ import org.lwjgl.opengl.GL11
1414
import org.magiclib.ReflectionUtils
1515
import org.magiclib.internalextensions.*
1616
import org.magiclib.kotlin.*
17+
import org.magiclib.util.MagicTxt
1718
import java.awt.Color
1819
import kotlin.math.max
1920

21+
/**
22+
* @author Starficz
23+
*/
2024
internal object MagicPaintjobSelector {
2125
internal class MagicPaintjobSelectorPlugin(val paintjobSpec: MagicPaintjobSpec?) : BaseCustomUIPanelPlugin() {
2226
lateinit var selectorPanel: CustomPanelAPI
@@ -180,8 +184,8 @@ internal object MagicPaintjobSelector {
180184
with(textElement){
181185
position.inTL(0f, width+topPad)
182186
setTitleOrbitronLarge()
183-
addTitle(paintjobSpec?.name ?: "Default")
184-
addPara(paintjobSpec?.description ?: "The Standard Paintjob", 3f)
187+
addTitle(paintjobSpec?.name ?: MagicTxt.getString("ml_mp_default"))
188+
addPara(paintjobSpec?.description ?: MagicTxt.getString("ml_mp_refit_defaultDesc"), 3f)
185189
}
186190

187191
return selectorPanel

0 commit comments

Comments
 (0)