Lex Manos
b2033d642c
More descripotive error if Patcher is passed invalid data for vanilla classes.
2015-06-23 20:36:23 -07:00
cpw
16ff1be093
Merge branch '1.7.10'
...
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
2015-06-21 21:59:51 -04:00
cpw
2c24c7618a
Mods that are extracted to the mods dir by unzipping or whatever will now cause the game to crash. Too much info is in the META-INF now,
...
and more will be being added. Extracting to the mods dir just completely breaks that.
2015-06-20 14:47:55 -04:00
Lex Manos
7041fbc27e
Time each bar in the loading screen and print it to the log, useful information to see where most time is spent in loading.
2015-06-18 22:18:27 -07:00
Lex Manos
e519278888
Add TextureManager to loading screen.
2015-06-18 22:17:21 -07:00
Lex Manos
4235ca36ea
Make TextureMap for items and blocks skip the first pass of loading/stitching textures.
...
Should decrease loading times for large packs.
May cause issues with some mods so use -Dfml.skipFirstTextureLoad=false to disable.
2015-06-18 20:13:31 -07:00
Lex Manos
6527792d06
Add the stitching allocation stage to loading screen.
2015-06-18 20:13:17 -07:00
Lex Manos
716dfdae47
Create config folder in SplashProgress if it does not exist.
2015-06-18 20:11:23 -07:00
Lex Manos
c158af902f
New system in EntityRegistry to allow modders to register spawn eggs.
...
For entites that do not use the global ID system.
{Which no mod entity should}
Vanilla spawn eggs will now detect a 'entity_name' entry in it's NBT data and use that for spawning/rendering.
2015-06-18 18:05:12 -07:00
Lex Manos
38a85280de
Make FML Gui classes use GlStateManager. Closes FML#615
2015-06-17 15:16:48 -07:00
Lex Manos
c50adf2433
Include the thread state in the potential error handleing for SplashProgress.
2015-06-16 15:26:00 -07:00
cpw
114ac38910
Merge branch '1.7.10'
...
Conflicts:
fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java
fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
2015-06-14 13:57:23 -04:00
Lex Manos
b3a1548cfa
Cleanup mod state dump to be easier to read by displaying the states in abreviation and placing them before the mod info.
2015-06-09 23:06:06 -07:00
Lex Manos
b94c2799ab
Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none.
2015-06-09 22:25:13 -07:00
Lex Manos
847c0246cd
Quiet FMLControlledNamespacedRegistry debug spam by default. Reenable using -Dfml.debugRegistryEntries=true.
2015-06-09 21:33:52 -07:00
Lex Manos
b985384fab
Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
2015-06-09 21:31:18 -07:00
Lex Manos
851f9c1da6
Cleanup some spammy output.
2015-06-09 21:20:53 -07:00
cpw
b35aec4347
Attempt to synchronize the state for vanilla client completions and quit the handler if the vanilla
...
thread has already setup the connection. Should fix #1924
2015-06-08 18:24:35 -04:00
Lex Manos
ee1e229b66
Change custom payload lock to be buffer itself incase multiple packets use the same backend buffer. Closes #1908
2015-06-07 00:06:00 -07:00
LexManos
26bc23602a
Update README.txt
2015-06-05 13:28:07 -07:00
Lex Manos
950da28d54
Fixed missing import in last merge.
2015-06-02 16:32:10 -07:00
cpw
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
cpw
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
Lex Manos
e6eeb03108
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
...
(cherry picked from commit 19d7e16fa6
2015-06-01 17:15:06 -04:00
Lex Manos
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
cpw
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
cpw
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
Lex Manos
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
Lex Manos
19d7e16fa6
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
2015-05-25 14:32:35 -07:00
Lex Manos
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
Lex Manos
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
diesieben07
1501f467cf
Fix crash when texture loading throws RuntimeException without message
2015-05-20 17:43:52 +02:00
cpw
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
cpw
3bbf5c04a6
Strip control codes in progress bar messages. They cause crashes sometimes.
2015-05-17 10:15:44 -04:00
cpw
686db5e5eb
Hardcode the FML version in-game as a specific value.
2015-05-16 13:43:35 -04:00
cpw
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
cpw
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
cpw
228ce68639
Update current json
2015-05-08 13:54:11 -04:00
cpw
76c7177553
Expose the state of the loader
2015-05-07 14:17:45 -04:00
RainWarrior
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
RainWarrior
fb18c07722
Eliminated texture name allocation race condition
2015-05-04 21:54:33 +03:00
cpw
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
cpw
c43e4a8022
Fix the ordering of the messages, so they make sense now.
2015-05-02 22:13:41 -04:00
AbrarSyed
8e14f9e1cc
remapped parameters and added ending newlines
2015-04-29 13:37:09 -05:00
cpw
858c64ffd3
Optifine can tell us when they're ready for the new splash screen.
2015-04-29 08:15:35 -04:00
LexManos
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
cpw
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
luacs1998
0c933be8dd
Add classloader exclusion for ASM
2015-04-26 20:40:22 +08:00
luacs1998
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
RainWarrior
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
