keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
7126 commits 1 branch 2 tags 103 MiB
Commit graph

95 commits

Author SHA1 Message Date
cpw
b4ccafe718
Enforce specversion number for forgeSPI so we don't crash with weird errors later. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-01 19:27:22 -05:00
cpw
7f1ea578d6
Fix problem with duplicate mods caused by duplicate classes found during scan. 
File Scan results are now sets.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-27 23:34:23 -05:00
cpw
0bcc60fbe3
Tidy up server launch. The JAR will resolve it's libraries from a relative 
path. We just need to verify what we need is on the classpath, and
try and handle when it's not, cleanly (by recommending running the
installer).

The manifest now embeds the correct launch arguments to allow FML to
resolve - these were _never_ editable, and belong somewhere out of
the way.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-26 10:28:48 -05:00
cpw
bbdf52e038
Update to 0.10 modlauncher API with performance improvements.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-23 14:36:05 -05:00
LexManos
b7f6fbcfcb Merge extra and data jars. As Log4j has issues with it's config being in a different jar then the custom logger. 2019-02-21 04:24:39 -08:00
tterrag
57cd8324dc Fix reference to UnsafeHacks in RuntimeEnumExtender 2019-02-19 19:28:17 -05:00
cpw
36ccb3bbfe
Fix serverlang loading issue, by frontloading MC and Forge langs, 
so error messaging works.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-15 20:00:41 -05:00
cpw
78455ac3c0
Add the language providers to the main classloader as well, so 
their resources are available to other classes..

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-14 21:43:56 -05:00
cpw
4441935a4a
Handle invalid JAR files more gracefully. Don't crash. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-13 18:33:50 -05:00
cpw
f1feac76b3
Fix JKS to be stored as binary 2019-02-11 13:51:13 -05:00
cpw
d9c4446ccc
Enable https to Let's Encrypt endpoints by using an SSL factory with 
the two extra Let's Encrypt root certs installed into an auxiliary
keystore.

The keystore was generated using standard commands, documented in the
FixSSL class.

The Let's Encrypt certificates are not provided by default in Java 8
prior to update 101.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 23:41:40 -05:00
cpw
f83500db11
Its 2019. Update licence headers to match. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 17:57:03 -05:00
cpw
fd02d81e73
Fix Terminal Handler and GUI logging on dediserver, hopefully.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 17:51:25 -05:00
cpw
0d379fdd6b
Fix config to use new system properly, without exploding the server. 
Separates server specific config into the server config file.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 16:38:14 -05:00
cpw
c25214aaf4
Fix #5429 properly, without breaking symlinks on linux.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 15:58:12 -05:00
cpw
b28a418bd9
Use a configuration value for the thread count, make it default to 
availableProcessors when set to <=0 (default value is -1)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 11:44:22 -05:00
cpw
64f69cf5c9
Revert "Make sure to create entire path for directory, fixes #5429" 
This reverts commit 77dd9eb8

