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

5358 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnjohn
486c0955cf Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom maps 2015-06-09 12:42:45 -06:00
ganymedes01
0373920f99 Added a brewing registry system 2015-06-09 14:01:45 -03:00
Lex Manos
1ad05f7f22 Missed patch for sign fix. 2015-06-08 16:23:30 -07:00
Lex Manos
15a1d4cf0d Remove worlds from WorldBorder when unloaded tol prevent memory leak, Closes #1923 2015-06-08 16:19:53 -07:00
Lex Manos
1b689802a4 Limit Sign text to 384 json characters and strip control codes. This is 1.8.7's Sign fix. Thanks Searge. 2015-06-08 16:19:02 -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
Fry
e007f7cf39 Merge pull request #1868 from fuami/ISmartBlockModel_Damage 
Add Block Breaking Animation for ISmartBlockModels
 2015-06-06 03:39:11 +03:00
Fuami
5cd4564a32 Added Breaking Animation for Smart Models, Checking each layer. 
Added Layered Smart Render Test.
 2015-06-05 19:23:17 -05:00
LexManos
26bc23602a Update README.txt 2015-06-05 13:28:07 -07:00
RainWarrior
d6bc936ffa B3D Improvements 
- fixed keyframe transformation application
 - textures are now resolved the same way as in vanilla models
 - added the ability to use forge blockstate texture information
 - removed unused code from the B3D example
 2015-06-04 18:58:42 +03:00
RainWarrior
581363fddd fixed AT missing for getModelBlockDefinition 2015-06-04 18:58:42 +03:00
RainWarrior
685a97fd93 Fixed missing variant logging; added the possibility to specify the item variant in the blockstate json. 2015-06-04 18:07:03 +03:00
RainWarrior
897d41fa77 Fixed partial variant detection in the forge blockstate loader. 2015-06-04 16:59:18 +03:00
Lex Manos
5064d33519 Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json. 2015-06-03 23:16:25 -07:00
LexManos
107e760aa3 Merge pull request #1912 from clienthax/master 
Add missing forge patch from 1.8 port
 2015-06-03 19:53:01 -07:00
Clienthax
9b53b7e111 Add missing forge patch from 1.8 port 
https://github.com/MinecraftForge/MinecraftForge/blob/1.7.10/patches/minecraft/net/minecraft/client/Minecraft.java.patch#L88
 2015-06-04 01:55:13 +01:00
cpw
63f2300794 Fix up the client/server fluid race condition that could cause the game to bail when an SSP game connects. 
There's still a teeny gap, but it's MUCH less prominent than it was before.
 2015-06-03 19:26:53 -04:00
LexManos
61f9c5a201 Merge pull request #1885 from LexManos/EnhanvedBlockStateJson 
Hook BlockState's Json loading to add support for simplified Forge format.
 2015-06-02 16:52:06 -07:00
Lex Manos
267e1ee62f Hook BlockState's Json loading to add support for simplified Forge format. 
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
 2015-06-02 16:49:56 -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
LexManos
41cae458a4 Merge pull request #1911 from AlgorithmX2/ItemFramesOnSolidSurfaces 
Allow placing item frames on Solid Block Faces (isSideSolid)
 2015-06-01 20:45:28 -07:00
AlgorithmX2
885d7602f9 Allow placing item frames on Solid Block Faces (isSideSolid) 2015-06-01 22:31:55 -05:00
Lex Manos
e6eeb03108 Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662 
(cherry picked from commit 19d7e16fa6)

Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
 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)

Conflicts:
	fml/src/main/java/cpw/mods/fml/client/SplashProgress.java
 2015-06-01 17:09:28 -04:00
cpw
3c640fa32d Bump minor version # to 2 because of the fluid changes (mirroring what happening in 1.7.10) 2015-06-01 16:31:16 -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
3331d2a496 Fixed damage reduction rate of vanilla armor incorrectly scaling with armor's current durability. 2015-05-26 23:34:32 -07:00
LexManos
f9b1e4e23b Merge pull request #1892 from AlgorithmX2/vanilla_lighting_bug 
Fix Vanilla Lighting Bug - Fixes Top/Bottom Faces interpolation.
 2015-05-26 19:24:37 -07: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
AlgorithmX2
76f8843017 Fix Partial Face Lighting on Top/Bottom Faces ; Vanilla MC-80148 2015-05-26 19:33:56 -05:00
Lex Manos
9fa51447a2 Fixed command exploit with C12 2015-05-25 16:08:42 -07:00
Lex Manos
c608e7c04e Fixes MC-75630 - Exploit with signs and command blocks 2015-05-25 15:28:14 -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
Lex Manos
df5e594e95 Loosen up ServerChatEvent to support IChatComponent Closes #1893 2015-05-25 13:34:34 -07:00
LexManos
8d7b999506 Merge pull request #1804 from Prototik/font 
Add true support for unicode fonts
 2015-05-21 10:43:22 -07:00
Prototik
2798fc4e49 Add true support for unicode fonts 2015-05-21 20:14:56 +07:00
LexManos
61b2929ae6 Merge pull request #1886 from diesieben07/texture-load-crash 
Fix crash when texture loading throws RuntimeException without message
 2015-05-20 12:19:18 -07:00
diesieben07
1501f467cf Fix crash when texture loading throws RuntimeException without message 2015-05-20 17:43:52 +02:00
Flan
306af4feee Added CameraSetup sub-event for camera angles 
Allows players to alter yaw and pitch of renderViewEntity, but more importantly, adds the ability to roll the view.

Added camera roll hook
 2015-05-19 16:14:44 +01:00
LexManos
d3ab6d36a4 Merge pull request #1882 from t1g3l/master 
Changed forge command tab completion to use getListOfStringsMatchingL…
 2015-05-18 10:08:46 -07:00
t1g3l
6a299a483a Changed forge command tab completion to use getListOfStringsMatchingLastWord() 2015-05-18 13:51:05 +02:00
LexManos
8944983d0f Merge pull request #1878 from t1g3l/master 
Added tab completion to /forge command.
 2015-05-17 14:55:39 -07: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