Skip to content

Commit 21d158d

Browse files
wispbornewispborne
committed
Merge branch 'magicpaintjobs-starficz'
2 parents 48ea16d + 87afa4d commit 21d158d

31 files changed

+1580
-143
lines changed

‎.idea/kotlinc.xml‎

Lines changed: 2 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations/Run_Starsector_Java23.xml‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.run/Run Starsector.run.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Starsector" type="Application" factoryName="Application">
3-
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
3+
<option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files (x86)/Fractal Softworks/Starsector-0.98a-RC5/jre" />
44
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
55
<option name="MAIN_CLASS_NAME" value="com.fs.starfarer.StarfarerLauncher" />
66
<module name="MagicLib" />
7-
<option name="VM_PARAMETERS" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.library.path=native\windows -Xverify:none -Xms1536m -Xmx1536m -Xss2048k -Dcom.fs.starfarer.settings.paths.logs=. -Dcom.fs.starfarer.settings.paths.saves=../saves -Dcom.fs.starfarer.settings.paths.screenshots=../screenshots -Dcom.fs.starfarer.settings.paths.mods=../mods -classpath janino.jar;commons-compiler.jar;commons-compiler-jdk.jar;starfarer.res.jar;starfarer.api.jar;starfarer_obf.jar;jogg-0.0.7.jar;jorbis-0.0.15.jar;json.jar;lwjgl.jar;lwjgl_util_applet.jar;jinput.jar;lwjgl_test.jar;log4j-1.2.9.jar;lwjgl_util.jar;fs.sound_obf.jar;fs.common_obf.jar;xstream-1.4.10.jar com.fs.starfarer.StarfarerLauncher" />
7+
<option name="VM_PARAMETERS" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -noverify -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShowCodeDetailsInExceptionMessages -XX:+ExtensiveErrorReports -XX:+ShowMessageBoxOnError -XX:+PrintCommandLineFlags -XX:+TieredCompilation -XX:-UseCondCardMark -Xlog:async -XX:+UseFastStosb -XX:+AlwaysCompileLoopMethods -XX:TieredStopAtLevel=4 -XX:TrimNativeHeapInterval=60000 -XX:+UseCriticalCompilerThreadPriority -XX:+UseCriticalJavaThreadPriority -XX:UseAVX=3 -XX:AVX3Threshold=0 -XX:UseSSE=4 -XX:+UseSSE42Intrinsics -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UseFMA -XX:+UseBMI1Instructions -XX:+UseBMI2Instructions -XX:+UseCLMUL -XX:+UseFastUnorderedTimeStamps -XX:+UseUnalignedLoadStores -XX:+UseXMMForArrayCopy -XX:+UseXMMForObjInit -XX:+UseXmmI2D -XX:+UseXmmI2F -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=compact -XX:ShenandoahAllocationThreshold=85 -XX:ShenandoahGuaranteedGCInterval=0 -XX:+ZeroTLAB -XX:+SegmentedCodeCache -XX:+AlwaysAtomicAccesses -XX:+UseStringDeduplication -XX:-DontCompileHugeMethods -XX:Tier0Delay=1 -XX:+UseFPUForSpilling -XX:+EnableVectorAggressiveReboxing -XX:+EnableVectorReboxing -XX:+EnableVectorSupport -XX:-AlignVector -XX:TieredOldPercentage=10000 -XX:Tier0ProfilingStartPercentage=2000 -XX:IncreaseFirstTierCompileThresholdAt=99 -XX:InterpreterProfilePercentage=99 -XX:+UseVectorCmov -XX:+UseVectorStubs -XX:ReferencesPerThread=0 -XX:MaxGCPauseMillis=10 -XX:-EnableThreadSMRStatistics -XX:+UseUnalignedAccesses -XX:PerMethodRecompilationCutoff=100000 -XX:ProfileMaturityPercentage=100 -XX:NmethodSweepActivity=1 -XX:ThreadPriorityPolicy=1 -XX:ReservedCodeCacheSize=256m -XX:+PrintCodeCache -XX:-UseDynamicNumberOfCompilerThreads -XX:CompilerDirectivesFile=./compiler_directives.txt -Djava.library.path=native\\windows -XX:-BytecodeVerificationLocal -XX:-BytecodeVerificationRemote -Djava.util.Arrays.useLegacyMergeSort=true --enable-preview --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.Buffer.UNSAFE=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.desktop/java.awt.Rectangle=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED -Xmx2048m -Xms2048m -Xss4m -Dcom.fs.starfarer.settings.paths.saves=..\\saves -Dcom.fs.starfarer.settings.paths.screenshots=..\\screenshots -Dcom.fs.starfarer.settings.paths.mods=..\\mods -Dcom.fs.starfarer.settings.paths.logs=. -classpath janino.jar;commons-compiler.jar;commons-compiler-jdk.jar;starfarer.api.jar;starfarer_obf.jar;jogg-0.0.7.jar;jorbis-0.0.15.jar;json.jar;lwjgl.jar;jinput.jar;log4j-1.2.9.jar;lwjgl_util.jar;fs.sound_obf.jar;fs.common_obf.jar;xstream-1.4.10.jar;txw2-3.0.2.jar;jaxb-api-2.4.0-b180830.0359.jar;webp-imageio-0.1.6.jar com.fs.starfarer.StarfarerLauncher" />
88
<option name="WORKING_DIRECTORY" value="C:/Program Files (x86)/Fractal Softworks/Starsector/starsector-core" />
99
<method v="2">
1010
<option name="MakeProject" enabled="true" />

