Commit graph

132 commits

Author SHA1 Message Date
cpw
b1f73a0760
Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-09-06 17:54:05 -04:00
cpw
bfeec0c7bd
Merge branch '1.16.1' into 1.16.x
# Conflicts:
#	patches/minecraft/net/minecraft/client/Minecraft.java.patch
#	patches/minecraft/net/minecraft/item/crafting/Ingredient.java.patch
#	src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
#	src/main/java/net/minecraftforge/registries/GameData.java
2020-08-31 21:15:56 -04:00
cpw
d76ee4edd7
Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-08-30 21:39:06 -04:00
sciwhiz12
625cd746ef
Add user-friendly exceptions when config loading fails (#7214) 2020-08-21 14:27:12 -07:00
sciwhiz12
07ffc890e5
Fix modproperties property in mods.toml causing exception (#7192) 2020-08-21 11:25:40 -07:00
Cyborgmas
797791c2af
Fix small logging issues with loading pack.png for mods (#7265) 2020-08-21 10:24:49 -07:00
malte0811
5037adede9
Improve startup time by caching the manifest data for mod jars (#7256) 2020-08-20 21:29:02 -07:00
sean
e1efab0452
Print mod file name on InvalidModFileException (#7241) 2020-08-13 19:16:53 -07:00
LexManos
fe43088c96 Initial 1.16.2 Update 2020-08-13 00:35:08 -07:00
LexManos
4ffcdaa6da Make license toml entry optional during 1.16.1
There are to many existing mods to make this required.
Yes, we are technically before a RB and can do breaking changes. However this is too large.
2020-07-28 00:16:18 -07:00
cpw
97dfcbc52b
Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-27 20:21:39 -04:00
cpw
532d153d33
Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM.
Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use
the modbus for events not listened there.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-27 19:40:43 -04:00
cpw
daa85d3c5b
Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds.
Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-21 20:12:33 -04:00
David Quintana
517bbc8b5b Update copyright year to 2020. 2020-07-02 19:49:11 +02:00
ichttt
4aa53dbb00
Fix loading screen color and text (#6824) 2020-06-30 13:16:51 -07:00
LexManos
97d4652f5f Make installer use MCPConfig version to identify MC assets. 2020-06-26 12:52:50 -07:00
cpw
41a6d70aee
Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so.
Also fix other launch profiles.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-26 14:27:32 -04:00
cpw
4700973dff
Update to 1.16.1 and fix a couple more patch problems
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 18:28:48 -04:00
Anthony Anderson
ca2ed1ff7a
Final patching
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 17:55:54 -04:00
cpw
20f78ac724
Modify how modfiles load slightly, for better decoupling.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 17:51:27 -04:00
cpw
a39f1cbe1a
Improve the DistExecutor API and introduce some "almost completely" safe mechanisms to handle sided lambdas.
In general, use sided lambdas safely by embedding them in a separately loaded class. There's a whole twitch stream
dedicated to investigating this problem. See link in DistExecutor if you're interested.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-05-24 17:40:52 -04:00
Alex Thomson
4ce32c3663
Fix exclusion of coremods not filtering correctly when the mods directory is a symbolic link. (#6600) 2020-05-12 15:02:01 -07:00
David Quintana
0fc1ea01d1 Remove redundant call to modifyLoot. Closes #6657 2020-04-28 19:22:48 +02:00
tterrag
ea23cd4779 Fix various issues with the loading screen and datagen
Fix NPE on datagen startup
Fix early loading GUI hanging and never terminating after datagen
Add loading GUI messages for datagen
2020-04-28 00:00:45 -04:00
tterrag
9d8817b5db Rename window icon image to avoid conflict, fix not using vanilla icon 2020-04-27 01:09:34 -04:00
cpw
8c8ef2d9e1
Use forge logo as short term window Icon, fix Buffer cast problems for new JDK stupid.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-04-26 21:42:18 -04:00
cpw
6a25490d7f
Handle message display a bit better, try to make the UI tick a bit better.. Still a problem with
a modelbake right at the end, happening on the window flip.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-04-26 21:03:43 -04:00
RogueLogix
6a0b16817d Move ClientVisualization to secondary thread 2020-04-26 16:06:44 -07:00
RogueLogix
677e2104a0 move handOffWindow down near start() 2020-04-26 15:41:53 -07:00
cpw
438c969fef
merge early startup into main window if used. It seems to work well.. Also ticks window on main thread, so mac compatible now.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-04-26 18:24:48 -04:00
tterrag
a3b1007633 Fix child annotations not inheriting member name, cleanup 2020-04-11 01:57:40 -04:00
tterrag
bdd0af5280 Fix element type of scanned child annotations 2020-04-11 01:19:25 -04:00
cpw
3e48066021
Add a progress message for atlas textures. Fills a big time gap on bigger packs.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-03-20 17:34:46 -04:00
ichttt
747cb0f151 Some code cleanup for 1.15 (#6362) 2019-12-18 20:39:41 -08:00
tterrag
49596dcacc Mod list GUI detail pass
- Make padding consistent on all elements
- Properly horizontally center the "Search" text
- Update and resize forge/mcp logos
- Enable linear filtering on logo rendering by default
  - Can be disabled with the "logoBlur" mods.toml property
2019-12-17 20:58:26 -05:00
LexManos
1933d05e36 Update to 1.15
Due to the massive rendering changes, certain features, such as emissive item rendering and the forge block rendering/lighting pipeline are currently disabled.

Co-authored-by: David Quintana <gigaherz@gmail.com>
Co-authored-by: tterrag <tterrag1098@gmail.com>
Co-authored-by: Unnoen <theunnoen@gmail.com>
2019-12-17 03:38:12 +01:00
tterrag
5c88451f6f Allow classpath locator to discover jars via FMLModType attribute 2019-12-05 22:56:05 -05:00
cpw
cfc53c939e
Tidy up some output and also add libraries from the modfile detection into the transforming classloader.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-12-05 22:47:39 -05:00
cpw
31da9a4878
Fix the hang on startup problem when windows' broken device enumeration
causes a huge glfwInit slowdown. Log a message too when this is detected.

See https://github.com/glfw/glfw/issues/1284, https://stackoverflow.com/questions/10967795/directinput8-enumdevices-sometimes-painfully-slow,
https://discourse.libsdl.org/t/win-10-initing-joystick-causes-45s-hang-in-sdl-dinput-joystickdetect/23293

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-11-23 15:37:56 -05:00
cpw
1e1644f6d4
A few tweaks to things. Make the mods command a bit better, make the
IndexedMessageCodec actually log which network channel it got back packets
on. Also, improve the custom directorymodlocator with actual custom names,
finally, allow up to 99 log rollovers, up from 7 default (this means a
repeatedly crashing server is less likely to roll out the log of the first
crash).

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-11-03 12:33:07 -05:00
cpw
e3068d7db2
Fix NPE in modlauncher when there is no mods dir yet.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-10-25 07:27:55 -04:00
DaemonUmbra
29ad7a39de Fixed NPEs caused by uninitialized lists in ModDirTransformerDiscoverer (#6277) 2019-10-24 23:06:27 -07:00
cpw
3bf6c17bb8
Allow pack locators to load from the mods folder.
Regular mods are now automatically de-duped based on the version number -
the highest version file of a "root mod id" is now selected automatically.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-10-23 21:30:17 -04:00
JoJoModding
8adc546d92 Allow mods actually to have their own usable config gui (#6208) 2019-10-15 14:56:27 -07:00
cpw
9c759294c6
Add a super early GUI for showing pre-game launch messages from FML. NOTE: this cannot show on MAC because MAC can't handle
off-thread GUIs in any way shape or form, and we need the main thread to do real work.

Fix forge fading in wrongly.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-10-05 17:03:02 -04:00
cpw
f4bab8b8c1
Integrate modlauncher changes for mixin.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-09-27 17:42:24 -04:00
LexManos
48cf910626 Bump binpatcher and jarsplitter versions to address Java differences on older JDKs. 2019-09-22 17:30:29 -07:00
tterrag
dee844e232 Add IExtensibleEnum#init, extend FillerBlockType/PlacementBehaviour 2019-09-21 15:57:32 -04:00
cpw
71a4828809
Some tweaks around the code base. A functional consumer for networking - return a bool from your consumer function, rather than setPacketHandled.
Tweak the server modloading behaviour to try and be a bit clearer that a mod errored.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-09-16 20:14:25 -04:00
cpw
bdce8d0494
Add a modfolderfactory. Fix up login payload exposure.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2019-09-01 14:40:39 -04:00