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

927 commits

Author SHA1 Message Date
cpw
a2e06d968e Merge branch 'Minecrell-jline' into 1.8.8 2015-11-30 14:16:18 -05:00
cpw
ff42107b92 A few fixes 2015-11-30 14:14:56 -05:00
cpw
cf4c0ca001 Fixup Jline integration 2015-11-30 14:14:03 -05:00
cpw
321665efff Merge branch 'jline' of https://github.com/Minecrell/MinecraftForge into Minecrell-jline 2015-11-30 13:14:49 -05:00
Bernhard Bonigl
57d1a657a0 Add a PotionRegistry to handle dynamic distribution and remapping of Potion IDs 2015-11-29 22:02:55 +01:00
LexManos
a13ed35031 Merge pull request #2209 from lumien231/MemoryWorldLeak1.8.8 
Fixed: Server not being stopped, causing Worlds to stay loaded
 2015-11-28 16:51:38 -08:00
LexManos
02e9b9d99c Add chunk loading protection to WorldSever.getTileEntitiesIn, may prevent orphanced chunks and a CME in EntityPlayerMP. Note: The 'max' parameters are NON-inclusive. 2015-11-28 03:36:33 -08:00
LexManos
d878a2ae26 Fixed Large mushrooms generating incorrectly. 2015-11-26 19:36:53 -08:00
LexManos
81f9f3f20d Fixed placing blocks on snow layers with more then one layer. 2015-11-26 19:36:38 -08:00
cpw
7e5a2cb5ca Propogate AbortException. Closes #2206. Also fix tracing printstream when printStackTrace is called. 2015-11-25 16:28:06 -05:00
Lumien
2ecc92c4b3 Fixed: The Integrated Server not being stopped when exiting a singleplayer world to the main menu 2015-11-25 20:54:48 +01:00
cpw
cde6be7742 Fix up a couple of patches, affected by the recent update 2015-11-25 02:23:21 -05:00
cpw
4f2feee931 Fix button and lever placement problem. Closes #2204 2015-11-24 22:00:27 -05:00
cpw
84c3ef0f5c Merge branch 'master' into 1.8.8 2015-11-23 22:39:49 -05:00
cpw
918d59d6a6 Fix derpy fir trees in the taiga. So many patches. See if we can find any more mistakes?! 2015-11-22 22:35:21 -05:00
cpw
4320a0f1ed Fix weird patch issue where the this FG commit: 2f0ca9921b 
breaks if the exact end of a line is a srgname. Not ideal, but should work.
 2015-11-22 16:27:13 -05:00
cpw
e70fb50b51 Back to srgnames for patches. We should be starting to look OK now. 2015-11-22 00:46:26 -05:00
cpw
059ba15b5a Fix a typesig that was broken 2015-11-21 13:23:20 -05:00
Minecrell
e24c38bbb0 Add jline-based console with colors and tab-completion 2015-11-21 15:06:09 +01:00
Lex Manos
1246f1a791 Fix invalid position passed to isAir/getLight in World.playAmbientSound 2015-11-20 11:18:00 -08:00
Lex Manos
6e68d8fe74 Fix bold font rendering, Unicode is 2x pixel density of normal. 2015-11-19 18:38:33 -08:00
Lex Manos
904a30123d Moved client side Block.onBlockDestroyed to after Item.onBlockDestroyed to match server order. 2015-11-17 04:47:43 -08:00
Lex Manos
a3a16d6593 Fix incorrect position passes to Block.getExplosionResistance from entities. 2015-11-17 04:46:50 -08:00
cpw
eb73c30b28 This should be everything needed to separate blocks and items completely. 2015-11-14 10:52:03 -05:00
RainWarrior
c5ee4e6451 Model stuff: updated to generics, fixed various warnings, added handling of new perspective types. 2015-11-13 17:23:37 +03:00
cpw
fe7f713b67 A few tweaks, things are starting to work now.. 2015-11-13 02:59:43 -05:00
cpw
da03639bd7 All the patches done? Some code fixups.. It begins. 2015-11-13 02:32:08 -05:00
cpw
a26c4017b1 Fix a newly missing AT. Remove all CL_ references. OBFID is gone. 2015-11-13 00:09:34 -05:00
cpw
ce40f91fb0 WorldGen rejects, lots of them. Couple of small fixes elsewhere. 2015-11-12 23:30:53 -05:00
cpw
8f94ff14ff Enchantment,EnchantmentHelper,EntityEnderman,EntityZombie,EntityVillager,FurnaceRecipes,RecipeFireworks,RecipeRepairItem,NetworkSystem,S00PacketServerInfo 
PotionEffect,StatList,Session,WeightedRandomChestContent,Explosion,ExtendedBlockStorage,SaveHandler.

