950da28d54
Fixed missing import in last merge.
2015-06-02 16:32:10 -07:00
e2dc863086
Merge branch '1.7.10'
...
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
2015-06-02 07:30:44 -04:00
f8cb411df1
So we can't print a lot of unicode in the splash screen, so restrict to a hard subset we know we CAN print, closes #1910
2015-06-02 07:24:26 -04:00
e6eeb03108
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
...
(cherry picked from commit 19d7e16fa6
2015-06-01 17:15:06 -04:00
f088b1b460
Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message.
...
(cherry picked from commit e3211eec04
2015-06-01 17:09:28 -04:00
d02636213a
Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8
...
Conflicts:
fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
fml/src/main/java/net/minecraftforge/fml/common/Loader.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
patches/minecraft/net/minecraft/item/ItemArmor.java.patch
patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
patches/minecraft/net/minecraft/world/World.java.patch
patches/minecraft/net/minecraft/world/WorldProvider.java.patch
src/main/java/net/minecraftforge/common/ForgeVersion.java
src/main/java/net/minecraftforge/common/network/ForgeMessage.java
src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
src/main/java/net/minecraftforge/fluids/FluidRegistry.java
src/main/java/net/minecraftforge/oredict/OreDictionary.java
2015-06-01 16:29:34 -04:00
bd6630810f
Add in an ItemStackHolder - a way to inject ItemStacks without having to have complex lookup code everywhere.
...
Example: https://gist.github.com/cpw/9af398451a20459ac263
2015-05-30 14:07:54 -04:00
2bb090bf2b
Force netty downgrade on dedicated server to match client. Netty bug: https://github.com/netty/netty/issues/2302 Closes #1848
2015-05-26 19:20:46 -07:00
19d7e16fa6
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
2015-05-25 14:32:35 -07:00
e3211eec04
Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message.
2015-05-25 13:34:35 -07:00
89994bda39
Cleanup a lot of spammy output. Everything hidden behind environment flags now. Scale anvil image down 50%
2015-05-25 13:34:34 -07:00
1501f467cf
Fix crash when texture loading throws RuntimeException without message
2015-05-20 17:43:52 +02:00
06398fa259
Clean up transformers a bit. Can't use COMPUTE_FRAMES even though it's required - the game refuses to even
...
run if I do. Note for j8: when we force Java8 classes, all coremods will need a thorough overhaul - the
current way we do things is not sustainable when Java8 becomes the universal norm.
2015-05-17 10:35:56 -04:00
3bbf5c04a6
Strip control codes in progress bar messages. They cause crashes sometimes.
2015-05-17 10:15:44 -04:00
686db5e5eb
Hardcode the FML version in-game as a specific value.
2015-05-16 13:43:35 -04:00
5fe653cf82
Attempt to fix the slow loading problem. Instead of forcing the main thread to wait around
...
on every call to processWindowMessages, we will simply skip it, if the mutex is already
claimed by the display thread. This should fix slow loading issues seen by some with
the new loading screen.
2015-05-16 12:55:15 -04:00
081a949bfd
Merge branch '1.7.10'
...
Conflicts:
patches/minecraft/net/minecraft/client/Minecraft.java.patch
src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
src/main/java/net/minecraftforge/fml/common/LoadController.java
src/main/java/net/minecraftforge/fml/common/Loader.java
src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
src/main/resources/fml_at.cfg
2015-05-10 23:55:11 -04:00
228ce68639
Update current json
2015-05-08 13:54:11 -04:00
76c7177553
Expose the state of the loader
2015-05-07 14:17:45 -04:00
c28794fe38
Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed
2015-05-04 22:10:36 +03:00
fb18c07722
Eliminated texture name allocation race condition
2015-05-04 21:54:33 +03:00
65ab79cf69
Revert "Merge pull request #650 from luacs1998/1.7.10"
...
This undoes the seriously broken change from Sponge to support Mixins, that breaks
a wide variety of coremods. Given the widespread incompatibility it introduces, it
won't be re-added at 1.7.10.
This reverts commit 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing
changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a.
2015-05-04 08:50:08 -04:00
c43e4a8022
Fix the ordering of the messages, so they make sense now.
2015-05-02 22:13:41 -04:00
8e14f9e1cc
remapped parameters and added ending newlines
2015-04-29 13:37:09 -05:00
858c64ffd3
Optifine can tell us when they're ready for the new splash screen.
2015-04-29 08:15:35 -04:00
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
ddc6b0a19f
Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1)
...
for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping
commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects
Closes #651
2015-04-26 11:32:28 -04:00
0c933be8dd
Add classloader exclusion for ASM
2015-04-26 20:40:22 +08:00
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
626a192ce6
Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
2015-04-26 00:22:43 +03:00
46c5505565
Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:05:28 -04:00
89daceb9eb
Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
...
Example here: https://gist.github.com/cpw/d3edc292631708f2d454
2015-04-25 01:30:17 -04:00
4e6aa905f0
Fix trying to close the screen during error.
2015-04-25 00:41:50 -04:00
794ff1d1b4
Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
2015-04-25 05:12:02 +03:00
1fdd18398e
Fix broken log message in vanilla.
2015-04-24 19:02:54 -04:00
454e2e36a4
Track mipmaps and texture upload
2015-04-24 19:01:49 -04:00
753115678a
fixed bar text positioning
2015-04-25 01:37:39 +03:00
c8acd763ef
Thread errors should be correctly displayed in the crash report now
2015-04-25 01:27:57 +03:00
3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
99c60ee156
fixed scala module libs in jsons
2015-04-23 20:54:14 -05:00
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
ba354da317
Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:28:19 -04:00
6398961c48
Call some loader stuffs
2015-04-20 23:34:36 -04:00
8c54026f2d
Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
2015-04-20 23:15:37 -04:00
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
b049b39760
Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:25:29 -04:00
e1ed3c07c2
Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:48:49 -04:00
Lex Manos