‎CHANGELOGS.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
Version 1.5.1
2+
- Fixed version checker file to not constantly say there's an update.
3+
4+
Version 1.5.0
5+
6+
**MagicPaintjobs v2**
7+
by Starficz
8+
- Added new Refit UI button to MagicPaintjobs.
9+
- magic_paintjobs.csv has a new optional column, `paintjobFamily`.
10+
- Added optional Engine/Shields support for ships, which requires a new file of `[id].paintjob` (from magic_paintjobs.csv) to work
11+
- The file is in JSON, all attributes optional, with the format being:
12+
```json
13+
{
14+
"engineSpec":{
15+
"color":[0,0,0,0],
16+
"contrailColor":[0,0,0,0],
17+
"spawnDistMult":1,
18+
"contrailWidthMultiplier":1,
19+
"glowAlternateColor":[0,0,0,0],
20+
"glowSizeMult": 1
21+
},
22+
"shield":{
23+
"innerColor":[0,0,0,0],
24+
"ringColor":[0,0,0,0],
25+
"innerRotationRate":1,
26+
"ringRotationRate":1
27+
}
28+
}
29+
```
30+
- A new CSV now exists for weapons: magic_weapon_paintjobs.csv
31+
- The file is in format: `id,paintjobFamilies,weaponIds,spriteMap`
32+
- `id`: Unique id for this paintjob
33+
- `paintjobFamilies`: The paintjobFamily(s) (comma separated string for multiple) applicable
34+
- `weaponIds`: The Starsector weapon ID(s) (comma separated string for multiple) applicable
35+
- `spriteMap`: the sprite(s) (comma separated string for multiple) that should be replaced in format:
36+
`path/to/original/sprite.png` -> `path/to/new/sprite.png`
37+
- Wings/modules/weapons of a painted parent ship will automatically get applied with a paintjob that has a matching paintjobFamily.
38+
- All paintjob related files can now either be in `\data\config` or `\data\config\paintjobs`
39+
140
Version 1.4.6
241

342
**MagicBounty**

‎MagicLib-Kotlin/MagicLib-Kotlin.iml‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,16 @@
77
</content>
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
10-
<orderEntry type="module-library">
11-
<library>
12-
<CLASSES>
13-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib-Kotlin.jar!/" />
14-
</CLASSES>
15-
<JAVADOC />
16-
<SOURCES>
17-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib-Kotlin.jar!/" />
18-
</SOURCES>
19-
</library>
20-
</orderEntry>
21-
<orderEntry type="library" name="Kotlin-Runtime" level="project" />
22-
<orderEntry type="module-library">
23-
<library name="LazyLib">
24-
<CLASSES>
25-
<root url="jar://$MODULE_DIR$/../../GlobalMods/LazyLib/jars/LazyLib-Console.jar!/" />
26-
<root url="jar://$MODULE_DIR$/../../GlobalMods/LazyLib/jars/LazyLib.jar!/" />
27-
</CLASSES>
28-
<JAVADOC />
29-
<SOURCES>
30-
<root url="jar://$MODULE_DIR$/../../GlobalMods/LazyLib/jars/LazyLib.jar!/" />
31-
</SOURCES>
32-
</library>
33-
</orderEntry>
10+
<orderEntry type="library" name="LunaLib" level="project" />
11+
<orderEntry type="library" name="starfarer-api" level="project" />
12+
<orderEntry type="library" name="jars-ConsoleCommands" level="project" />
3413
<orderEntry type="library" name="LunaLib" level="project" />
3514
<orderEntry type="library" name="starfarer-api" level="project" />
3615
<orderEntry type="library" name="Vayra's Sector" level="project" />
3716
<orderEntry type="library" name="jars-ConsoleCommands" level="project" />
17+
<orderEntry type="library" name="Kotlin-Runtime" level="application" />
18+
<orderEntry type="library" name="LazyLib-Kotlin" level="application" />
19+
<orderEntry type="library" name="LazyLib" level="application" />
20+
<orderEntry type="library" name="starsector-98" level="application" />
3821
</component>
3922
</module>

‎MagicLib-Kotlin/src/org/magiclib/kotlin/MagicKotlinExt.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,30 @@ inline fun FleetParamsV3.createFleet() = FleetFactoryV3.createFleet(this)
2828
inline fun Color.modify(red: Int = this.red, green: Int = this.green, blue: Int = this.blue, alpha: Int = this.alpha) =
2929
Color(red, green, blue, alpha)
3030

