Commit Graph
7785 Commits
Author SHA1 Message Date
Florian Nücke a14c627cd7 Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e.
object C {
  @SidedProxy(...)
  var proxy: P = null
}
Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
2013-05-08 19:04:35 +02:00
Florian Nücke 283dfb6e7d Alternative @SidedProxy setter for Scala. 2013-05-08 05:36:28 +02:00
LexManos 0444cc063c Merge pull request #557 from pahimar/master
Expose the EntityLiving's combat tracker
2013-05-06 19:13:16 -07:00
LexManos c5c44c2de4 Merge pull request #556 from micdoodle8/master
Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types
2013-05-06 19:08:21 -07:00
pahimar da49e2fb45 Update forge_at.cfg 2013-05-06 14:23:41 -03:00
LexManos 2444a80bef Capture and fire the PlaySoundAtEntity event for The client entity. Minecraft does some odd bypasses for no good reason. Thanks iPixile for reporting this. 2013-05-04 17:39:10 -07:00
micdoodle8 b28910e722 Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types 2013-05-04 16:59:47 -04:00
LexManos 3fdbc02c54 Updated FML:
MinecraftForge/FML@99bb50d8f8 Improved Entity Spawn Error
MinecraftForge/FML@c0cca7f41d Merge pull request #227 from CovertJaguar/patch-1
MinecraftForge/FML@49111e9c5c Add version detection to astyle and print error if it doesnt detect version 2.0+
 Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:39:08 -07:00
LexManos 4db40c7861 Add version detection to astyle and print error if it doesnt detect version 2.0+
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:26:27 -07:00
LexManos 408ced2ea2 Merge remote-tracking branch 'refs/remotes/origin/1.5.2'
Conflicts:
	common/net/minecraftforge/common/ForgeVersion.java
2013-05-02 09:06:36 -07:00
LexManos cd40aba38e Bump version number for 1.5.2 2013-05-02 09:02:26 -07:00
LexManos 46a369e932 Merge pull request #550 from cadyyan/master
Build Script Error Handling Error
2013-04-30 20:20:52 -07:00
cpw 3d5658b90f Merge pull request #227 from CovertJaguar/patch-1
Improved Entity Spawn Error
2013-04-29 22:10:53 -07:00
CovertJaguar ce99b80932 Improved Entity Spawn Error 2013-04-29 20:41:20 -07:00
James Durand a5cc807dcd Fixed build error handling using invalid Python syntax. 2013-04-29 11:18:05 -05:00
LexManos 3242904b36 Fixed hardcoding of MC version in debug text. 2013-04-28 17:10:16 -07:00
LexManos 24f2fb1f6a Updated FML:
MinecraftForge/FML@00f00b17bf Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
2013-04-28 16:57:19 -07:00
LexManos 42564b3988 Fix scalac detection to actually use the located command instead of defaulting to 'scalac' 2013-04-28 16:35:23 -07:00
LexManos 784e23668b Changelog generator will now bundle failed builds with the next successful build. Should make it look better and prevent the version numbers from being confusing. 2013-04-28 15:35:14 -07:00
LexManos a6b8055c44 Bump version to 7.7.2 so I can make a release. 2013-04-28 14:21:33 -07:00
LexManos 2c05258205 Update to 1.5.2 PR.
MinecraftForge/FML@f0bba74a47 Update for minecraft 1.5.2
MinecraftForge/FML@62fdbad74c Update MCP's md5 for the fixed srg files.
2013-04-28 13:28:40 -07:00
LexManos bff831ce8d Update MCP's md5 for the fixed srg files. 2013-04-28 12:33:42 -07:00
Christian 3baad0a897 Update for minecraft 1.5.2 2013-04-27 01:24:06 -04:00
LexManos cffaef6e0f Merge pull request #543 from Chimaine/master
Fix unregistering of event listener
2013-04-26 13:07:06 -07:00
Chimaine 3061fd6db6 Replaced derpy tabs with spaces 2013-04-26 21:53:09 +02:00
Chimaine 4b4f5a07a5 Fixed ListenerListInst not being rebuild after unregistering a listener, causing calls to unregistered event listeners. 2013-04-26 12:45:45 +02:00
cpw cb14e29cdb Merge pull request #542 from KingLemming/master
OreDictionary additions + ItemStack maxDamage hook
2013-04-25 18:46:06 -07:00
King Lemming b8a17e2748 -Add vanilla Ores to the Ore Dictionary. No recipe replacement required.
-Add NBT-sensitive getMaxDamage() for ItemStack.

Signed-off-by: King Lemming <[email protected]>
2013-04-25 21:36:51 -04:00
LexManos 4da2992df5 Attempted a fix for the changelog generation, should print all builds back to 1 now. 2013-04-24 10:49:33 -07:00
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