Commit Graph

154 Commits

Author SHA1 Message Date
Johannes Frohnmeyer 25739e28a5
Update to 1.19.3
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/jfmod Pipeline was successful Details
2022-12-08 19:00:41 +01:00
Johannes Frohnmeyer 48e5da28b2
Update to new infrastructure 2022-12-02 16:13:08 +01:00
Johannes Frohnmeyer 15f0b2aec4
Don't log stacktrace in rpo$checkProfile if debugLogs is disabled (closes #27) 2022-10-07 00:49:19 +02:00
Johannes Frohnmeyer 5077197fe0
Some null safety (fixes #24) 2022-08-31 17:20:31 +02:00
Johannes Frohnmeyer 2225ad73ce
Attempt to prevent early class init from config if config-reflect is loaded 2022-08-30 20:16:50 +02:00
Johannes Frohnmeyer f6f344515d
Switch environment to * since this should theoretically work serverside now 2022-08-30 17:28:27 +02:00
Johannes Frohnmeyer 657730e8a4
Fix config file path 2022-08-28 20:52:27 +02:00
Johannes Frohnmeyer a7379d1405
Support respackopts.json5 instead of assets/respackopts/conf.json 2022-08-28 20:43:13 +02:00
Johannes Frohnmeyer 7c368fab76
Switch config UI backend to LibJF 3 2022-08-28 20:06:59 +02:00
Johannes Frohnmeyer c4c1d7f1bb
Disable tests 2022-07-28 17:05:35 +02:00
Johannes Frohnmeyer 5fd4fdad94
Update for 1.19.1 with split sources 2022-07-28 14:10:59 +02:00
Johannes Frohnmeyer 758c2eff68
Hopefully enhance condition debugging experience 2022-06-13 13:58:18 +02:00
Johannes Frohnmeyer 08ee11ae45
Fix several bugs, bump deps for 1.19 2022-06-07 23:06:17 +02:00
Johannes Frohnmeyer 44f40fd259
Add support for date/time conditions, closes #18 2022-06-07 14:49:59 +02:00
Johannes Frohnmeyer ac4d8efe3e
Fix tests 2022-06-07 13:59:03 +02:00
Johannes Frohnmeyer 6d8c06f26d
Update for changes in μScript 2022-06-07 13:52:19 +02:00
Johannes Frohnmeyer 23e81eccf3
Introduce μScript and replace the condition and resource expansion systems with it (backwards compatibility is provided) 2022-06-04 19:43:49 +02:00
Johannes Frohnmeyer 306279e92e
Reenable compat modules for frex and dashloader. Will require a frex update to stop some unneeded logging 2022-05-17 11:32:03 +02:00
Johannes Frohnmeyer fdcc989566
Update LibJF, use @SerializedName 2022-04-03 18:58:49 +02:00
Johannes Frohnmeyer 998056636c
Use CacheKey/CachedPackState abstractions for MetaCache 2022-03-27 11:39:01 +02:00
Johannes Frohnmeyer 5a8628532e
[docs] Resource expansion 2022-02-19 16:15:44 +01:00
Johannes Frohnmeyer 2e4cc36303
[docs] Add page on changes between pack format versions 2022-02-17 21:37:57 +01:00
Johannes Frohnmeyer f319a25aaf
Increase gradle Xmx 2022-01-23 15:58:02 +01:00
Johannes Frohnmeyer 38e585a77a
Fabric Resource Conditions interop 2022-01-23 15:27:00 +01:00
Johannes Frohnmeyer 3126d060a1
Hook OPEN_ROOT in FileFilterEventImpl 2022-01-22 22:55:51 +01:00
Johannes Frohnmeyer 334e299f51
Logging improvements, fixed getName() and better /rpo dump 2022-01-12 18:23:49 +01:00
Johannes Frohnmeyer cd18b5d85f
Fix repeatedly reloading resources in pack screen, closes #21 2022-01-12 16:12:50 +01:00
Johannes Frohnmeyer 41ce4612f2
Use the data location of a pack instead of its id internally. Might fix conflicts between multiple instances of the same pack 2021-11-28 16:56:37 +01:00
JFronny b985879809
rc1, work around a known bug with fabulous shaders 2021-11-25 19:15:50 +01:00
JFronny 61306eef50
Fix an issue from the previous commit and support built-in conditions 2021-11-19 16:29:01 +01:00
JFronny e24405b611
Save pack configs in the packs directory (SomePack.zip -> SomePack.zip.rpo) if possible, needs testing 2021-11-19 15:16:08 +01:00
JFronny 283b7ba176
Port to 1.18 and include ModMenu icon, closes #17 2021-11-17 16:02:37 +01:00
JFronny b528807179
Move some stuff around again 2021-11-14 15:37:01 +01:00
JFronny 5347efd480
jdk17, explicitly depend on loader 0.12.0 2021-11-10 17:39:35 +01:00
JFronny 934cb10a09
Work around cloth breaking enums, closes #15 2021-11-09 15:16:46 +01:00
JFronny 5372d567b5
Thread "safe" 2021-10-21 21:20:20 +02:00
JFronny 3fc4f6a299
Fix tests 2021-10-21 18:45:31 +02:00
JFronny d5d66d79dc
Extra logging to help debug #13 2021-10-21 18:06:09 +02:00
JFronny 4fbb9b1dfb
Attempt to fix IllegalStateException in findResource 2021-10-16 11:55:01 +02:00
JFronny 94d4a0e4af
Attempt to fix CME 2021-10-14 17:59:06 +02:00
JFronny 5362344151
Finalize update to LibJF 2.0 2021-10-09 13:09:57 +02:00
JFronny ec01ab3ff7
Use a comment for including rpo in vanilla resource packs instead of #include 2021-10-06 17:38:43 +02:00
JFronny a06823a63c
Support fabulous shaders 2021-10-03 19:26:37 +02:00
JFronny 35bda8675b
Use LibJF 2.0, make configs more powerful 2021-10-03 16:45:29 +02:00
JFronny 18886c6635
Relax conditions syntax via enhanced TypeAdapterFactory for Sets 2021-09-16 08:35:37 +02:00
J. Fronny 7a6097da1a RpoCommand: output to frex.glsl instead of frex.frag since .frag is supposed to be used only for fragment shaders 2021-09-15 19:01:01 +00:00
JFronny 2c1fc5b414
Implement a config for Respackopts 2021-09-15 18:37:07 +02:00
JFronny 1cf5f3cef8
Fix dashloader compat 2021-09-15 17:43:29 +02:00
JFronny f2e000ef8a
Generify filter utils 2021-09-15 17:13:14 +02:00
JFronny b416df7b0c
Refactor conditions to use gson 2021-09-15 16:45:54 +02:00
JFronny 8f5014bec0
Refactor and remove LegacyConfig support 2021-09-15 15:26:25 +02:00
JFronny dfbc52625c
Utilize reflection in DashLoader compat, re-enable canvas dependency, add /rpo command, document frex integration, bump version 2021-09-14 19:42:38 +02:00
JFronny 45f0bbf5b9
Add info on pack translations to new docs and update images 2021-09-09 18:18:47 +02:00
JFronny 07d53616f7
Work on the docs 2021-08-30 15:03:33 +02:00
JFronny 9809602b7f
Fix class name in asm transformer 2021-08-26 23:39:04 +02:00
JFronny b336a8cb36
Dashloader: use ASM instead of wrapping the class 2021-08-26 23:30:55 +02:00
JFronny 649ca78d6c
Quick hack to "fix" DashLoader 2021-08-26 22:31:47 +02:00
JFronny 799c70eb4f
Fix issues related to mutability 2021-08-26 20:03:54 +02:00
JFronny 646a2459b4
Add capabilities to reduce DirFilters perf impact 2021-08-26 18:23:29 +02:00
JFronny d006e8cac1
Less strict syntax: don't require pack ID in conditions, allow .rpo entries to be named as singulars (and be singular values instead of arrays) 2021-08-26 16:00:21 +02:00
JFronny cc60048dd4
First attempt at directory conditions. Very slow but I don't care 2021-08-25 20:26:42 +02:00
JFronny 3831ac0594
Implement expansion. Closes #8 2021-08-24 17:42:46 +02:00
JFronny ef55ccb9b2
Add support for data packs. Closes #6 2021-08-24 13:57:42 +02:00
JFronny 27fcbcd13e
Fix assumption in FIND_RESOURCE handler. Closes #7 2021-08-24 13:02:54 +02:00
JFronny 6101eafe77
Explicitly depend on libjf 2021-07-21 15:59:17 +02:00
JFronny 0a20db4de2
Use libjf pack wrap 2021-07-13 16:15:03 +02:00
JFronny 4966024847
Hopefully fix WrappedPack 2021-07-13 13:33:27 +02:00
JFronny 672f8be302
Wrap AbstractFileResourcePacks in ReloadableResourceManagerImpl instead of mixing into implementations. Might cause compatibility issues though. (I should make an API for this since I use this in basically every mod :think:) 2021-07-12 22:17:22 +02:00
JFronny bfaa448b73
Respect config entry order, use terraformers archive maven, simplify translation keys 2021-07-11 21:26:14 +02:00
Pabli 0665bfaa4c Polish language 2021-07-11 18:53:47 +00:00
JFronny ec0ea91fc3
2.2.0 2021-07-08 17:49:24 +02:00
JFronny e7a0847adb
Implement string sanitization for shader gen 2021-07-08 17:49:24 +02:00
JFronny 88b07064ed
Prevent infinite loop. Very unlikely to cause issues in practice 2021-07-01 16:19:42 +02:00
JFronny 1db554cb5a
Hopefully fix enum defaults 2021-07-01 16:17:38 +02:00
JFronny 3fa12ce181
Move GUI building logic to ConfigEntry implementations, remove typeMatches 2021-06-19 13:32:16 +02:00
JFronny 0d52f59a9a
Implement backwards compat for the enum changes 2021-06-14 17:04:43 +02:00
JFronny 68cdc81c27
Set value type of ConfigEnumEntry to String and simplify shader API 2021-06-14 16:33:15 +02:00
JFronny 3389db278d
Finalize update 2021-06-10 19:26:59 +02:00
JFronny 163b1524a8
Fix enum entries 2021-06-10 18:44:43 +02:00
JFronny 08f6a9821b
Add tests, also works now for some reason 2021-06-10 18:28:47 +02:00
JFronny 41f5408a7e
Fix compile 2021-06-10 16:11:19 +02:00
JFronny 2393c48913
Move some things around 2021-06-10 16:07:22 +02:00
JFronny a3721174d9
Some more work, still doesn't work 2021-06-10 14:55:03 +02:00
JFronny 68a3bf2d54
Rewrite part 1 (doesn't work yet) 2021-06-10 13:10:12 +02:00
JFronny 37d74294b1
Update to 1.17 and remove LibCD support 2021-05-29 22:48:51 +02:00
JFronny 7939fd4861
Fix config screen crashing because no category is defined if no pack is installed 2021-04-05 21:33:29 +02:00
JFronny a27a197d84 Merge .fbt and .rpo formats, still need to test a file with fallbacks and no conditions 2021-02-15 12:17:52 +01:00
JFronny 685fe0900e Add .fbt fallback textures 2021-02-15 11:44:59 +01:00
JFronny f825b73e38 Proper conditions 2021-01-04 16:26:13 +01:00
JFronny b07e0a0671 Add tooltips 2020-12-29 11:19:21 +01:00
JFronny e0b98d1a2e Clean up logging 2020-12-28 12:12:59 +01:00
JFronny fa1438e0d2 Add support for slider-based whole numbers and switch to custom parsing for the config file due to gson occasionally ignoring entries for no apparent reason when parsing to a map 2020-12-28 11:31:12 +01:00
JFronny 3821953a23 Respect enum insertion order, add respackopts_loaded to allow canvas shaders to check whether rpo is loaded 2020-12-28 09:41:02 +01:00
JFronny 6c340d8354 Fix moving packs and resizing the pack selection screen. It should be noted that this might cause desync between a config file and the game 2020-12-21 15:34:31 +01:00
JFronny 620f716d8e Conditions for resource pack items using .rpo files, properly reload resources after modifications to a config are saved 2020-12-21 14:51:49 +01:00
JFronny a1952b6b56 Add support for subcategories and loosen restrictions on property names 2020-12-21 13:18:13 +01:00
JFronny 6535d74867 Do not load old data, fix a few bugs 2020-12-20 22:28:25 +01:00
JFronny 3c3928eeb8 Update included lumilights, fix values being reset on restart 2020-12-20 14:24:48 +01:00
JFronny 805252fac7 Improve and document translation capabilities 2020-11-26 20:38:54 +01:00
JFronny 3043a8cde2 Enums, example based on LumiLights, README 2020-11-26 20:11:38 +01:00