This will completely break symlinks on linux.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 10:26:21 -05:00
tterrag
065ebd748a Add synchronized modifier to runtime enhanced enum methods 2019-02-07 17:01:40 -05:00
tterrag
79c17cb542 Add IExtensibleEnum, fix DimensionType create method 2019-02-07 16:36:30 -05:00
Bartosz Skrzypczak
b527bf8ab3 Fix leaking unclosed InputStream in Scanner.fileVisitor (#5432) 2019-02-06 22:57:00 -08:00
LexManos
aa91af865d Rework server launching at runtime to include needed default arguments and validate libraries exist. 
Move Forge config loading to manual while config system is in development.
 2019-02-04 18:23:58 -08:00
tterrag
77dd9eb883 Make sure to create entire path for directory, fixes #5429 2019-02-04 12:31:47 -05:00
cpw
55691fce4e
Expose the ModFile in the scan data, so languages can read it and make 
mod construction decisions.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-31 23:09:47 -05:00
Justin
d2a3b5bed8 Fix RuntimeEnumExtender creating new enums with incorrect ordinal value (#5402) 2019-01-30 12:51:14 -08:00
cpw
6365674a2a
Config watching and config events now actually work! 
Also fixed small bug with MOD_CLASSES not defaulting to empty string.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-29 15:42:56 -05:00
ichttt
da33233762 Update for ForgeSPI change, revert back to VersionStatus checking 2019-01-27 20:51:35 +01:00
cpw
0a11ffb827
More logging tweaks, including some aimed at userdev. 
`forge.logging.markers=<LIST OF MARKERS>` will enable markers.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-27 00:06:57 -05:00
cpw
d539dc12a1
Fix modsorter to not crash on soft dependencies that don't exist. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-26 17:07:17 -05:00
cpw
8b74b32909
Make MOD_CLASSES available to the forge development environment as well. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-26 13:07:30 -05:00
cpw
0bdafb976e
Fix handing the "minecraft" dependency properly by adding it to the list 
of mods.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-26 11:23:51 -05:00
tterrag
0b2a98f956 Fix dependents not being loaded into mod sorter 2019-01-23 20:04:57 -05:00
liach
c01b336095 Improves topological sort 
This can be used for mod sorting, dependencies between registries, etc.
e.g. https://github.com/MinecraftForge/MinecraftForge/pull/4694#issuecomment-412520302

New features:
Now accepts guava graph
Performance improvement: no longer reverse the graph; changed dfs to bfs
Accepets a comparator for secondary order, e.g. natural order, index by map
Now properly reports all cycles in a graph with Tarjan's strongly connected component algorithm
Adds a test to prove the validity of the sort and cycle detection
Modified build.gradle for test source directory and dependencies

Mod loading changes:
Sort mod file info instead of suppliers (we don't have suppliers instances)
Moves cycle error reporting out of topological sort and into mod sorter
Prevent mod file dependencies between mods that share the same file

Signed-off-by: liach <liach@users.noreply.github.com>
 2019-01-21 03:06:27 +00:00
cpw
040cc4bf16
Expose a couple of mods.toml properties properly. Half-implemented 
override namespace - still needs to be reviewed and determined how this
might work in detail.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-20 21:26:31 -05:00
tterrag
0d1a2f2af3 Add utilities that RuntimeEnumExtender expects to exist 2019-01-17 13:11:54 -05:00
cpw
755eff7415 Fix exploded directory locator to actually scan all paths for a file. 2019-01-15 22:14:23 -05:00
cpw
99452a8b45 Update a bunch of libs, rename some of the mod events to more 
meaningful names.
 2019-01-14 00:39:00 -05:00
LexManos
36d2e67b07 Reimplement @ObjectHolder scanning, and expose system for others to add handlers. 
Fix forgedev and userdev run configs.
Fix issue in log functions assuming String arguments.
 2019-01-09 20:57:01 -08:00
LexManos
f7acc73282 Update userdev and runconfigs for ForgeGradle changes. 2019-01-08 00:29:36 -08:00
cpw
1b40618f02 Fix classloading properly. ModLoadingClassLoader doesn't work 
with the proper delegation model. Abandoned it, in favour of injecting
locators into the Transformer classloader directly.
 2019-01-06 16:24:32 -05:00
cpw
58c78560fa Fix up some stuff with resource packs, so the guilist works properly. 2019-01-05 10:19:47 -05:00
cpw
fd9c83b65f Finish up classloading system. Use ModJARURL to locate resources 
and enable ModLauncher to use those instead. This allows all mods to load
within the scope of the game classloader, removing weird conflicts and
class discovery problems.
 2019-01-04 23:56:10 -05:00
cpw
6baddc7e26 client and server work standalone and in forge dev. Next up userdev. 
Moved some launchplugin code to the launcher. Moved servermain to
the launcher.

server currently needs cmdline arguments  --fml.forgeVersion=24.0.51-1.13-pre --fml.mcVersion=1.13 --fml.mcpVersion=2018.09.12.04.11.00 --fml.forgeGroup=net.minecraftforge.test
 2019-01-01 21:35:23 -05:00
cpw
e9580877b4 fix up some discovery code, and make regular runtime _mostly_ work. 
Still WIP and doesn't quite get to main screen yet.
 2019-01-01 16:50:04 -05:00
LexManos
440649bb95 Fix new launcher jar packaging. 
Run license checker over new code.
 2018-12-31 16:48:23 -08:00
cpw
48846bc0ba separated fmllauncher code from main forge mod code. This enables much 
stronger classloader separation between the two sides. Forge now
loads as a regular mod.

Still needs a bunch of debugging, but structure looks good and game loads
in forge dev.
 2018-12-31 16:34:33 -05:00