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

115 commits

Author SHA1 Message Date
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
862289cf56
Handle logging during shutdown better on the server, by not 
closing the logfile before the server itself has shutdown.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-26 16:55:15 -04: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
136452840d
Remove forced ANSI terminal - it breaks the Eclipse terminal output. 
As a result, we can now support coloured log output again, by default.

Regen run configs to get the change (you should do this every update, you
know :D)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-28 16:05:50 -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
cpw
734a3d76aa
Peel IModLocator into the SPI package and extract a small IModFile 
interface as well. This allows building external IModLocator
implementations.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-01 11:31:09 -04:00
Tobias Hotz
185f7344fa
move default log level for debug file to debug instead of trace, and remove millis from console and GUI. Also remove unused config xmls 2019-08-31 13:55:46 -04:00
cpw
0d448a5e4f
Update libs to 1.0 versions, bump grgit, and fix tag search behaviour that resulted. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-29 23:39:49 -04:00
cpw
5048739b7f
Turned minecraft into a proper Mod, with a "dummy" language provider. 
Also fixed the "translations" not being available early if an exception occurs
by force loading the forge and MC ones. Closes #5984

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 20:16:01 -04:00
cpw
cd826f7bcf
Load default configs from the defaultconfig directory by default. (Can 
be overridden in the fml.toml config file if desired).

Will load any type of config tracked file from there - client, common, server
or custom tracked file. This means you can ship defaults for your pack
in a defaultconfig directory. I am thinking about ways to force a specific
config override for an existing config.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-28 13:44:18 -04:00
cpw
e17714583f
Crash report extended to show ModLauncher FML and Forge data. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-26 20:02:21 -04:00
cpw
0bdc2d04b4
Added a coremod, shush, don't tell Lex. 
Seriously, this is how to do targeted changes to specific classes.

In this case, adding a fieldtomethod redirect for EffectInstance.potion
to allow substitution.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-25 23:02:05 -04:00
cpw
9d82d822db
Fix error when ModsDiscoverer visits a non existent mods dir. 
Closes cpw/modlauncher#30

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:37:54 -04:00
cpw
eec5809097
Realms' removal has removed the need for additional jar transformation. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:33:54 -04:00
ichttt
bef52c945b Fix forge 1.14.4 startup in obfed enviroment (#5955) 2019-07-20 12:59:23 -07:00
cpw
27afdc8a27
Provisional update to 1.14.4. Missing a lot of playerinteractionmanager patches because everything moved and I'm tired. 
Fix up immediate problems.

bump to 28.
 2019-07-20 00:35:40 -04:00
Dirk "YouDirk" Lehmann
8c37d642fe Fix logoFile not working properly (#5775) 2019-07-08 19:49:31 -07:00
LexManos
bc23c1ddb2 Add installer processor to deobfuscate Mincraft's Realms library. 
This task will processes the current realms library from the json, so the installer must be re-ran every time they update it.
 2019-07-03 01:08:20 -07:00
cpw
c8e5007913
Remove legacy StartupProgress. 
Implement properly scalable progress thanks to @gigaherz. Closes #5863.
Implement API for pushing messages to the startup screen from mods.
Add memory display.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-30 23:48:54 -04:00
LexManos
c284de366b Split userdev data entry point into it's own provider to fix duplicate mod issue. 2019-06-25 18:03:51 -07:00
cpw
bdad2af27b
Tweak for lowercase handling. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 14:51:58 -04:00
cpw
60513446fa
Merge branch 'pull/5793' into 1.14.x 2019-06-23 14:42:32 -04:00
JoJoDeveloping
b9e5dfd286
Add mod failure identification 2019-06-23 03:14:05 +02:00
cpw
389bc1ecea
Tidy up mod loading a bit more, and also crash if the [[mods]] list isn't 
a list.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 12:52:22 -04:00