31+
/**
32+
* Returns the red component in the range 0f-1f in the default sRGB space.
33+
*/
34+
inline val Color.redf: Float
35+
get() = this.red / 255f
36+
37+
/**
38+
* Returns the green component in the range 0f-1f in the default sRGB space.
39+
*/
40+
inline val Color.greenf: Float
41+
get() = this.green / 255f
42+
43+
/**
44+
* Returns the blue component in the range 0f-1f in the default sRGB space.
45+
*/
46+
inline val Color.bluef: Float
47+
get() = this.blue / 255f
48+
49+
/**
50+
* Returns the alpha component in the range 0f-1f in the default sRGB space.
51+
*/
52+
inline val Color.alphaf : Float
53+
get() = this.alpha / 255f
54+
3155
/**
3256
* Time how long it takes to run [func] and run [onFinished] afterwards.
3357
* If `onlyRunTraceInDevMode` is true and dev mode is disabled, `onFinished` will still run but `millis` will be 0.

‎MagicLib.iml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,42 @@
2121
</library>
2222
</orderEntry>
2323
<orderEntry type="module" module-name="MagicLib-Kotlin" />
24+
<orderEntry type="library" name="LunaLib" level="project" />
25+
<orderEntry type="library" name="starfarer-api" level="project" />
26+
<orderEntry type="library" name="SWP" level="project" />
2427
<orderEntry type="module-library">
2528
<library>
2629
<CLASSES>
27-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib.jar!/" />
28-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib-Kotlin.jar!/" />
29-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib-Console.jar!/" />
30+
<root url="jar://$MODULE_DIR$/../Vayra/Vayra's Sector - Last Release/jars/VayraSector.jar!/" />
3031
</CLASSES>
31-
<JAVADOC>
32-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/javadoc.zip!/" />
33-
</JAVADOC>
32+
<JAVADOC />
33+
<SOURCES />
34+
</library>
35+
</orderEntry>
36+
<orderEntry type="library" name="LazyLib-Kotlin" level="application" />
37+
<orderEntry type="library" name="LazyLib" level="application" />
38+
<orderEntry type="library" name="Kotlin-Runtime" level="application" />
39+
<orderEntry type="library" name="starsector-98" level="application" />
40+
<orderEntry type="module-library">
41+
<library>
42+
<CLASSES>
43+
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector-0.98a-RC5/mods/Console Commands/jars/lw_Console.jar!/" />
44+
</CLASSES>
45+
<JAVADOC />
3446
<SOURCES>
35-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib.jar!/" />
36-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib.jar!/" />
37-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib/jars/LazyLib-Kotlin.jar!/" />
47+
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector-0.98a-RC5/mods/Console Commands/jars/lw_Console.jar!/" />
48+
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector-0.98a-RC5/mods/Console Commands/jars/lw_Console.jar!/" />
3849
</SOURCES>
3950
</library>
4051
</orderEntry>
4152
<orderEntry type="module-library">
4253
<library>
4354
<CLASSES>
44-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/Vayras Sector-3.2.1/jars/VayraSector.jar!/" />
55+
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/zz GraphicsLib-1.9.0/jars/Graphics.jar!/" />
4556
</CLASSES>
4657
<JAVADOC />
4758
<SOURCES />
4859
</library>
4960
</orderEntry>
50-
<orderEntry type="library" name="LunaLib" level="project" />
51-
<orderEntry type="library" name="starfarer-api" level="project" />
52-
<orderEntry type="library" name="Vayra's Sector" level="project" />
53-
<orderEntry type="library" name="Kotlin-Runtime" level="project" />
54-
<orderEntry type="library" name="SWP" level="project" />
55-
<orderEntry type="library" name="GraphicsLib" level="project" />
56-
<orderEntry type="library" name="jars-ConsoleCommands" level="project" />
5761
</component>
5862
</module>

‎data/config/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"MagicAutoTrails": "org.magiclib.plugins.MagicAutoTrails",
77
"MagicAchievementCombatScript": "org.magiclib.achievements.MagicAchievementCombatScript",
88
"MagicSubsystemsCombatPlugin":"org.magiclib.subsystems.MagicSubsystemsCombatPlugin",
9+
"MagicPaintjobCombatRefitAdder":"org.magiclib.paintjobs.MagicPaintjobCombatRefitAdder",
910

1011
"old_ML_fakeBeamPlugin": "data.scripts.plugins.MagicFakeBeamPlugin",
1112
"old_ML_spriteRenderManager": "data.scripts.plugins.MagicRenderPlugin",
@@ -52,6 +53,9 @@
5253
},
5354
"ui": {
5455
"ship_arrow": "graphics/warroom/ship_arrow.png"
56+
},
57+
"icons": {
58+
"lock": "graphics/magic/icons/lockIcon.png"
5559
}
5660
},
5761
"ruleCommandPackages": [

0 commit comments

Comments
 (0)