Commit graph

4756 commits

Author SHA1 Message Date
Christian
54b3654eaa Updated FML:
MinecraftForge/FML@cf9b5b445b Don't leave scala running in interactive mode.
2013-04-23 23:37:56 -04:00
Christian
2c7c944e96 Don't leave scala running in interactive mode. 2013-04-23 22:56:18 -04:00
Christian
b483c7ee74 Updated FML:
MinecraftForge/FML@aa200923f0 Fix patch derp.
2013-04-23 22:51:28 -04:00
LexManos
74e9b293e1 Fix patch derp. 2013-04-23 19:47:43 -07:00
Christian
e50fb10bff Updated FML:
MinecraftForge/FML@ddadf93ca1 Fix when an old scalac is present on the system to not fail the build
2013-04-23 22:44:35 -04:00
Christian
5a81b37bcf Fix when an old scalac is present on the system to not fail the build 2013-04-23 22:43:51 -04:00
LexManos
15ffb962e4 Fix rotation issue with non-block items. 2013-04-23 19:05:35 -07:00
Christian
b56d05ef9d ItemStack delegation to Item for damage values. 2013-04-23 19:05:11 -04:00
Christian
7aa91ca635 Try and be less noisy about world leaks 2013-04-23 07:51:07 -04:00
Christian
10f1028a8f Updated FML:
MinecraftForge/FML@cfda7fc738 Fix URL for MCP
MinecraftForge/FML@781c681216 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.
2013-04-23 07:41:45 -04:00
Christian
cee176eb96 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP. 2013-04-23 07:40:49 -04:00
Christian
e97834b433 Fix URL for MCP 2013-04-23 07:22:25 -04:00
Christian
95c144dcf0 Updated FML:
MinecraftForge/FML@dcf069ca52 Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
MinecraftForge/FML@58ba24add2 Fix possible NPEs in GameData
2013-04-22 21:15:04 -04:00
Christian
4d442ac219 Fix possible NPEs in GameData 2013-04-22 21:14:34 -04:00
Christian
8974a78c0a Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes. 2013-04-22 21:14:34 -04:00
richardg867
f3caada13a Complete it, got the bug figured out 2013-04-22 13:08:59 -03:00
richardg867
27d922d470 Techne model loader (incomplete for debugging) 2013-04-21 21:32:23 -03:00
Christian
6e2d06c950 Add forge/FML data to the f3 screen. 2013-04-21 16:54:11 -04:00
Christian
de8a4c8855 Updated FML:
MinecraftForge/FML@a3b5eaacfd Fix a small modloader compatibility derp: closes #222
MinecraftForge/FML@677a6e578e Fix scala supporting SidedProxy. It should work now.
MinecraftForge/FML@334a76de75 Update FMLDeobfuscatingRemapper.java
MinecraftForge/FML@42f1d87955 Merge pull request #224 from Glought/master
MinecraftForge/FML@2dcabe0123 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
MinecraftForge/FML@11ac46daeb Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code: MyBlock myBlock = new MyBlock(); GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock"); where MyBlockItem class has one constructor with signature: public MyBlockItem(int id, Block block)
MinecraftForge/FML@c3fda11d10 Merge pull request #225 from MarcinSc/master
2013-04-21 16:43:24 -04:00
cpw
d15889075c Merge pull request #225 from MarcinSc/master
Suggested fix for issue 221
2013-04-21 11:32:51 -07:00
Marcin Sciesinski
bdee7e3c5b Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code:
MyBlock myBlock = new MyBlock();
GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock");
where MyBlockItem class has one constructor with signature:
public MyBlockItem(int id, Block block)
2013-04-21 19:01:18 +01:00
Christian
0512525c58 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data 2013-04-21 13:58:18 -04:00
LexManos
c0d7e23c8d Merge remote-tracking branch 'refs/remotes/origin/GuiIngame'
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-04-21 10:42:17 -07:00
cpw
76ffd19bc5 Merge pull request #224 from Glought/master
Fix for  Issue #223
2013-04-21 08:13:54 -07:00
Glought
074d7c2ec7 Update FMLDeobfuscatingRemapper.java
Fixes a "Type mismath:cannot convert from element type Object to FieldNode" error at line 176.
2013-04-21 05:09:19 -07:00
LexManos
960eaf99ef Allow spawning of Bonemeal particles even if block is not set. 2013-04-21 00:15:02 -07:00
Christian
3446f1ce26 Fix scala supporting SidedProxy. It should work now. 2013-04-20 23:31:22 -04:00
Christian
6c0bb61425 Fix a small modloader compatibility derp: closes #222 2013-04-20 22:55:56 -04:00
LexManos
c998db6a86 Restore world unload event for client worlds Closes #531 2013-04-20 11:25:16 -07:00
LexManos
06727b965e Fix replaceable checks to work on blocks with a non-replacable material, Closes #532 2013-04-20 11:19:05 -07:00
LexManos
13ff75bd9c Fix the BLOCK_3D render helper for items that aren't an instance of ItemBlock Closes #533 2013-04-20 11:12:35 -07:00
LexManos
2d84dcd44e Fix logic issue in CrashReportCategory patch, blame Jadedcat for sloppy quick patch. 2013-04-19 22:08:07 -07:00
LexManos
74742fd12f Merge pull request #530 from Azanor/master
Fix for BiomeDictionary.getTypesForBiome throwing a ClassCastException when called.
2013-04-19 10:52:30 -07:00
Azanor
4b2aca2124 getBiomesForType will cause the same problem 2013-04-19 14:29:07 +03:00
Azanor
09dd117d1d Fix for ClassCastException when attempting to fetch Biome types from BiomeDictionary
Attempting to fetch the BiomeDictionary types linked to a biome throws a ClassCastException. This fixes that
2013-04-19 14:08:53 +03:00
Christian
cf90eb37f7 Simple block recolouring API: closes #525
Fix up documentation on "rotation" API: it is up to the mod to decide interpretation of "rotation" for the mod/block.
2013-04-18 17:21:26 -04:00
Christian
cb9e944257 Updated FML:
MinecraftForge/FML@b3d4ea05ec Fix possible NPE in findItemStack, closes #218
2013-04-18 16:39:11 -04:00
LexManos
cb4a073f5d Adds a field to the player for maximum health. Player.dat additions are present, getMaxHealth() needs a magic number for spawning. Closes #527 2013-04-17 19:16:34 -07:00
LexManos
a0891d74a0 Fix return value of EnchantPower hook, closes #518 2013-04-17 19:08:50 -07:00
LexManos
11115d5f3a Forge now takes control of GuiIngame's renderGameOverlay, and spits out a ton of events to give modders control of how the screen is rendered.
Inital draft for community feedback.
2013-04-17 18:55:06 -07:00
LexManos
d3a2243799 New hook to allow Items to render Helmet overlays like pumpkins do. 2013-04-17 14:03:59 -07:00
Christian
e204d580a8 Fix possible NPE in findItemStack, closes #218 2013-04-17 07:55:33 -04:00
Christian
718e9b3756 Updated FML:
MinecraftForge/FML@394f424185 Fix to output versions in crash logs
MinecraftForge/FML@8f35adca7a Use more expressive language when a version specifier is a simple unbounded above condition
2013-04-16 13:57:46 -04:00
Christian
3d142df102 Use more expressive language when a version specifier is a simple unbounded above condition 2013-04-16 13:46:55 -04:00
Christian
0888a95f2d Fix to output versions in crash logs 2013-04-16 13:46:55 -04:00
Christian
588bc8c865 Updated FML:
MinecraftForge/FML@5673c1dd29 Add srgname to registerTileEntityWithAlternatives
MinecraftForge/FML@7aea09f4ca Add type info to properly deobfuscate overloaded fields. Fixes #210.
MinecraftForge/FML@edffd04ed2 Add in some caching of the read field descriptions for efficiency
MinecraftForge/FML@0daf1a6df4 Merge branch 'agaricusb-fix-deobf-field'
MinecraftForge/FML@ada52078c7 Merge pull request #216 from agaricusb/add-srgname
2013-04-15 19:06:41 -04:00
cpw
470070e2ce Merge pull request #216 from agaricusb/add-srgname
Add srgname to registerTileEntityWithAlternatives
2013-04-15 15:50:47 -07:00
Christian
3020daf42d Merge branch 'agaricusb-fix-deobf-field' 2013-04-15 17:31:09 -04:00
Christian
1a9cb9e3c9 Add in some caching of the read field descriptions for efficiency 2013-04-15 17:30:35 -04:00
LexManos
4bd7d4f3d9 Merge pull request #521 from ProgrammerHero/master
Fixed a bug that prevented proper lava generation near bedrock
2013-04-15 10:17:01 -07:00