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

274 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
LexManos
76d6bc3cfa Fixes crash when mods add TreeMaps to the Configuration map, thanks AtomicStryker, PR: #282 2012-12-12 02:20:46 -08:00
LexManos
c68dfae100 Fix type in ForgeChunkManager.ticketCountAvaILableFor, thanks iChun PR: #285 2012-12-12 02:16:23 -08:00
LexManos
9c8fb046be Fix ForgeDirection.ROTATION_MATRIX for issue #313 2012-12-12 01:02:24 -08:00
Scott Killen
768484d393 For @XCompWiz, added a hook to allow mods to dynamically change the color that water is rendered. 2012-12-07 16:43:15 -05:00
Scott Killen
69ac1fa3a5 Added terrain gen events 
Added biome color events for @XCompWiz
 2012-12-07 16:43:15 -05:00
Christian
6bc367f005 Fix static method, closes #271 
Don't spam the log if a mod requests a ticket beyond their maximum. A single message is fine.
 2012-12-06 16:14:15 -05:00
Chicken Bones
f1e3481c0a Add Chunk Watch and UnWatch events. 2012-12-06 09:11:20 -05:00
Abrar Syed
5cb03bc07d fix List configs 2012-12-06 09:09:34 -05:00
GuntherDW
021ec72f11 Fix typo in chunkmanager config 2012-12-06 09:31:06 +01:00
LexManos
742e93caec Fix issue with DimensionManager.shouldLoadSpawn 2012-12-04 02:01:01 -08:00
Christian
e3dfb1e3b7 Fix #289 2012-12-02 22:00:12 -05:00
Christian
784ad96194 Add in some additional ticket loading callbacks for ChickenBones. Closes #284 
Add in a call to determine if there are possible chunktickets for a world. This should let
Mystcraft and other dynamic world generating mods check if they should immediately load
a world based on existing chunk tickets.
 2012-12-02 00:56:53 -05:00
LexManos
fdb2933ceb Fix logic issue in ForgeChunkManager.ticketCountAvaliableFor(username) PR 2012-11-29 04:04:03 -08:00
LexManos
096989d4eb Small change to fix loading configs. 2012-11-27 22:43:23 -08:00
LexManos
4a748beb69 Fix potential NPE in EntityJoin handler and print warning. 2012-11-27 16:12:54 -08:00
LexManos
cbe52abe42 Exposed some ChunkLoader information for PR #278 2012-11-27 15:28:59 -08:00
LexManos
7b6d65ce85 Small tweak to config to use Treemap 2012-11-27 14:53:43 -08:00
LexManos
530c19293b Fixed AIOOB issue with new sanity check in getBlock 2012-11-27 12:24:52 -08:00
LexManos
50426ea0fe Fix potential NPE in saving a property that didn't define a type. 2012-11-27 02:14:20 -08:00
LexManos
81b5db6f37 Added new functions to the Config class to allow for specification of comments when getting properties. 
Added new getTerrainBlock whihc will limit the resuling ID to < 256, useful for world gen.
Calls to getBlock with IDs less then 256 will be assigned values above 256 {Thus freeing up terrain gen slots}
Made ConfigCategory implement Map<String, Propertery> should fix compatibility with most mods that broke two builds ago.
 2012-11-27 02:06:29 -08:00
LexManos
adc2d61feb Merge pull request #277 from Xhamolk/patch-1 
OreDictionary addition: getOreID(ItemStack)
 2012-11-27 00:28:29 -08:00
LexManos
88f9fa75c9 New nested configuration category support, for PR #258 2012-11-26 23:46:01 -08:00
LexManos
07a6e4ed5f Fixed random chest items not generating to there max stack sizes. 2012-11-26 20:25:35 -08:00
Xhamolk_
c0276a63f7 OreDictionary addition: getOreID(ItemStack) 
Allow getting the oreID from a ItemStack, as an alternative from getOreID(String).

Now is easier to exchange items for their equivalencies through the OreDictionary.
 2012-11-26 21:22:11 -06:00
iChun
1e8c2a9acf Add check that Entity saves to disk before saving entity to saved chunkloading data. 
Returning false to addEntityID prevents the entity from being saved (cred to LexManos)
Entities which do not save to disk but are chunkloaders causes errors the next time the world loads. This ought to fix it.
 2012-11-24 16:27:17 +08:00
Christian
913f3adade Stupid eclipse resetting preferences. Spaces, not tabs!!! 2012-11-18 19:33:15 -05:00
Christian
ed252ad8ed Add in events when forcing and unforcing chunks. Hope this works for you ChickenBones! 2012-11-18 19:28:02 -05:00
Christian
7306c0c1f3 Update to MC 1.4.5 
Update FML: 43d3042
43d3042 Clean up a patch
fec221f Update FML for MC 1.4.5
b0f0635 Fix for ModLoader static overrides not displaying.
23a2513 Fix up derpy file name handling: closes #127 Fix up duping childmods: cl
a6eaa2b Fix spelling issue.
c6a0741 FML setup should now download and verify all the minecraft files needed
5a1930e Small fix to some MCP metadata for pre2
418deba Update to MC 1.4.4
4ff2cff Fix bug when a modloader mod is run on a dedicated server and has a conn
 2012-11-16 17:06:12 -05:00
Christian
ca16b4b1bd Some liquid events. Non-API breaking. Add them at your leisure. This helps liquids know 
what's happening to them. In case they're volatile or something ;)
 2012-11-16 01:28:29 -05:00
Christian
da00985e5f Another difference 2012-11-15 21:54:19 -05:00
Christian
5a72d49359 Fix fillLiquidContainer - return null, not the empty container for 
previous API compatibility
 2012-11-15 21:46:38 -05:00
Christian
0f7811624b Change name to LiquidContainerRegistry. Fix up missing API. This better be it now! 2012-11-15 06:43:16 -05:00
King Lemming
213fb9bd1a Fixed oversights in liquid registry, added functionality for instant checks as requested by CJ. 
Liquid list return is now secure.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2012-11-15 02:43:35 -05:00
Christian
223aca8a28 Rename some liquid stuff for more sensible naming. Tweak API slightly. 2012-11-14 21:22:44 -05:00
King Lemming
73a2a5d78a Liquid Manager Rewrite - slightly more memory usage, loads more efficient at runtime. 
Added default Lava and Water registrations to Liquid Manager.
Removed method which relied on flawed assumption that a given liquid only had a single type of container.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2012-11-14 20:27:47 -05:00
Christian
a759353afa Add in the basic IBlockLiquid interface. The actual block implementation 
will follow.
 2012-11-13 21:54:57 -05:00