Commit graph

113 commits

Author SHA1 Message Date
Christian
f9087cb291 Revert "Added a RenderType that allows Map-style rendering w/o inheriting from"
This reverts commit eb4688bf5e.

Conflicts:
	patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
2013-09-14 18:43:18 -04:00
Christian
0bc9138aa4 Fix the divider 2013-09-13 22:57:29 -05:00
Christian
492cbc3628 Move stuff around a bit- also tie range and enabled to options. 2013-09-13 22:11:59 -05:00
Christian
65165cd41c Merge branch 'mapStyle' of github.com:Matchlighter/MinecraftForge into Matchlighter-mapStyle 2013-09-13 20:11:13 -05:00
Matchlighter
eb4688bf5e Added a RenderType that allows Map-style rendering w/o inheriting from
ItemMap.
2013-09-07 22:50:18 -06:00
Christian
519da32391 The partial tick should be available for all render player events. Weird it wasn't. 2013-09-07 16:25:30 -04:00
MachineMuse
ee0cb12810 Added fov hook
Small formatting changes (opening braces on new line)
2013-09-06 13:25:47 -04:00
Christian
0443ef5a9e MachineMuse, remember, there's TWO model formats supported! 2013-09-05 09:14:10 -04:00
Christian
e962c2a94d Merge branch 'master' of github.com:jk-5/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-09-05 08:39:15 -04:00
Christian
e499a6d375 Merge branch 'objTessellation' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:58:56 -04:00
Christian
21cd975ae3 Merge branch 'mouseevent2' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:47:52 -04:00
MachineMuse
e3e3ea54f9 Added mouse event 2013-09-04 15:01:37 -06:00
Christian
0d44234239 Update forge for MCP naming updates
Updated FML:
MinecraftForge/FML@d0c6e92900 Update MCP data
2013-09-03 18:04:12 -04:00
MachineMuse
96c045137d Merge remote-tracking branch 'forge/master' into objTessellation 2013-09-03 15:45:45 -06:00
jk-5
f78eba09fd Added GuiOpenEvent
You can use this for a clean way to override guis, without needing an
TickHandler to check if the gui you want to override is open and show
your own gui

