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

1537 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
LexManos
f5747824eb Update workspace for new library structure. 2013-06-30 05:25:53 -07:00
LexManos
dac97174ff Add air check to Flint and Steel Ref: #602 2013-06-17 08:28:26 -07:00
LexManos
949b991b96 Fic Chest content gneeration delegate call. Cloases #609 2013-06-17 08:27:57 -07:00
LexManos
1173e9074d Bump Forge revision and mark recomended. 2013-06-15 00:19:35 -07:00
LexManos
f425a367cd Add air checks to BlockSand falling and Piston pushing. Please report any other issues with custom 'Air' blocks in issue #602 2013-06-14 12:08:24 -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
LexManos
ff95f73cd1 Merge pull request #607 from heldplayer/tripwires 
Fix tripwire patches for solid side checks
 2013-06-14 11:30:03 -07:00
Heldplayer
060bacb196 Fix tripwire patches for solid sides 2013-06-14 15:39:20 +02:00
Christian
3794713dd9 Fix server patch FML update 
Updated FML:
MinecraftForge/FML@22738de028 Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
MinecraftForge/FML@05a854cd2a Small tweaks to the mcp data. Nothing major..
 2013-06-11 14:57:23 -04:00
Christian
ebd22c3abd Make glass panes and iron fences connect to block sides based on solidity. This does change IBlockAccess, so anything with a custom IBlockAccess may need to implement the new method. 2013-06-10 16:57:34 -04:00
LexManos
47b5e28c91 Forgot most important side, release script. 2013-06-10 02:27:39 -07:00
LexManos
47f87ed6b5 Fixed changelog generation. 2013-06-10 02:06:43 -07:00
LexManos
c1ba77eb3f Fix AIOOB exception in crash reporting if exception does not have a stack. Possible, but odd. 2013-06-10 01:25:25 -07:00
LexManos
031e7a5e7e Add NPE protection to refernce to MinecraftServer.worldServer 2013-06-08 19:36:57 -07:00
LexManos
da75e1b68b Fix hoes being able to till dirt under other blocks, and made it look for air type blocks. 2013-06-08 19:36:02 -07:00
LexManos
5ea9aff894 Fix Air block check in BlockPortal. 2013-06-08 18:38:22 -07:00
LexManos
9034862024 Add NPE protection to ItemStack delegates. Closes #601 
Also cleaned up the names of said delegates, we do not have to follow MCP's crowdsourced names as they are very bad.
Redirected damage through setItemDamage to allow items to have finder control of breaking.
 2013-06-08 14:02:53 -07:00
Lunatrius
0c308a5f07 Added rotation support for all vanilla blocks that can be rotated. 2013-06-08 21:35:42 +02:00
LexManos
2bbb3ee0ca Disable ImageIO's File based cache, should speed up texturepack loading/stitching. 2013-06-08 12:20:49 -07:00
Christian
24e67b857c Updated FML: 
MinecraftForge/FML@24c4056651 Add in an optional modid identifier for @SidedProxy. It's main use is when both scala and java @Mods reside in the same package, and you want the @SidedProxy behaviour for a specific @Mod language type. In general it should not be needed otherwise.
MinecraftForge/FML@cd0466395a Fix sysout with trailing messages after a newline
 2013-06-06 12:16:44 -04:00
Christian
ab62ca7b1f Merge branch 'master' into newliquid 2013-06-06 09:39:19 -04:00
Christian
f515ebcb12 Updated FML: 
MinecraftForge/FML@6f3da97365 Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for.
MinecraftForge/FML@59fe905695 Don't continue trying to send events to mods that depend on errored mods.
 2013-06-04 20:16:00 -04:00
LexManos
5f750197ac Merge pull request #560 from jk-5/master 
RenderGameOverlayEvent.Post ALL is not called in GuiIngameForge
 2013-06-03 12:21:34 -07: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
LexManos
15d158161e Make changelog generation non-fatal untill we get jenkins issue figured out. 2013-06-02 16:26:06 -07:00
Christian
cc520e40ce Fix isAir check to see if a portal can light. Should fix w/Railcraft and others 2013-06-02 14:51:41 -04:00
Christian
4d626bf025 Patch village distance checking to use floats instead of ints, to avoid int wrapping 2013-05-28 23:36:09 -04:00
LexManos
40afc35985 Fix arbitrary GUIContainer text coloring by forcing lighting to be disabled. Closes #594 2013-05-27 16:13:05 -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
Christian
227d4eeefa Updated FML: 
MinecraftForge/FML@843a13c1ab Try and clean up cycle detection output a bit
MinecraftForge/FML@82e9de8641 More tweaks to the mod sorting code
MinecraftForge/FML@ac97370f94 Add in a pretty sorting error screen
MinecraftForge/FML@f1d68ed4c8 Throw the sorting exception
MinecraftForge/FML@edc1fb24e2 Send the "suspect list", and print the suspect versions
 2013-05-27 11:10:46 -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
18d87c64dd Fix potential GL issue when atlas animations bind textures without informating RenderEngine. 2013-05-23 22:07:22 -07: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
LexManos
68a31cecb2 Merge pull request #590 from bloodmc/master 
Add support for servers to register dimensions on client.
 2013-05-23 21:45:41 -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
e37ff3ddae Updated FML: 
MinecraftForge/FML@3bf50c4bbe Fix server side derp with Forge network packet handler
 2013-05-21 11:02:36 -04:00
LexManos
b293251c17 Fixed creative tab rendering with invalid color closes #588 2013-05-20 19:24:50 -07:00
LexManos
f382679cae Fix type in biome list. 2013-05-20 19:24:14 -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
7f5fa36fcf Merge pull request #584 from Chicken-Bones/hitinfo 
Add hitInfo field to MovingObjectPosition for when an int doesn't suffice
 2013-05-19 13:32:09 -07:00
LexManos
7143607620 Fixed render count for stacks of blocks 40+ and distrabution of items based on scale. Closes #579 2013-05-19 13:22:12 -07:00
LexManos
432023a9ba Fix another NPE when Items are in Block range with custom renderers, Modders keep your items out of the block range! Closes #581 2013-05-19 13:09:05 -07:00
Chicken Bones
24757402c2 Add hitInfo field to MovingObjectPosition for when an int doesn't suffice 2013-05-20 02:10:57 +10:00
Christian
63b59f078a Remember x & z passed to getTopSolidOrLiquidBlock and use it for foliage tests. Fixes #575 2013-05-16 10:12:03 -04:00
Christian
eba92ad3f8 Fix blending on the hotbar. Closes #574 2013-05-15 20:51:24 -04:00
Christian
5ca854efa8 Add in a very simple stencil bit registry to try and arbitrate between mods wanting to use stencil bits in rendering 2013-05-15 20:29:47 -04:00