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

5278 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kina
68cd48287b make WorldSavedData implement NBTSerializable (#2745) 2016-04-09 16:09:06 -07:00
Matthew Prenger
2a3774def3 Don't use import static with net.minecraft classes. Using the latest MCP snapshots this causes an import conflict. (#2742) 2016-04-09 16:03:46 -07:00
mezz
a018e14939 Add cancelable event for Potions shifting the gui position (#2667) 
Add cancelable event for Potions shifting the gui position
 2016-04-08 20:18:17 -07:00
Matti Ruohonen
03584ec411 Fix ForgeChunkManager world unloading check (#2736) 2016-04-07 15:39:55 -07:00
LexManos
2a4067a539 Fix being kicked from server when climbing ladders. 2016-04-07 13:12:10 -07:00
LexManos
8fefac110e Fix potential desync between Forge's Villager profession and vanilla's int based system. 2016-04-07 12:29:00 -07:00
Craig Burton
d31cf8ddbc Update ore dictionary (#2721) 
Updated the Ore Dictionary with more vanilla items:
  -Prismarine Shard ( "gemPrismarine" )
  -Prismarine Crystals ( "dustPrismarine" )
  -Prismarine Block ( "blockPrismarine" )
  -Prismarine Brick ( "blockPrismarineBrick" )
  -Dark Prismarine ( "blockDarkPrismarine" )
  -Nether Wart ( "cropNetherWart" )
  -Sugarcane ( "sugarcane" )
  -Paper ( "paper" )
  -Ender Pearl ( "enderpearl" )
  -Bone ( "bone)
  -Gunpowder ( "gunpowder)
  -String ( "string" )
  -Nether Star ( "netherStar" )
  -Leather ( "leather" )
  -Feather ( "feather" )
  -Egg ( "egg" )
  -End Stone ( "endstone" )
  -Torch ( "torch" )
  -Vine ( "vine" )
  -Cactus ( "blockCactus" )
  -Grass ( "grass")
  -Obsidian ( "obsidian" )
  -Red Sandstone ( added to "sandstone" )
  -Crafting Table ( "workbench" )
  -Slime Block ( "blockSlime" )
  -Granite ( "stoneGranite" )
  -Polished Granite ( "stoneGranitePolished" )
  -Diorite ( "stoneDiorite" )
  -Polished Diorite ( "stoneDioritePolished" )
  -Andesite ( "stoneAndesite" )
  -Polished Andesite ( "stoneAndesitePolished" )
 2016-04-07 11:49:31 -07:00
LexManos
fbe628d058 Merge pull request #2729 from kashike/feature/bossinfo 
Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods
 2016-04-06 16:19:18 -07:00
kashike
72edc41a7c Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods 
These methods can also be used by the server (see BossInfoServer, it sends packets to the client but the methods are @SideOnly(Side.CLIENT))
 2016-04-06 15:57:54 -07:00
RainWarrior
db04370830 Made forge fluids use smooth lighting. 2016-04-06 16:13:51 +03:00
LexManos
7973984227 Fixed NPE in dedicated server languages. And fixed logger for main FML event bus. 2016-04-06 02:11:27 -07:00
LexManos
07a2b67b7f Cleanup OBJLoader parse function and fix issues related to JVM differences. 
Also fix support for sopme of the spec that was partially respected.
 2016-04-06 01:45:43 -07:00
LexManos
fb0bdd1276 Enhance some error logging related to OBJLoader issues, and RegistryEntries. 2016-04-06 01:44:08 -07:00
Fry
a48fd56fdc Merge pull request #2723 from mezz/pick-fix 
Fix some plain keybinds not working when a modifier is active
 2016-04-06 10:11:07 +04:00
mezz
e68908e9d5 Fix some plain keybinds not working when a modifier is active 2016-04-05 23:01:26 -07:00
LexManos
045e8bf806 Merge pull request #2719 from mezz/pick-fix 
Fix #2717 Pick block hotkey not working in inventories
 2016-04-05 18:30:39 -07:00
mezz
7587ca7c71 Fix #2717 Pick block hotkey not working in inventories 2016-04-05 18:25:25 -07:00
LexManos
b9d18a263c Merge pull request #2718 from nekosune/patch-1 
Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0 in 1.9
 2016-04-05 17:49:48 -07:00
Katrina Swales
8d50c9e988 Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0 in 1.9 2016-04-06 01:43:23 +01:00
LexManos
ce4d31529d Merge pull request #2714 from nekosune/patch-1 
Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0
 2016-04-05 13:32:55 -07:00
Katrina Swales
f4ca1f61b9 Corrected readNBT ignoring anything in slot 0 2016-04-05 19:44:20 +01:00
RainWarrior
cb7685a3b0 Fixed forge fluid having a collision box. 2016-04-05 18:55:42 +03:00
RainWarrior
bf16d0066b Fixed zip being closed too early in the server language loading. 2016-04-05 18:53:19 +03:00
Fry
628613d27f Merge pull request #2709 from iTitus/bucketModel 
Fix dynbucket item transformation.
 2016-04-05 13:44:44 +04:00
iTitus
63a6a2e50b Fix dynbucket item transformation. 2016-04-05 10:49:51 +02:00
RainWarrior
ab2b07f149 Fixed some test mods not being marked as client-only. 2016-04-05 11:46:05 +03:00
RainWarrior
d44c9082fa Fixed mod languages not being loaded on the server. 2016-04-05 10:41:42 +03:00
LexManos
25d7b80119 Merge pull request #2708 from Zaggy1024/1.9 
Fix PlaySoundEvent replacing a sound with PositionedSound causing an NPE.
 2016-04-04 20:55:12 -07:00
Zaggy1024
68023ce40b Fixed using PlaySoundEvent to replace a sound with a PositionedSound causing an NPE due to the Sound field not being set by a call to ISound.createAccessor(SoundHandler). 2016-04-04 22:18:34 -05:00
LexManos
8180bed027 Merge pull request #2707 from mezz/keyBinding19-4 
Add modifier support to vanilla keybindings.
 2016-04-04 18:06:29 -07:00
LexManos
034efaff3d Merge pull request #2604 from williewillus/pie 
New PlayerInteractEvent for 1.9
 2016-04-04 18:06:11 -07:00
Vincent Lee
e8ea52558b Player Interact Event 2016-04-04 19:58:46 -05:00
mezz
8f49ea7c5f Add modifier support to vanilla keybindings. 
Add Orange conflict color for modifier/key conflicts
(like Ctrl and Ctrl-Z conflicting)
Related to #2692
 2016-04-04 16:52:16 -07:00
LexManos
8fd0817c81 Merge pull request #2704 from AEnterprise/1.9 
onBlockHarvested is no longer called twice
 2016-04-04 15:49:49 -07:00
LexManos
ce4bb8fe93 Fix improper logic in ItemHandlerHelper.giveItemToPlayer causing some items to not be added. Closes #2705 2016-04-04 15:44:03 -07:00
LexManos
9f1505dd53 Fixed EntityJoinWorldEvent not being fired for some entitites on Server Worlds. Closes #2685 2016-04-04 15:33:45 -07:00
LexManos
6342bfea3e Fix issue caused by setting spawnRadius to 0. Closes #2624 2016-04-04 15:22:17 -07:00
RainWarrior
2ae47c0903 Made both exceptions occuring during item model loading print in the log; closes #2696. 2016-04-04 18:07:06 +03:00
RainWarrior
879b7b5a61 Added the ability to change the printed model error count; Added printing of actual exceptions causing missing variants related to blockstate loading, closes #2689. 2016-04-04 16:02:21 +03:00
AEnterprise
dbe9053d50 onBlockHarvested is no longer called twice 2016-04-04 11:37:40 +02:00
LexManos
1e3df55689 Merge pull request #2702 from McJty/1.9 
Added DimensionManager.createProviderFor() to WorldClient constructor…
 2016-04-03 22:49:11 -07:00
McJty
9c3def9cb0 Added DimensionManager.createProviderFor() to WorldClient constructor similar to what is done 
in WorldServer to make sure the correct provider is created client-side too.
 2016-04-04 06:26:46 +02:00
LexManos
1811d88266 Merge pull request #2616 from iTitus/updateNotificationIcon 
Add update notification icon made by @gigaherz, closes #2582
 2016-04-03 18:22:27 -07:00
Fry
132e0d8f93 Merge pull request #2697 from mezz/keyBinding19-3 
Fix inability to attack while holding modifier keys
 2016-04-04 00:19:52 +04:00
mezz
bc2b5ad517 Fix inability to attack while holding modifier keys 2016-04-03 13:15:18 -07:00
Fry
df1adb577c Merge pull request #2695 from mezz/keyBinding19-2 
Re-Add key binding modifiers and contexts.
 2016-04-03 12:50:08 +04:00
mezz
21d39f6558 Re-Add key binding modifiers and contexts. 2016-04-03 01:46:29 -07:00
RainWarrior
9baabf9249 Revert "Add key binding modifiers and contexts.", until it's fixed. 
This reverts commit 34c3af7e85.
 2016-04-03 11:01:09 +03:00
RainWarrior
77772ac3f5 Changed generic signature of GameRegistry.register methods to work around the type inference bug; updated all example mods to the new block/item registration method. 2016-04-03 10:14:16 +03:00
LexManos
fc57d5e6c6 Merge pull request #2693 from Adubbz/1.9 
Fixed mismatched registry names and mod ids
 2016-04-02 23:04:15 -07:00