Proper close check
2013-08-24 09:32:34 +02:00
Christian
7d700916d9 Merge branch 'miscchanges' 2013-08-04 22:27:55 -04:00
LexManos
b0f5f88482 Merge pull request #610 from purpleposeidon/patch-1
Add an InputStream constructor to WavefrontObject
2013-08-04 16:56:26 -07:00
iChun
f48dafda7e Add Pre and Post events for RenderLivingEvent 2013-07-26 12:38:17 +08:00
LexManos
6397939c9e Merge pull request #665 from copyboy/master
Fix getArmorTexture by passing it the subtype
2013-07-24 13:18:31 -07:00
copyboy
c9af365d44 Fix getArmorTexture by passing it the subtype 2013-07-24 22:12:38 +02:00
Soaryn
88e0ecf2cf Fixes Vanilla Fluid Still Icon Setters
Fixes null icons from being set for both the still water/lava icons, and sets the correct Icon.
2013-07-16 01:27:39 -04:00
Christian
38bd039a93 Make resourcelocation the class available on the server. 2013-07-08 19:40:15 -04:00
LexManos
85fd1d010d Updated FML:
MinecraftForge/FML@1d0384f8f6 Update for 1.6.2 and MCP 8.04
MinecraftForge/FML@111b0216fd Add the jsons for 1.6.2
MinecraftForge/FML@6f96d89e2b Update eclipse workspaces for 1.6.2
2013-07-07 14:03:26 -07:00
Christian
1169ba9efb Merge branch 'master' into newliquid 2013-07-04 12:07:32 -07:00
LexManos
b12872eed1 Fix compile errors temporarily, dont use till updated to new system. 2013-07-03 21:34:49 -07:00
LexManos
35caa32ad1 Merge pull request #539 from richardg867/techne-1
Techne model importer
2013-07-03 21:21:16 -07:00
LexManos
98aab2083b Render pass sensitive version of Item.hasEffect, Closes #517 2013-07-03 21:14:59 -07:00
LexManos
7f5ec0eaef Fix domain issue with SoundPool entries. 2013-07-03 19:31:54 -07:00
LexManos
125b134d87 Updated FML:
MinecraftForge/FML@155e846818 Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
MinecraftForge/FML@3f4bf61ae6 Update key
MinecraftForge/FML@4545beb49d Add deobf-data to setup env.
MinecraftForge/FML@e24f949517 Fix eclipse workspaces and launch configurations.
MinecraftForge/FML@532bee7ce1 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:54:47 -07:00
LexManos
d5549d770d Fix bound texture in Controls screen, Closes #631 and #629 2013-07-01 23:35:03 -07:00
LexManos
f1dde02853 Deprecation sweep and update version to 8.9 to reflect 1.6.1 update. 2013-06-30 23:29:43 -07:00
LexManos
7c53448734 Update GuiIngameForge to reflect Mojang changes in 1.6.1 2013-06-30 22:32:11 -07:00
LexManos
ab1ddd99b6 1.6.1 Update 2013-06-30 19:43:27 -07:00
LexManos
63dfed9d83 Small fixup, need to Update GuiIngameForge for new HUD changes. 2013-06-30 18:13:01 -07:00
LexManos
d2144f274b Initial patch update to 1.6, Does not compile, need to update references to the old TexturePack system. 2013-06-30 05:50:11 -07:00
LexManos
7326f00a85 Update FML to 16launch branch 2013-06-30 05:29:49 -07:00
RedmenNL
2c9e11299e Added more render methods to IModelCustom interface. 2013-06-29 23:26:39 -06:00
MachineMuse
ca011729d3 Fixed both RenderAllExcept behaviours 2013-06-29 23:24:03 -06:00
MachineMuse
0f25e6ec6b Added tessellation methods to obj model, for ISBRH-friendliness 2013-06-29 04:35:57 -06:00
James
af2b5eb6f6 Add an InputStream constructor to WavefrontObject
It is said that Resource Packs will return InputStreams. And I like putting my models into texture packs which, obviously, give InputStreams rather than URLs.
2013-06-19 15:57:44 -06:00
LexManos
2bbb3ee0ca Disable ImageIO's File based cache, should speed up texturepack loading/stitching. 2013-06-08 12:20:49 -07:00
LexManos
5f750197ac Merge pull request #560 from jk-5/master
RenderGameOverlayEvent.Post ALL is not called in GuiIngameForge
2013-06-03 12:21:34 -07:00
King Lemming
6cd56ebed6 Forge Fluid System!
Signed-off-by: King Lemming <kinglemming@gmail.com>
2013-05-27 00:56:58 -04:00
LexManos
7143607620 Fixed render count for stacks of blocks 40+ and distrabution of items based on scale. Closes #579 2013-05-19 13:22:12 -07:00
LexManos
432023a9ba Fix another NPE when Items are in Block range with custom renderers, Modders keep your items out of the block range! Closes #581 2013-05-19 13:09:05 -07:00
Christian
eba92ad3f8 Fix blending on the hotbar. Closes #574 2013-05-15 20:51:24 -04:00
Christian
5ca854efa8 Add in a very simple stencil bit registry to try and arbitrate between mods wanting to use stencil bits in rendering 2013-05-15 20:29:47 -04:00
LexManos
55dac73d10 Fix NPE when rendering EntityItems that are not blocks but int he block range. 2013-05-13 21:04:55 -07:00
jampot5000
9873eee53a Make getStencilBits static
Made getStencilBits static so it can be called.
2013-05-11 16:58:02 +02:00
Jeffrey Kog
109d4ff134 RenderGameOverlayEvent.Post(ALL) is now called in GuiIngameForge 2013-05-09 14:27:59 +02:00