All NBT patches seem to have been merged upstream, so removing. The IntegratedServer and MinecraftServer pending queue changes also removed, as fixed upstream.
 2015-11-12 22:02:41 -05:00
RainWarrior
7258d577cd Overlay patch fix: use the correct block position. 2015-11-13 00:05:19 +03:00
RainWarrior
b77b036459 EntityRenderer, StringTranslate rejects fixed. 2015-11-12 23:26:44 +03:00
RainWarrior
3a5b7427a1 TextureMap, TextureManager and Stitcher rejects fixed. 2015-11-12 22:42:41 +03:00
RainWarrior
e80f66778b Manually updated WorldChunkManager, Chunk and BiomeDecorator patches, removed imports. 2015-11-12 21:26:52 +03:00
RainWarrior
bf63855292 ItemBlock, ItemBow, ItemMonsterPlacer, ItemReed, ItemSign rejects fixed. 2015-11-12 20:27:54 +03:00
RainWarrior
a8a69775a1 PlayerManager, PlayerProfileCache, ServerConfigurationManager, NetHandlerHandshakeTCP rejects fixed; ItemInWorldManager patch error fixed. 2015-11-12 20:05:25 +03:00
RainWarrior
c976ec494e TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed. 2015-11-12 19:27:14 +03:00
RainWarrior
8000e22830 ItemRenderer, RenderGlobal, StateMap, RenderItem rejects updated. 2015-11-12 19:12:58 +03:00
RainWarrior
9deb54b75f RenderEntityItem, RenderPlayer, RendererLivingEntity, LayerArmorBase, ItemStack rejects fixed; changed Armor Layer hook to catch LayerBipedArmor only. 2015-11-12 18:25:08 +03:00
RainWarrior
632c190e6f GuiButton, GuiChat, GuiCreateWorld, GuiIngameMenu, ServerListEntryNormal, GuiStats rejects updated. 2015-11-11 23:30:06 +03:00
RainWarrior
b6f91817f0 EntityPlayer patch updated. 2015-11-11 22:21:38 +03:00
cpw
13c7d038eb LoadingScreenRenderer,Minecraft,GuiContainerCreative,PlayerControllerMP,LanguageManager,Locale,SimpleReloadableResourceManager,EntityList,EntityLivingBase,EntityWither,EntityMinecart,EntityPlayerMP 
NethanlderPlayClient patch is now in vanilla. The FMLCommonHandler future exception catcher is not needed anymore, it's in Util. The caching of player profiles is now in vanilla (SkinManager).
 2015-11-11 10:33:37 -05:00
RainWarrior
41bd8a41fa BlockOre, BlockRotatedPillar, SoundManager, EntityPlayerSP, GuiScreen, GuiAchievements, GuiContainer, BlockModelRenderer, ContainerEnchantment, Slot updated manually and imports removed; GitSlot patch updated. 2015-11-11 15:51:32 +03:00
Lex Manos
49d4005805 Merge pull request #2179 from arideus101/patch-1 
Fixed issue where custom colored armor wouldn't be colored. (reverted from commit dee0b2084b)
 2015-11-11 02:57:06 -08:00
