Commit Graph

182 Commits

Author SHA1 Message Date
LexManos a91a50cd9d Deprecated Forge's ISidedInventroy, there is a vanilla solution. Added temporary config option to legacy furnace slot orientation. 2013-03-08 19:16:48 -08:00
LexManos 9f8a07f7d8 Fix typos. 2013-03-08 18:57:00 -08:00
LexManos 2488ad2826 Updated to 1.5 Pre-release
Updated FML:
MinecraftForge/FML@2d98835db8 Scala support! It's still primitive, I hope that people will like it. I do :)
MinecraftForge/FML@5bfaf7c170 Global object registry, also, support the new itemblockwithmetadata constructor
MinecraftForge/FML@80a40c03e6 Update to MCP 1.5 and minecraft 1.5.
MinecraftForge/FML@b3e854a15d Update for new MCP with srg reobf.
2013-03-08 18:48:52 -08:00
LexManos 6b5a086be3 Readd second render pass to TileEntities and Entities, patches were missed when merging in master branch. As note, CB can DIAF. 2013-03-06 19:18:26 -08:00
Christian f5ba66068a let's do it right this time. Hmmm 2013-03-06 13:32:34 -05:00
Christian 101ae36f57 Call stitcher for non-existent textures as well. Probably allows
for generated textures. Hmmm
2013-03-06 10:29:25 -05:00
LexManos c2b610d335 Fix ItemSeedFood respecting custom soils. 2013-03-05 15:44:31 -08:00
LexManos 43a1bf1425 Removed erroring imports and update build function to die on errors. 2013-03-04 20:57:42 -08:00
LexManos 20db933cee New world event for controlling potential entity spawnlists. For #430 2013-03-04 20:29:05 -08:00
LexManos ebdc10eb1d Add callback on TextureStitched to control texture loading. 2013-03-04 19:36:19 -08:00
LexManos 2e947b364c Add helper functions for deling with custom TextureStitched 2013-03-04 18:55:15 -08:00
LexManos 88e44f0761 Fix animation location for textures with domains 2013-03-04 18:54:21 -08:00
Christian 59b8e5e93c Add in simple texture management for mods using the stitcher. Scope with "{domain}:{texture}" to
get textures that are not at /textures/<item|block>/{texture}.png but /mods/{domain}/textures/<item|block>/{texture}.png
instead
2013-03-03 14:11:31 -05:00
Christian 72e013fb66 Fix up patches for FML, also, add in FML as a submodule rather than a zip 2013-03-03 14:05:34 -05:00
LexManos 9bd8f2697c Updated Forge to s13w09c 2013-03-02 03:08:27 -08:00
LexManos ed55969932 Not supposed to have debug stuff... 2013-02-28 03:59:57 -08:00
LexManos a04e7912b0 Sync up with FML, Will not run nativly as you need deobfusication_data.zip in your libs folder.
We have not setup the download for that yet, to make it yourself just zip joined.srg name it deobfusication_data.zip and put it in lib
2013-02-28 03:53:42 -08:00
Christian 082ee1a5ea Merge branch 'master' into snapshot15
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.35.556-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
2013-02-27 23:19:11 -05:00
LexManos a766603b38 Merge commit '695b080197bd577cc34fe6dbc72b74f4a74b2d5c' into snapshot15
Testing cherry picking.
2013-02-27 00:57:35 -08:00
LexManos a520e128d7 Fix TESR culling for beacons, and implement a good enough measure for Chests. 2013-02-24 22:55:48 -08:00
LexManos f0ea9c9106 Store the glMultiTexCoord lightmap for later use with glDrawArrays closes #406 2013-02-23 13:50:12 -08:00
LexManos 3530e0d861 Added unload event for client worlds Closes #405 2013-02-23 13:41:43 -08:00
LexManos a7cdcc1f33 WorldGen*Trees shoud not respect custom soils. Closes #355 2013-02-23 13:07:00 -08:00
LexManos 0396ba2252 ItemStack sensitive versions of Item.getPotionEffect and Item.isPotionIngredient Closes #321 2013-02-23 12:02:36 -08:00
LexManos b754d6f301 Fix movement speed check, closes #420 2013-02-23 11:30:56 -08:00
LexManos 3945819851 Fixed entity colision above max world height, and below 0. Closes #400 2013-02-23 10:59:44 -08:00
LexManos d50f150c56 Disable automatic equiti of pcke dup items for players, and fixed index issues in Player.setCurrentItemOrArmor. 2013-02-23 10:42:33 -08:00
LexManos 307dd48229 Fix profiler issue with RenderGlobal patch. Closes #414 2013-02-15 04:56:55 -08:00
LexManos e11feec55f Fix fortune modifier always passed as 0 to idDropped closes #412 2013-02-15 04:49:33 -08:00
LexManos dcdd7c6c0e Fixes comparison for items in creative inventory, closes #411 2013-02-15 04:43:20 -08:00
LexManos ace8c29085 Added a hook into SlotArmor so Items can control if they are classified as a Armor type. Closes #408 2013-02-15 04:25:08 -08:00
Christian 6673844c54 Fix ServerBrand retriever- forge is now forge,fml!
Update FML: cd96718
cd96718 Fix HD mob skins, FINALLY!!! Stupid eyes are stupid.
2013-02-06 20:28:54 -05:00
Christian afea4fce1d Remove the single use interface ITickingArmor, and apply to Item directly. 2013-02-04 17:53:47 -05:00
Christian 40a3660c93 Fix possible null case for collision bounding box. 2013-02-04 13:58:55 -05:00
Christian 7e5a9076f0 Fix TESR rendering for double chests 2013-02-04 11:19:39 -05:00
Christian c5bb9fc78f Merge branch 'TESRculling' 2013-02-04 11:13:29 -05:00
Christian fbf9527be3 Add in "armor ticking"- implement the interface and the armor piece will tick.
Update FML:22dbe41
22dbe41 Fix up mistake that broke all modloading. Nice.
2013-02-04 11:07:53 -05:00
Christian fb46c7a01f Fix small derp in TE 2013-01-31 13:46:29 -05:00
Christian 0f3bd780e1 Merge branch 'master' into TESRculling 2013-01-29 10:01:00 -05:00
LexManos 1dc9ef9b08 Fix initalization issue with the clamping threshold config value. And remove vanilla console spam related to it. 2013-01-29 03:11:59 -08:00
LexManos 4299aa22ff Change WorldServer.allPlayersSleeping to public, and remove the SideOnly annotation on EntityPlayer.getSleepTimer() Closes #393 2013-01-28 18:12:29 -08:00
LexManos 6d6405973c Added catch to TileEntityChestRenderer for potential crash when modders do bad things -.- Closes #389 2013-01-28 18:05:38 -08:00
LexManos 704f879320 Rework canSilkHarvest hook to try and honor vanilla overrides, should close #391 2013-01-28 17:51:48 -08:00
Christian f06e0be5e5 We try and log a message if we detect a world leak: it's probably not infallible, but it should
help mod developers- if you see this when testing your mod with, say, mystcraft, you're probably
keeping a hold of an invalid handle to the World (either directly, or indirectly via Entity or TileEntity)
and you should look to refactor to wrap those handles in WeakReferences
2013-01-27 10:43:35 -05:00
Christian b386565881 Add in a mechanism for explicit subclassing of WeightedRandomChestItem to allow for
generational style chest content generation rather than static. Cleans up some old code nicely
2013-01-26 14:12:46 -05:00
Christian b164f9b21e Merge branch 'renderpass' of https://github.com/Chicken-Bones/MinecraftForge into TESRculling
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
	patches/minecraft/net/minecraft/entity/Entity.java.patch
	patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
