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

329 commits

Author SHA1 Message Date
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
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
40392216b3 Change access of upper and lower chest fields of InventoryLargeChest to public. Closes #387 2013-01-28 18:08:38 -08:00
LexManos
fb87773c3a Added input getters for Ore recipies, and javadoc warning for modders, #390 2013-01-28 17:33:53 -08:00
LexManos
c58433692c Add DimensionManager.unregisterProviderType for PR #388 2013-01-28 17:26:02 -08:00
LexManos
fbe86287b4 Fixup a resource leak warning. 2013-01-28 17:06:45 -08:00
LexManos
89e695cee9 Forge Additions: Exposed ChunkCache.worldObj to public PR #383 2013-01-28 17:02:31 -08:00
LexManos
30db577389 Moved warning logic down, so that no more tickets are isues if the mod is over it's alotment. Fixes #378 2013-01-28 16:36:03 -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
c483f68b26 Bump the revision number for the TESR and renderpass changes 2013-01-26 12:35:01 -05:00
Christian
695b080197 Fix NPE causing issue with the cache. Derpy derp. 2013-01-26 10:24:48 -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
f20ea649c6 Attempt to fix a possible NPE in the face of ChickenBones' hackery. ChickenBones. stop it! 2013-01-23 23:36:59 -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
a5325cf0a8 Change DimensionManager.getCurrentSaveRootDirectory() to try and work even for the new server about to start event 
Update FML:8921cfe
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. A
 2013-01-22 10:07:41 -05:00
Christian
c40c81924a Some javadoc fixes 2013-01-21 21:57:48 -05:00
Christian
a1e57c068e Add in patch to change how playerinstance sends TE chunk updates. It should always send just the TEs 
that changed now, and not "ALL" TEs. Also, added configuration value to change the 64 threshold to a
configurable number
 2013-01-20 18:47:04 -05:00
Christian
fe2d3244d7 Update licencing information to make clear that forge is allowed to redistribute and automatically 
download parts of MCP, but this permission is not transitive to people distributing MinecraftForge
source independently of the MinecraftForge project.

Update MCP to 7.26a and FML: 7ad8529
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
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
 2013-01-20 10:58:07 -05:00
LexManos
875709931c Bump major and minor version numbers to mark 1.5, it's gunna break everything. Should be a compileable 1.5 build. 2013-01-12 20:44:31 -08:00
LexManos
1155235d92 Fix check in getItem() to allow lowest item ID #361 2013-01-12 16:30:08 -08:00
CovertJaguar
46394174c5 MCL Update 2013-01-12 11:10:39 -08:00
LexManos
ea57a46227 Removed some dead code, We don't bind custom tessellators 2013-01-12 05:24:16 -08:00
LexManos
4ea34fe6af First patches updae to 1.5, Many rendeirng related changes, most notibly removed Item/Block's getTextureFile() functions. 2013-01-12 05:12:10 -08:00
LexManos
c229018c9e Updated FML and at config for 1.5 snapshot 2013-01-12 00:06:37 -08:00
LexManos
3a9c7b4532 Added event hooks to control to allow mod control of mob spawning. PR: #337 
Deprecated LivingSpecialSpawnEvent in favor of new LivingSpawnEvent.SpecialSpawn
 2013-01-01 22:20:30 -08:00
LexManos
170585960b Some small code cleanups. 2013-01-01 20:57:45 -08:00
LexManos
c96b923e1c Fixed issue where ChunkPriderEvent.InitNoiseField used the wrong sizeY value. 2013-01-01 20:55:37 -08:00
LexManos
9fe0b4dfba Fix issue where dungeon loot table had wrong values. 2013-01-01 20:54:55 -08:00
Christian
e2dc263f12 Fix noisy exception logging 2012-12-30 21:30:48 -05:00
Christian
19347c5322 Update for MC 1.4.7 
Update FML: f7cc50b
 2012-12-28 12:06:56 -05:00
LexManos
46440588fe Fix mobs spawning on inverted slabs/stairs. 2012-12-27 13:50:13 -08:00
LexManos
91c8ca5379 Fixed typo in dungeon loot 2012-12-25 22:03:11 -08:00
LexManos
263e919384 Fixed issue with Efficancy enchatment when connected to vanilla servers. 2012-12-25 22:02:30 -08:00
Uristqwerty
09ab39a238 Force parent ListenerListInsts to rebuild. 
Without this change, it is possible (and, in fact, nearly guaranteed) for lists to rebuild endlessly if a parent list is marked as needing a rebuild but never actually read. This change forces the parent list(s) to rebuild as well, resulting in a significant performance increase and smoother framerate due to greatly reduced GC activity.
 2012-12-24 20:40:09 -05:00
LexManos
e34e3a44fe Fixed parameter ordering u.u 2012-12-24 01:39:08 -08:00
LexManos
e78b825875 Re-write/Deprecated DungeonHooks loot tables, now uses ChestGenHooks like the rest of the world gen. Also fixes issue #330 by adding in enchanted books. 
Should be API compatible.
 2012-12-24 01:29:33 -08:00
Christian
3ee114c9b4 Some access transformations to allow mystcraft to work again. Closes #331 2012-12-23 15:32:25 -05:00
Christian
71fc299ac7 OK. AT the right thing, and add in a call to always get the right thing. Clean up patch fuzz too. 2012-12-20 08:48:14 -05:00
Christian
a085a9c95e Access Transform a couple of methods 2012-12-20 08:25:39 -05:00
LexManos
09505c636c Fixe BiomeDecorator AT entry. 2012-12-19 13:42:22 -08:00
Christian
d8dda4c2fd And fix up the other equals 2012-12-18 18:12:22 -05:00
Christian
c976aae00c Fix comparing ItemStack tags for equality 2012-12-18 18:02:41 -05:00
Christian
0b9727305e Fix accidentally removed not-deprecated methods. 
Update FML: d604e44
d604e44 InterModComms now supports a runtime polling based model for inter-mod comms at runtime. Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
8b7778c Don't be as alarming about item overwrites.
 2012-12-18 14:17:56 -05:00
LexManos
d6c4f37eb5 Fixed items dieing improperly due to new EntityItem sync changes, also made items render offset when rendered in 3d. 2012-12-18 06:56:28 -08:00
LexManos
9833c5652c Removed all functions marked as deperacted for the new MC version 2012-12-18 05:28:09 -08:00
LexManos
a2f4a0d2dd Inital update to 1.4.6, Version bumped to 6.5 2012-12-17 22:33:28 -08:00
LexManos
a4c790c969 Update AT for repackage 2012-12-12 23:46:01 -08:00
LexManos
e7008ae750 Manual import fixes 2012-12-12 23:27:57 -08:00
LexManos
061ab81041 Automatically resolved imports. 2012-12-12 21:58:35 -08:00
LexManos
52e87dd165 Bump version to 6.4.2 to mark the merge of TerrainGen branch. 2012-12-12 18:34:16 -08:00
Christian
3ed793bce5 Merge branch 'terraingen' 2012-12-12 21:13:20 -05:00