614bbcb0da
FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace.
2015-08-01 23:51:40 -04:00
9a859f8d5c
Merge branch 'master' of https://github.com/AbrarSyed/MinecraftForge into fg2
2015-08-01 20:55:58 -04:00
5045d8df68
Merge branch '1.7.10'
2015-08-01 20:30:22 -04:00
c308a47124
Cherry pick some changes from 1.8 for inner class discovery, also fix the negativecache. Closes #1872
2015-07-18 12:47:31 -04:00
0f456b4684
Be a little bit more helpful when the ObjectHolder misses. Should help figure out what is going in in #2006
2015-07-09 17:05:20 -04:00
9ebc77ef22
updated installed gradle. not finished
2015-06-30 00:14:41 -05:00
c02c379bed
removed old unnecessary stuff
2015-06-29 21:56:35 -05:00
c5ac5b0264
DeobfuscationData no longer required at dev time
2015-06-29 21:56:35 -05:00
0fb705f8f5
added hardcoded fml version file
2015-06-29 21:56:35 -05:00
bbfae84ee8
removed broken and duplicate AT lines
2015-06-29 21:56:30 -05:00
cab151ec44
Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975
2015-06-26 17:54:38 -07:00
44077774be
Fixed error GUIs showing a white screen and replaced a rogue direct GL call.
2015-06-27 01:12:24 +02:00
204cb16bc4
ObjectHolder works great, but it should be a lot less spammy about failed lookups. They're usually mod options.
2015-06-25 14:41:45 -04:00
b2033d642c
More descripotive error if Patcher is passed invalid data for vanilla classes.
2015-06-23 20:36:23 -07:00
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
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
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
e519278888
Add TextureManager to loading screen.
2015-06-18 22:17:21 -07:00
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
6527792d06
Add the stitching allocation stage to loading screen.
2015-06-18 20:13:17 -07:00
716dfdae47
Create config folder in SplashProgress if it does not exist.
2015-06-18 20:11:23 -07:00
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
38a85280de
Make FML Gui classes use GlStateManager. Closes FML#615
2015-06-17 15:16:48 -07:00
c50adf2433
Include the thread state in the potential error handleing for SplashProgress.
2015-06-16 15:26:00 -07:00
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
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
b94c2799ab
Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none.
2015-06-09 22:25:13 -07:00
847c0246cd
Quiet FMLControlledNamespacedRegistry debug spam by default. Reenable using -Dfml.debugRegistryEntries=true.
2015-06-09 21:33:52 -07:00
b985384fab
Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
2015-06-09 21:31:18 -07:00
851f9c1da6
Cleanup some spammy output.
2015-06-09 21:20:53 -07:00
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
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
26bc23602a
Update README.txt
2015-06-05 13:28:07 -07:00
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
cpw