arideus101
1f20abde59 Allows Custom Armor Coloring to be done easily 2015-11-10 17:23:58 -08:00
RainWarrior
d31ca0dbd8 EntityAIAttackOnCollide, ServerStatusResponse, MinecraftServer, NetHandlerLoginServer, Vec3, BiomeGenBase, AnvilChunkLoader, ChunkProviderServer, MapGenRavine, MinecraftServer updated; fix in Block, GuiIngameForge; can load the world and play with ~20 more manual error fixes. 2015-11-10 21:47:08 +03:00
RainWarrior
df05edaa11 WorldProvider, WorldType, WorldServer, WorldServerMulti 2015-11-10 20:09:49 +03:00
RainWarrior
adddfab850 IntegratedServer, World, EnumChatFormatting and EnumFacing 2015-11-10 19:39:41 +03:00
RainWarrior
4c4d1096a7 FontRenderer + Item patch update; WorldVertexBufferUploader patch derp fix. 2015-11-10 01:14:37 +03:00
RainWarrior
f20b40fb80 Fix generics and error in the BlockState patch. 2015-11-10 00:42:56 +03:00
RainWarrior
e833ee81fb Updated various rendering-related patches and classes to 1.8.8; forge still uses vecmath. 2015-11-10 00:03:39 +03:00
cpw
98125a97c9 Patches and rejected patches. Note: some which had imports are not listed here because they need 
to be refactored not to have imports.
Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
 2015-11-09 01:50:45 -05:00
cpw
1a6c816bac Test of mcp patching 2015-11-08 23:09:33 -05:00
Lex Manos
bc05bfda4f Fixed Stronghold Library not having anything in it's chests. 2015-11-08 12:53:01 -08:00
Lex Manos
ffbad6633d Fixed Open url confirm screen not showing URL. 2015-11-08 12:52:41 -08:00
cpw
b1aa31215f regenerate reference patchset at patches.mcp. These will be used to generate a new patchtree under patches. 2015-11-08 15:50:52 -05:00
LexManos
d6a6316771 Merge pull request #2146 from bonii-xx/potionidfix 
Fix Potion IDs above 127
 2015-10-28 00:29:42 -07:00
LexManos
7d5b860ff3 Merge pull request #2126 from diesieben07/join-world-fix 
Fix CME when entities are spawned from EntityJoinWorldEvent
 2015-10-27 18:46:18 -07:00
RainWarrior
dd365d7220 Model pipeline system. 
Should replace all ad-hoc quad generation methods in forge, and make IBakedModel -> WorldRenderer data transfer faster. Added IVertexConsumer + helper classes; lighting that works correctly for non-axis-aligned faces using the new infrastructure. Changed smooth lighting algorithm, now it should work correctly for everything.
New block lighter can be disabled in the forge config options.
 2015-10-26 19:25:48 +03:00
Bernhard Bonigl
336eaa336b Fix Potion IDs above 127 2015-10-25 12:16:17 +01:00
mezz
ebdcc11c80 Allow server to access Potion isBadEffect() 2015-10-12 21:35:15 -07:00
darkevilmac
b9f5e152de Add PlayerSetSpawnEvent 2015-10-10 15:39:27 -07:00
Take Weiland
76753c06df Fix CME when entities are spawned from EntityJoinWorldEvent 2015-10-04 18:46:47 +02:00
Ruben Taelman
385159c25e Fix dispenser action for modded spawn eggs 2015-09-22 19:53:34 +02:00
Lex Manos
fb9ffa40fd Fix entity count being incorrect for spawning logic. Now filter out 'persistant' entities. 2015-09-14 13:18:34 -07:00
LexManos
fb7b47adb4 Merge pull request #2002 from ganymedes01/master 
Disallow conflicting furnace recipes
 2015-09-09 11:23:08 -07:00
ganymedes01
31a3a18ec7 Disallow conflicting furnace recipes 2015-09-02 19:04:57 +01:00
RainWarrior
b175d265b9 Much requested temporary hack for items and TESRs. Context: #1582, #1597, #1713, #2058 and others. 2015-09-02 07:35:24 +03:00
simon816
d61a55b661 Use already provided profile for the player's own skin 2015-08-31 03:28:59 +01:00
Lex Manos
90a88efd8a Fixed issue where config folder would not be created before SplashProgress tried to read from it. 
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
 2015-08-22 18:55:32 -07:00
