Commit Graph

365 Commits

Author SHA1 Message Date
cpw 5c5cf3e7e7 Fix formatting error in PR 2013-07-28 19:15:00 +02:00
cpw 94045ea73e Merge pull request #695 from tommy1019/master
Fluid Rendering Fixes
2013-07-28 02:17:16 -07:00
tommy1019 e15c596e42 Fluid Rendering Fixes 2013-07-27 20:32:21 -05:00
cpw b317d10ade Add a translation map for looking up legacy liquid names to convert
to new fluid names.
2013-07-28 01:06:16 +02:00
cpw 31bd8d438d Add support for loading legacy liquid stacks as new fluid stacks.
Requires having been written with the "liquidname" code from forge 1.5.x
2013-07-28 00:53:23 +02:00
cpw 8b78f21199 Merge branch 'master' of github.com:tommy1019/MinecraftForge into miscchanges 2013-07-27 23:59:51 +02:00
cpw 8a8f5af084 Fix names for water/lava fluids. Closes #689 2013-07-27 23:37:06 +02:00
tommy1019 077e05e0ed Fixed fluids eating each other
Fluids check for other fluids density before flowing, if their density
is higher they can flow into the other fluid, if not they can't.
2013-07-26 16:25:40 -05:00
tommy1019 a42369e081 Fluid Render Fix
Formatting
2013-07-25 18:38:29 -05:00
LexManos b6d543f15e Re-added deprecated liquids system. To be removed next major MC versions after issues with Fluids are fixed. (reverse-merged from commit 9b5208fa30)
This WILL be removed and should not be developed against aside for a temporary 1.6 release.
2013-07-22 15:19:35 -07:00
LexManos acb6777ab5 General code cleanup of Fluid system. Made Fluid icons and associated functions non-sided. 2013-07-16 21:40:49 -07:00
Christian a990c0bdc8 Remove forge ISidedInventory, deprecated since 1.5. 2013-07-09 11:38:54 -04:00
LexManos 29fabb12e0 Proper return for getRegisteredFluidContainerData thanks Soaryn. Ref issue #634 2013-07-08 18:54:03 -07:00
LexManos 51ca5e028b Bump version to 9.10 for new MC version and removal of Fluids. 2013-07-07 14:05:48 -07:00
LexManos 9b5208fa30 Remove deprecated Liquids API, Use new Fluids system as replacement. 2013-07-07 14:05:23 -07:00
LexManos e9f1c83ff8 Mark old liquid system as deperated to be removed next Minecraft release. 2013-07-04 12:39:49 -07:00
Christian 1169ba9efb Merge branch 'master' into newliquid 2013-07-04 12:07:32 -07:00
LexManos 83504eb2e1 Merge pull request #600 from Lunatrius/rotation
Added rotation support for all vanilla blocks that can be rotated.
2013-07-03 20:16:25 -07:00
LexManos 125b134d87 Updated FML:
MinecraftForge/FML@155e846818 Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
MinecraftForge/FML@3f4bf61ae6 Update key
MinecraftForge/FML@4545beb49d Add deobf-data to setup env.
MinecraftForge/FML@e24f949517 Fix eclipse workspaces and launch configurations.
MinecraftForge/FML@532bee7ce1 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:54:47 -07:00
LexManos 2b61ea417b Update ChestGenHooks for new Dungeon chest strcture. 2013-07-02 02:37:05 -07:00
LexManos b0520f3656 Update filler block to prevent useless console warning. 2013-07-02 02:04:28 -07:00
LexManos e156ec2940 Update ToolMaterial enum helper. 2013-07-01 21:41:47 -07:00
LexManos f1dde02853 Deprecation sweep and update version to 8.9 to reflect 1.6.1 update. 2013-06-30 23:29:43 -07:00
LexManos 63dfed9d83 Small fixup, need to Update GuiIngameForge for new HUD changes. 2013-06-30 18:13:01 -07:00
LexManos d2144f274b Initial patch update to 1.6, Does not compile, need to update references to the old TexturePack system. 2013-06-30 05:50:11 -07:00
LexManos 7326f00a85 Update FML to 16launch branch 2013-06-30 05:29:49 -07:00
Ross Swartz b207111c50 Update OreDictionary.java 2013-06-17 19:09:40 -03:00
LexManos 1173e9074d Bump Forge revision and mark recomended. 2013-06-15 00:19:35 -07:00
LexManos 0ec313abb1 Added EntityLiving to Block.isLadder arguments, deperacating older version. New parameter has the possibility of being null, so modders must take care. Closes #608 2013-06-14 11:51:28 -07:00
Ross Swartz 05b2a19bac Add stone and cobblestone to Ore Dictionary 2013-06-11 23:58:05 -03:00
Lunatrius 0c308a5f07 Added rotation support for all vanilla blocks that can be rotated. 2013-06-08 21:35:42 +02:00
LexManos cea0edfdb1 Ignore registration of a object that is already registered. Preventing duplicate callback invocations. Thanks King_Lemming for pointing this out. 2013-06-02 21:44:34 -07:00
LexManos 0e571eeb19 Add cache for ASM Event Handler bridge classes, should not need to redefine a class to invoke the same method on different instances. 2013-06-02 21:27:09 -07:00
Christian 50992f2112 Merge branch 'master' of github.com:KingLemming/MinecraftForge into newliquid
Conflicts:
	common/net/minecraftforge/common/network/ForgePacket.java
