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

133 commits

Author SHA1 Message Date
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
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
8f6963fabf Merge branch 'worldtype_customize' of https://github.com/ExtrabiomesXL/forge into gh-updates 2013-01-20 15:24:10 -05:00
Christian
a004673567 Merge branch 'master' of https://github.com/CovertJaguar/MinecraftForge into gh-updates 2013-01-20 12:05:11 -05:00
Christian
5ea2d49915 Merge part of PR #375 related to ChunkEvent.Load for the client side 2013-01-20 12:03:42 -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
CovertJaguar
78a3d1a656 Fixed render passes for EntityItems 
Should be < instead of <=
 2013-01-18 12:06:29 -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
3fc95b71e2 Update patche for jad-style names. 2013-01-11 23:46:08 -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
3e484deafc Fixed incorrect lighting in some cases. Closes issue #349 2013-01-01 21:54:25 -08:00
LexManos
c523592522 Added getter for Metadata smelting list, because, why not.. PR: #352 2013-01-01 21:53:41 -08:00
Christian
5e4315415d Update FML:d9bfb29 
d9bfb29 Add in a "server stopped" event
 2012-12-31 00:03:09 -05:00
Christian
f594109b30 Attempt to resolve the entity concurrency issue, by simply deferring unload 
to the next tick
 2012-12-30 23:26:04 -05:00
Christian
e4a1693495 Fix a missed patch and cleaned up other patches 
Rollback a method name change that breaks a lot of mods
Update FML: fb701cd
fb701cd Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1
 2012-12-29 00:29:15 -05:00
Christian
19347c5322 Update for MC 1.4.7 
Update FML: f7cc50b
 2012-12-28 12:06:56 -05:00
LexManos
0c5563fbf5 Attempt a fix for the new chunk compression changes. 2012-12-27 22:13:46 -08:00
LexManos
46440588fe Fix mobs spawning on inverted slabs/stairs. 2012-12-27 13:50:13 -08:00
Scott Killen
16543840a4 Add ability to WorldTypes to display the 'Customize' button and react to it 2012-12-26 11:35:49 -05:00
LexManos
081ec4b70a Fixed order <.< you saw nothing. 2012-12-25 22:28:16 -08:00
LexManos
a042453690 Use nanoTime instead of currentTimeMillis for potential performance increase. 2012-12-25 22:23:23 -08:00
LexManos
1a54bcd3dc Fixed EntityMinecard missed patch, Issue #338 2012-12-25 22:02:57 -08:00
LexManos
263e919384 Fixed issue with Efficancy enchatment when connected to vanilla servers. 2012-12-25 22:02:30 -08:00
Christian
7553f98367 Protect deflation with a simple semaphore. Should close #336 2012-12-25 22:06:20 -05:00
LexManos
6834cf2649 Fixes a vanilla bug where the player view would dip when stepping between certain blocks 
https://mojang.atlassian.net/browse/MC-1594
Issue #318, let me know if you notice any issue.
 2012-12-24 01:55:37 -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
LexManos
dedc02fa22 Move chunk compression to the network thread in Packet 51 and 56 
This will reduce the server load considerably by doing the chunk data compression in writePacketData, which will be run from the network thread.

The chunk compression can easily use 1/4th of the overall server thread CPU time if someone is exploring much, especially when moving quickly (e.g. with quantum leggings).

Player, this is how it's properly done.
 2012-12-23 23:31:13 -08:00
LexManos
0562fd85b9 Explicitly check if useItem is not denied, allows for denying the item without denying the block 2012-12-23 23:15:53 -08:00
LexManos
1c225a8d0d Fix missed patch in EntityMinecart, #334 2012-12-23 23:04:11 -08:00
LexManos
878d230189 Delete unneeded patch. 2012-12-23 21:49:16 -08:00
Christian
ca881a8153 Fix Fireworks to always work in SMP 2012-12-22 07:09:21 -05:00
Christian
51c19dd5f1 Fix up enchantment at the enchanting table vs via a book. Adds in a method 
that previously exists under a new name: canApplyAtEnchantingTable()
to determine enchantments that can apply at the enchanting table (a smaller
subset of all possible enchantments for an item, now). Also, add your
enchantments to the anvil book application list, if neccessary.
 2012-12-21 15:44:41 -05:00
Christian
ced432f31d Tweak packet56 to see if this resolves the apparent worldgen derpiness 2012-12-21 09:24:13 -05:00
Christian
3d5197ea33 Server side only item callback: allow a held item to decide if it wants to pass sneak-clicks through 
to a block, or not. Defaults false- the same as the new vanilla behaviour (sneak clicks with an item
in hand don't activateBlock anymore).
 2012-12-21 03:15:12 -05:00
Christian
708516e060 Move another patch up a bit - should actually close #329 2012-12-21 01:49:43 -05:00
Christian
b82cb25eea Add IPlantable to itemseedfood. Potato and carrot support! 2012-12-20 21:40:36 -05:00
LexManos
dd8893a65c Fixed cpw's derp in the PlayerInteractEvent logic. 2012-12-20 15:02:06 -08:00
LexManos
4cfffe784e Updated NetClientHandler for onConnectionClosed placement fix. 2012-12-20 15:00:35 -08:00
Christian
c9d9fe8e3a Fix ItemInWorldManager so that itemUseFirst works, and the playerinteractevent works. Minor patching mis hit. Apologies. 2012-12-20 10:52:08 -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
aed532636a Drop the item in onBlockHarvested, not breakBlock 2012-12-18 22:17:02 -05:00
Christian
aca35c7571 Fix up block drops for skulls and cocoa 2012-12-18 22:10:15 -05:00
Christian
18f77fb10f Fix binding the texture for multiple render passes. Thanks mdiyo! Closes #320 2012-12-18 13:32:48 -05:00
Christian
de15192bb8 Allow RenderItem to be easily overridden for things that need to render entityitems. IronChest, BuildCraft, RP2, whatever... 2012-12-18 10:57:04 -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
Christian
efee38095b Fix RenderItem so that forge textures load for it 2012-12-18 09:19:05 -05:00
LexManos
9833c5652c Removed all functions marked as deperacted for the new MC version 2012-12-18 05:28:09 -08:00