cpw
b211aca5ce Merge branch 'fg2' 2015-08-20 12:27:20 -07:00
cpw
58ab3de7c1 Remove patches 2015-08-20 12:14:02 -07:00
LexManos
b45fd787f3 Merge pull request #1969 from diesieben07/blockhighlight 
Re-introduce RenderBlockOverlayEvent
 2015-08-05 11:48:53 -07:00
cpw
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
Lex Manos
7b18eab02d Fix placing skulls on fence posts. Closes #2055 2015-07-31 15:10:47 -07:00
LexManos
bd4b3debc3 Merge pull request #1968 from modwizcode/master 
Fix harvest logic running in addition to shearable logic
 2015-07-31 12:57:05 -07:00
LexManos
5623634f56 Merge pull request #2048 from shadekiller666/UnlistedPropertyValue 
Fix for ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty preventing block placement.
 2015-07-25 15:12:57 -07:00
shadekiller666
87bbbfafcc Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed. 2015-07-25 14:55:42 -07:00
LexManos
65123c66a0 Merge pull request #2004 from simon816/sign-nbt-fix 
Fix placing signs with NBT prompting for text
 2015-07-24 13:53:27 -07:00
LexManos
5eea9cebae Merge pull request #1983 from clienthax/patch-1 
Make layer methods public
 2015-07-23 12:13:00 -07:00
Ruben Taelman
04d4b2cf76 Make EnumFacing events available server-side 2015-07-23 16:51:45 +02:00
diesieben07
9f571ff15d Allow the new entity eggs to be created via middle-click 2015-07-16 14:13:48 +02:00
simon816
81eb6a8bb4 Fix placing signs with NBT prompting for text 2015-07-08 22:27:17 +01:00
Clienthax
97f8c246b8 Signed-off-by: Clienthax <clienthax@gmail.com> 2015-06-30 22:29:34 +01:00
RainWarrior
c4f370a7e6 Custom transformations in forge blockstate json. 2015-06-30 21:37:11 +03:00
LexManos
637e2c6f56 Merge pull request #1972 from bonii-xx/StateMapDomainFix 
Fix StateMap always mapping properties to the "minecraft" domain
 2015-06-26 04:03:25 -07:00
Lex Manos
2bfa1ffc05 Add debug for max texture size and output when Texture Atlas can not stitch all textures. 2015-06-26 03:32:09 -07:00
Bernhard Bonigl
e55ee43fd5 Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions. 2015-06-26 10:29:10 +02:00
diesieben07
ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update 2015-06-25 19:09:32 +02:00
Starbuck Johnson
fe2c4c569d Fix harvest logic running in addition to shearable logic 2015-06-24 14:28:47 -05:00
RainWarrior
8f65678b99 Vanilla models can now use custom textures. Fixes #1962 2015-06-23 16:52:42 +03:00
cpw
bae83e6724 Merge remote-tracking branch 'origin/master' 2015-06-21 22:08:08 -04: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
LexManos
8bb34107f1 Merge pull request #1858 from FlansMods/master 
Hook for Camera Angles, Including Roll
 2015-06-21 11:19:26 -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
ed09a25c65 Patch line number update. Ignore this. 2015-06-18 18:02:22 -07:00
Lex Manos
f59b0a2932 Make Item.shouldCauseReequipAnimation is bit more precise and copy over the new item for rendering even if the animation is diabled. 2015-06-17 20:33:35 -07:00
Lex Manos
030084f2b3 Add vanilla block rotation support back in for certain blocks that were missed in 1.8 update. Closes #1903 2015-06-17 17:28:18 -07:00
LexManos
ed8b8bcf8f Merge pull request #1932 from cheeserolls/patch-1 
Fix incorrect block position in BlockReed canPlaceBlockAt
 2015-06-17 16:48:42 -07:00
LexManos
1dc7a80d4f Merge pull request #1506 from mezz/GuiScreenInputEvents 
Add GuiScreenEvents for keyboard and mouse input
 2015-06-17 16:45:41 -07:00