2013-01-26 12:12:21 -05:00
Christian 70ca0eeb74 Add in TESR culling, and a new TileEntity method to allow for differential sizing of the
TESR view culling vs the TE collision bounding box (the former defaults to the latter)
Checked into a branch because it's likely to break expanded TileEntities.
2013-01-26 11:11:20 -05:00
Christian ae7e328228 Fix a potential problem with "Entity already added" when using the dormant
chunk cache capability. The entities in the dormant chunk cache will get new
IDs prior to the cached chunk returning.
2013-01-25 21:21:20 -05:00
Christian 78e192e28e Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.4.520-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
	patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch
	patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
	patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch
	patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
	patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch
	patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch
	patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch
	patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch
	patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch
	patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch
2013-01-22 17:28:28 -05:00
Christian 94eb5cc29b Fix a couple of forge patches
Update FML: d075daf
d075daf Merge branch 'master' into snapshot15 Fix up compilation and patching errors
1bd6847 Fix up packages.csv ordering for easier diffing
dd832f2 Update for MCP7.30c - fixes redstone rendering issues
aebf6eb Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definiti
8921cfe Remember to add the new patches!
cd67596 The "ServerStarting" event should now properly crash the server if it fails, so the client will properly exit. Also, added in a "pre-server
e1c6630 Javadoc cleanup
5ce4e31 Fix breaking change
a99c488 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
94282c5 Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
7ad8529 Update MCP to MCP7.26a and refresh MCP names
15534ed Update address of the FML repository to the new location in all the files
aa822e3 Fix logical error in comment text
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
0165742 Fix mcp conf md5 signatures for the snapshot
26a5b31 FMLLogFormatter: dynamic log level name
2013-01-22 17:03:33 -05:00