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

280 commits

Author SHA1 Message Date
Krapht
6fe6912456 made BlockFluid.theIcon protected 2013-03-28 08:07:09 -04:00
Christian
7cfb28fecb Fix hashCode 2013-03-27 19:27:00 -04:00
Christian
91cecec28a Use the liquid name in liquid stack persistence. Closes #429 2013-03-27 19:09:57 -04:00
LexManos
2d08490a27 Bump version number for 1.5.1 Note: We really need to do this more... 2013-03-26 20:49:44 -07:00
LexManos
9bb558078b Fixed issue with Event.hasAnnotation ignoring it's parameter. And cached its values for potential performance gain. Closes #482 2013-03-26 10:38:55 -07:00
Christian
300f471c57 Merge branch 'mithionchanges' of github.com:Mithion/MinecraftForge into mithionchanges 
Fix up code for minecraftforge style. Clean up patches.

Conflicts:
	common/forge_at.cfg
	patches/minecraft/net/minecraft/block/Block.java.patch
 2013-03-23 16:56:01 -04:00
Mithion
e13dff305e Ender Teleport Changes 
Renamed Ender Teleport Event and added it in to ender pearls.
 2013-03-23 14:12:42 -04:00
Mithion
4de9793ec9 Enderman Teleport Event 
New event when an enderman teleports that allows the teleport location
to either be modified or completely cancelled.
 2013-03-23 12:59:06 -04:00
Mithion
833e9f0c88 Access Transformer Changes 
AT changes and corresponding class changes.
Additions (all made public):
EntityLiving.targetTasks
PotionHelper.potionRequirements
PotionHelper.potionAmplifiers
PotionEffect.duration
Potion.setIconIndex
Item.setPotionEffect
Block.blockHardness
Block.blockResistance
 2013-03-23 12:58:24 -04:00
Christian
4de9140a34 Add in block rotation support. It supports most vanilla blocks (hopefully), logs should be added soon. 2013-03-23 11:56:58 -04:00
Christian
baf43da9a0 Fix AT config for texturemap 2013-03-22 16:54:42 -04:00
Mithion
ee6dce2390 Player Flyable Fall Event 
Adds an event to EntityPlayer that is posted on player fall when the
player has flight capabilities.
 2013-03-22 15:05:58 -04:00
Mithion
fa2cbe2671 Brewing Stand Changes 
Added an event on potion ingredient applied.  Event contains the item
stacks of each of the potions being brewed as well as any remaining
ingredients.

Changed TileEntityBrewingStand and SlotBrewingStandPotion to look for
instanceof ItemPotion rather than potion.itemID
 2013-03-22 15:05:23 -04:00
Mithion
2a76f7740e Entity Extended Properties Changes 
Adds IExtendedEntityProperties interface, which specifies three methods
that are needed:  Init, Save, and Load.

Adds the EntityConstructing event, which is called during the
constructor of Entity.  It is needed there so that the reference is in
place during the ReadNBT call.

Adds hooks into Entity that allow registration of
IExtendedEntityProperties classes, as well as saving and loading to NBT.
 2013-03-22 15:04:00 -04:00
LexManos
3d9629013b Update to 1.5.1 Pre-Release: 
MinecraftForge/FML@9565529baf Updated to latest MCP and Minecraft 1.5.1 Pre-release.
MinecraftForge/FML@a573faf92d Someone derped up this function bad, revert name.
 2013-03-19 18:09:48 -07:00
LexManos
2395699afd New TextureStitchEvents called before and after a TextureMap gathers and stitches textures together. 
Also added a config option to diable the writing of resulting stitched textures to disc. Default disables the writing.
 2013-03-17 20:07:30 -07:00
LepkoQQ
f1b32126c5 Fix ShapedOreRecipe checking mirrored recipes 2013-03-16 11:57:11 +01:00
LexManos
304421a4c9 Merge pull request #459 from ChildWalrus/sleep 
Made some sleep-related fields public to allow fixing of sleeping bug in new dimensions
 2013-03-15 21:32:30 -07:00
ChildWalrus
3e6ca3a740 Made WorldServer.allPlayersSleeping public 
Made EntityPlayer.sleepTimer public

Sleep changes
 2013-03-15 21:54:06 +00:00
Corax
de0910b4fb Update ForgeDummyContainer.java 2013-03-14 10:02:17 +01:00
LexManos
62cb053d5f Add config toggle to atempt to remove TileEntities and Entities that error during there update without fully crashing the server, use at your own risk. Closes #424 2013-03-13 12:20:57 -07:00
LexManos
c471a9a557 Deprecation Sweep in DungeonHooks and fixed wildcard in ChestGenHooks remove function. 2013-03-13 10:55:08 -07:00
LexManos
ff0340f5b4 Fix missed wildcard change in OreDictionary closes #448 2013-03-12 19:44:47 -07:00
LexManos
31b908473d Fix crash when EnumHelper can't find $VALUES field, log info, and return gracefully. 2013-03-12 18:42:43 -07:00
Christian
83d4be5a05 Some tweaks to the liquid dictionary, to allow for canonical liquid stacks for things like rendering 2013-03-12 20:33:50 -04:00
Christian
529062d73f Fix the oredictionary for the new recipe wildcard value of Short.MAX_VALUE. 2013-03-11 17:43:23 -04:00
LexManos
9a72d50dec Early define CrashReport classes to combat invalid crash details. 2013-03-08 20:31:37 -08:00
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
Christian
88c7b12ba3 Clean up Access Transformer mapping data 2013-03-07 19:44:26 -05:00
Christian
e5913fb29f Add an Icon to the LiquidStack, for rendering the liquid in various ways 2013-03-06 20:54:24 -05: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
16475908be Rework configuration, configs should now use Config.hasChanged to deterne if thehould call save(), also re-worked the saving to not use String.format as much. 2013-03-04 16:33:52 -08:00
LexManos
9bd8f2697c Updated Forge to s13w09c 2013-03-02 03:08:27 -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
a0bc6a3ed0 Bump version to 6.6.2, declaring Forge for MC 1.4.7 feature complete, as 1.5 is on the horizon, only bug fixes from this point on. Unless something major happens on Mojang's end. 2013-02-23 14:20:49 -08:00
LexManos
0f696c3739 Add water and lava to liquid dictionary by default, closes #419 2013-02-23 13:53:05 -08:00
LexManos
f703dbb230 clarify what the size is measured in for the dormant chunk cache. -.- 2013-02-23 11:51:16 -08:00
LexManos
d9ebd3fb53 Change usage of ketSet/get to entrySet in OreDictionary, closes #422 2013-02-23 11:22:01 -08:00
LexManos
183b3e6316 Fix EventTransformer throwing an NPE when transforming a class that doesn't exist. Closes #413 2013-02-15 04:53:56 -08:00
LexManos
0a2e78d0c6 Made LiquidStack.isLiquidEqual(ItemStack) properly check the contained liquid, in addition to obvious id/meta closes #399 and closes #403 2013-02-15 04:00:46 -08:00
LexManos
57b77ce17e Actually use the line parameter in ServerChatEvent, closes #401 2013-02-15 03:22:59 -08:00
LexManos
f1987359c9 Kill generated timestamp in config files, if you want to retreive this information, usethe file's modified time. Closes #404 2013-02-15 03:18:36 -08:00
Christian
afea4fce1d Remove the single use interface ITickingArmor, and apply to Item directly. 2013-02-04 17:53:47 -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
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