2013-05-27 18:16:24 -04:00
King Lemming 6cd56ebed6 Forge Fluid System!
Signed-off-by: King Lemming <kinglemming@gmail.com>
2013-05-27 00:56:58 -04:00
LexManos e27de47090 Cleanup Dimension Registration packet, generate takes no arguments, and added fix to world to prevent providers from overwriting the dimension ID. 2013-05-23 22:06:13 -07:00
bloodshot 659a837fb0 Add support for servers to register dimensions on client.
In order to support multi-worlds such as MultiVerse, the server needs the
ability to register dimensions on client or many forge mods such as IC2
will not function correctly. This has been an issue for MCPC which
provides both Forge and Bukkit support to players. By adding the
DimensionRegisterPacket class, MCPC now has the ability to send the
required packet to client to register a dimension with DimensionManager.
2013-05-23 15:26:21 -04:00
LexManos 276929901f Introduced the framework for Forge's packet handler system. Heavily based off FMLPacket.
Packet splitting and reconstruction is handled.
2013-05-21 20:13:26 -07:00
Christian 75e99e2150 Add forge network handling support
Updated FML:
MinecraftForge/FML@4922e90d81 Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:50:59 -04:00
LexManos 0f36b52d7d Merge pull request #563 from Asajz/master
Default Quartz Ore Dictionary
2013-05-13 21:23:46 -07:00
CovertJaguar a88692a0f2 Possible NPE if the liquid isn't in the LD
https://github.com/BuildCraft/BuildCraft/issues/787
2013-05-11 04:27:52 -06:00
Asajz c6a1db22ff Added oreQuartz
Gives a default quartz Ore Dictionary (I know of at least 3 used by different mods that use Nether Quartz as an equivalent).
2013-05-10 16:29:58 -05:00
LexManos cd40aba38e Bump version number for 1.5.2 2013-05-02 09:02:26 -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
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 <kinglemming@gmail.com>
2013-04-25 21:36:51 -04:00
Christian 7aa91ca635 Try and be less noisy about world leaks 2013-04-23 07:51:07 -04: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
LexManos a0891d74a0 Fix return value of EnchantPower hook, closes #518 2013-04-17 19:08:50 -07:00
LexManos cb67c72cd7 Added a small method in the Block.java to specify the amount of enchanting power it can supply to an enchanting table. Closes #508 2013-04-10 16:56:31 -07:00
LexManos b66d3b6b0f Added NBT data to liquid stacks. Closes #501 2013-04-10 16:44:31 -07:00
Christian 7c6468a9ea Update MCP names to recent published names
Updated FML:
MinecraftForge/FML@1774e2bf30 MCP names update
2013-04-10 18:30:25 -04:00
LexManos f05b27c27d Deprecate long dead interface that moved to FML. remvoe next MC version. 2013-04-10 18:30:24 -04:00
Tarion 9b58fb9384 Clarify Factory call and Event Functionality 2013-04-10 18:30:24 -04:00
Tarion aa202878e2 Added maxCanSpawnInChunk event to allow overriding of creature chunk spawn cap 2013-04-10 18:30:24 -04:00
LexManos a44bd6dadf Add function to remove categories from a configuration, indavidual properties can be removed using ConfigCategory.remove() Closes #462 2013-04-04 18:09:01 -07:00
LexManos 814123a973 Pulled Biome Tag System by Emasher, Closes #433
An issue with biome adding mods which is becoming increasingly annoying for players, is that many mod authors that add biome specific world generation or mobs in their mods, for the most part, hard code them to work with vanilla biomes only. This becomes a huge problem when it's difficult to even find a vanilla biome, let alone a specific one, when biome mods are installed.

A simple solution to this problem is a tag system for biomes that allows mod authors to set up their world generators, or mobs to generate or spawn in biomes that have been registered with a specific tag such as "FOREST", or "FROZEN". I wrote such a system a few months ago, which I've been using with my own mods, and have made available to anyone who wants to use it. Since then, I've had requests from mod authors and players alike to try and get it, or at least similar functionality, into Forge, where other mod authors will be more comfortable using it.

Aside from the tags, it also includes a rule based system to classify biomes that have not already been registered with it when information is requested on them (You can opt out of this by registering a biome as type "NULL"). And additionally, the ability to register IWorldGenerators for specific biomes, or biome types (tags) to speed up chunk generation a little bit.
2013-04-04 17:55:35 -07:00
LexManos 6b0d1bb319 Deprecate IArmorTextureProvider, moved to Item. And exposed more information to the function. Closes #365 2013-04-04 17:28:50 -07:00
LexManos 488322baa2 Add checking for 'ENUM$VALUES' in EnumHelper. Eclipse uses it's own internal compiler which does not follow the java standard of making the values field names $VALUES and private. Instead its public and ENUM$VALUES. Closes #502 2013-04-04 16:04:04 -07:00
Krapht 1ec2810bac Remove unneeded SideOnly. ref: Buildcraft/Buildcraft#710 2013-03-31 09:04:49 +02:00
Christian 5ad133c664 Sanity check the item ID for loaded liquid stacks better. 2013-03-29 21:43:59 -04:00
Christian 8a4a62ab4e Add in persistence code for LiquidTank. Using it should protect against liquids that get removed f.e. Closes #395 2013-03-29 16:21:17 -04:00
Christian b1e7248a67 Make liquidstacks immutable in their type data. Sorry about this, but it makes things a lot easier. 2013-03-29 15:40:45 -04:00
Christian fc976c7714 Fix up liquidstack so it knows about the texture sheet for it's icon 2013-03-29 12:42:55 -04:00
Christian b4116f1f31 Fix possible NPE in ChunkManager. Closes #478 in reality 2013-03-28 08:19:24 -04:00
Christian a7108bc2ff Fix up some liquid logic 2013-03-28 08:07:09 -04:00
Flow86 41ed59f424 fix bug #489 from #429 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
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
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
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 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