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

644 commits

Author SHA1 Message Date
Lex Manos
d2682ab969 Fix patch screwup in Skyboy's Fishing PR -.- 2014-08-05 15:17:10 -07:00
Lizbeth Rika
63140bcf7f Fixed items with more than 2 render passes rendering weird in first person 2014-08-05 21:10:28 +01:00
DemoXin
68fd0049fb * Added AT for ContainerRepair.stackSizeToBeUsedInRepair (Now public) 
* Added ability to AnvilUpdateEvent to alter stackSizeToBeUsedInRepair (vanilla behavior is now reproducable)
* Added AnvilRepairEvent, fired when the player removes an ItemStack from the output slot of ContainerRepair, and allows the chance to damage the anvil to be altered.
 2014-08-04 16:54:35 -04:00
LexManos
224987aa83 Merge pull request #1128 from skyboy/patch-fishingapi 
Add API for fishing results, I'm tired of this, If shit breaks, Blame Skyboy and King_Lemming.
 2014-08-03 16:28:32 -07:00
Lex Manos
cd2982f9b1 Closes #1280 2014-08-02 11:32:34 -07:00
Lex Manos
10192959f9 Fixed bug that allowed duplication of Fluids with redstone dust. Closes #1279 2014-08-01 18:37:54 -07:00
Adubbz
2affeae979 Added an event for fog rendering 2014-07-28 17:01:38 +10:00
skyboy
cc169c3ea1 Update FishingHooks 2014-07-25 06:42:17 -04:00
cpw
bbcc515063 Revert old light amortization patch. It seems to be breaking chunk sending pretty badly when more 
than a couple of people are online. Tests indicate it is not useful anymore.
 2014-07-24 21:40:30 -04:00
skyboy
906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
Lex Manos
c69958e34b Made skulls respect Block.isReplaceable when placing, also prevented them from deleting blocks when placed at certain angels. Closes #1233 2014-07-16 18:37:49 -07:00
Darkhax
08826ed84b Changed exception message for duplicate enchantment ids to contain the 
class path for both enchantments along with the enchantmnet id that has
been duplicated.
 2014-07-16 07:08:57 -06:00
LexManos
e2fe13bd17 Merge pull request #1226 from williewillus/xporb 
Fix experience orbs spawning at 32x coordinates clientside
 2014-07-14 14:56:52 -07:00
Vincent Lee
a35457ecb7 Fix comment derp (+1 squashed commits) 
Squashed commits:

[52c40bc] Fix experience orbs spawning at 32x coordinates clientside

Add // FORGE comment

Add // FORGE comment to clarify the purpose of the change
 2014-07-14 16:43:16 -05:00
Vincent Lee
5c0217d316 Fix chat opacity 
Add // FORGE comment

As per convention, add // FORGE comment to clarify the purpose of the change
 2014-07-13 23:44:47 -05:00
Lex Manos
52ec4f7c57 Updated FML: 
MinecraftForge/FML@ab52901b8b Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
MinecraftForge/FML@11893fbbb7 Add system property to skip doing world backups when game registry changes. This is SEVERLY ill-advised, if you do this DO NOT ask for any support.
MinecraftForge/FML@fdb6b34b8f Update authlib and realms to latest json data.
MinecraftForge/FML@b3a74882b4 added slider controls for numerics. default control is textbox, but slider can be used as a custom list entry class. fixed constructor javadocs in GuiConfig
MinecraftForge/FML@7c6d1f7568 Merge pull request #468 from bspkrs/master
MinecraftForge/FML@692d955c1a Update tweaker login to use authlib.
MinecraftForge/FML@c2119eb1c1 Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
 2014-07-11 18:17:50 -07:00
TheCountryGamer
7adaef9aed RenderBlockOverlayEvent patch 
Fixes skewed XYZ parameters
 2014-07-08 15:49:32 -04:00
Lex Manos
195542c5fb Fixed Enchantment.addToBookList Closes #1160 2014-07-07 21:54:32 -07:00
LexManos
ba6c2c88ed Merge pull request #1194 from diesieben07/potion-icon 
Added hook for potion inventory icons
 2014-07-07 19:56:52 -07:00
LexManos
a6b7ba06c6 Merge pull request #1163 from TheCountryGamer/master 
Added RenderBlockOverlayEvent
 2014-07-07 19:50:04 -07:00
Lex Manos
f6471c3c08 Added World to ChunkProviderEvent.ReplaceBiomeBlocks, and exposed metadata to End and Nether generation events. Close #1201 2014-07-07 19:47:50 -07:00
Lex Manos
86ccfb1d68 Made EmeraldOre respect isReplaceableOreGen. Closes #1157 2014-07-07 18:55:24 -07:00
TheCountryGamer
7e7870026e Added RenderBlockOverlayEvent.java 
Adds a Forge event which controls whether an overlay is rendered.
Overlays include: First-person fire, Block (when inside a block)
	and water when a player is inside a water block.

Patched for easier manipulation of event

Fixed for Lex

To be squashed

Removed Contructor

Added block XYZ parameters

TODO, the second block overlay event’s XYZ might not be correct
 2014-07-07 21:49:51 -04:00
LexManos
53ce6f69e7 Merge pull request #1200 from tterrag1098/master 
Add AchievementEvent
 2014-07-07 18:37:53 -07:00
LexManos
81a791bac7 STENCIL buffer and DEPTH buffer, attempt a fix for GL errors. 2014-07-06 22:19:13 -07:00
Lex Manos
d35098ab9e Remove the BLEND enable in rendering damage bars. And exclicitly fix blend states in some GUI elements. 2014-07-06 16:25:14 -07:00
tterrag1098
a3c268b577 Add AchievementEvent 
Allows modders to react to players receiving achievements, and cancel
them.

Fix indentation

More shortening

Down to one line...

Remove newline
 2014-07-02 20:18:53 -04:00
LexManos
a59c5fbd8c Merge pull request #1197 from MrIbby/patch-1 
Add RenderItemInFrameEvent
 2014-07-01 12:34:41 -07:00
Gerard Bruwn
aca429f17b Add RenderItemInFrameEvent 2014-07-01 09:58:44 -07:00
Lex Manos
6db5d2ed26 Fixed issue where Fire's 'fizz' would not play for the person who extinguished the fire. 2014-06-30 11:08:18 -07:00
iChun
78f68847d2 Fixed inverted params in FogDensity use 2014-06-30 10:56:03 +08:00
Lex Manos
63d3fd2e84 Add config option to specify the default spawn fuzz factor for the overworld. Closes #1190 2014-06-29 18:56:22 -07:00
diesieben07
9662b5a657 Added hook for custom PotionEffect rendering in the inventory 2014-06-30 02:06:39 +02:00
Lex Manos
086d02896f Fix creative inventory tabs not blending base don items rendered. Closes #1179 2014-06-29 16:14:57 -07:00
cpw
ced81b5c93 Clean patch cruft. 2014-06-25 20:09:42 -04:00
cpw
c7f9d5a529 Fix new method with Side.CLIENT when it shouldn't have it. Closes a bunch of reports of problems. 2014-06-25 18:59:14 -04:00
Lex Manos
7ba54ffd48 Fix flower pots not droping the items that are inside them. 2014-06-23 22:06:52 -07:00
Lex Manos
256d865db6 Update to 1.7.10-pre4. 2014-06-23 21:55:16 -07:00
Christian
4778c33902 And fix firing for single player loading. 2014-06-22 14:39:23 -04:00
Christian
f7736e9a0a Fire an event when a player loads or saves from disk. Mods that want to load an additional 
player related file from the players dir can now do so in that event.
 2014-06-21 17:38:21 -04:00
Christian
ea7c11baf4 Some patch offsets 
MinecraftForge/FML@7219061b05 Also patch in warnings for Vec3Pool - similarly removed.
MinecraftForge/FML@dff2204558 FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch rogue calls to System.exit so that they can cause a proper crash report, rather than silently abandoning the game.
 2014-06-21 17:34:52 -04:00
Lumien
a21ad8fa9d Fixes a server crash caused by a player joining that is in a non existent dimension 2014-06-20 11:18:23 +02:00
Lex Manos
bb15efd037 Fixed vines generation for hanging off of trees. 2014-06-15 11:59:11 -07:00
bloodshot
61a6b67d51 Don't call ChunkDataEvent.Load async 
ChunkDataEvent.Load must be called after TE's are loaded since this is
what mods expect. The event is handled by ChunkIOProvider during
callStage2.
 2014-06-13 00:52:13 -04:00
LexManos
96286b77f9 Merge pull request #938 from bloodmc/chunkasync 
Load chunks asynchronously for players.
 2014-06-12 17:43:28 -07:00
LexManos
7b6b88b002 Merge pull request #1125 from alucas/addmissingjumpevent 
Add missing onLivingJump calls
 2014-06-12 16:20:03 -07:00
Travis Watkins
e6bbcf6a3d Load chunks asynchronously for players. 
When a player triggers a chunk load via walking around or teleporting
there is no need to stop everything and get this chunk on the main thread.
The client is used to having to wait some time for this chunk and the
server doesn't immediately do anything with it except send it to the
player. At the same time chunk loading is the last major source of file IO
that still runs on the main thread.

These two facts make it possible to offload chunks loaded for this reason
to another thread. However, not all parts of chunk loading can happen off
the main thread. For this we use the new AsynchronousExecutor system to
split chunk loading in to three pieces. The first is loading data from
disk, decompressing it, and parsing it in to an NBT structure.  The second
piece is creating entities and tile entities in the chunk and adding them
to the world, this is still done on the main thread. The third piece is
informing everyone who requested a chunk load that the load is finished.
For this we register callbacks and then run them on the main thread once
the previous two stages are finished.

There are still cases where a chunk is needed immediately and these will
still trigger chunk loading entirely on the main thread. The most obvious
case is plugins using the API to request a chunk load. We also must load
the chunk immediately when something in the world tries to access it. In
these cases we ignore any possibly pending or in progress chunk loading
that is happening asynchronously as we will have the chunk loaded by the
time they are finished.

The hope is that overall this system will result in less CPU time and
pauses due to blocking file IO on the main thread thus giving more
consistent performance. Testing so far has shown that this also speeds up
chunk loading client side although some of this is likely to be because
we are sending less chunks at once for the client to process.

Thanks for ammaraskar for help with the implementation of this feature.

This commit is based off the following :

Bukkit/CraftBukkit@b8fc6ab2c1
Bukkit/CraftBukkit@85f5776df2
Bukkit/CraftBukkit@0714971ca2
Bukkit/CraftBukkit@7f49722f45
Bukkit/CraftBukkit@53ad0cf1ab
 2014-06-12 16:51:17 -04:00
Christian
aaccbb8247 Warn when chunks are being self-recursively loaded. This can cause serious issues. Modders should watch out. 2014-06-12 14:45:25 -04:00
Antoine
27d9edac67 Add missing onLivingJump calls 2014-06-11 13:37:36 +02:00
LexManos
a08357a845 Merge pull request #1126 from Cojomax99/fog_customization 
World fog color and density can now be controlled through an event
 2014-06-11 00:57:33 -07:00
Cojomax99
9a3bc1fff5 World fog color and density can now be controlled through an event 2014-06-11 10:54:54 +03:00
LexManos
4ae1abd7d4 Merge pull request #1134 from diesieben07/ender-teleport 
Fix EnderTeleportEvent for Ender Pearls.
 2014-06-10 18:49:32 -07:00
Lex Manos
d5a4ee2c10 Fixed inverted player parameters in PlayerEvent.Clone, Closes #1142 Closes #1140 2014-06-10 18:48:00 -07:00
Lex Manos
5849458443 Changed EntityWolf to EntityTameable in EntityLivingBase.attackEntityFrom, to allow for more custom pets. Closes #1141 2014-06-10 18:20:59 -07:00
diesieben07
b0195f31e4 Fix not being able to change target & attackDamage for EnderTeleportEvent. 2014-06-07 13:45:29 +02:00
Lex Manos
03ae909762 Fix inverted parameters in OreDictionary.getOreID Closes #1123 
-.- Closes #1120
 2014-06-04 23:09:13 -07:00
LexManos
f3cbc6c262 Merge pull request #1034 from Adubbz/master 
Greatly simplified the addition of new biomes to the default world. If this breaks things blame Adubbz.
 2014-06-02 17:00:47 -07:00
Lex Manos
42fc3c9516 Added Noteblock change and play events. Closes #1027 #1025 2014-06-02 16:57:04 -07:00
Lex Manos
b301b1f70c Add target world to PlayerInteractEvent for potential 'cross dimension' interaction such as LittleBlocks. Closes #1071 2014-06-02 15:49:11 -07:00
Lex Manos
eb1ddab278 Add a couple of localizations to Forge added strings. Closes #1068 2014-06-02 15:28:11 -07:00
LexManos
0456c4d5ae Merge pull request #1095 from rwtema/master 
Fixed setBlock not using the location version of getLightOpacity()
 2014-06-02 14:28:42 -07:00
Lex Manos
fa3feda0d5 Filter all vanilla blocks that we missed through Forge's getDrops and BlockDrops events. As well as implemented IShearable for DoublePlants and DeadBushes. Mojang really should generic out some of this stuff instead of repeating logic all over the place! 2014-06-02 14:10:49 -07:00
Lex Manos
e7f492a15b Fixed GuiContainer calling button.mouseReleased. Closes #1116 2014-06-02 12:01:34 -07:00
Lex Manos
5fe0a0ea5a Fix patch fuzz 2014-06-02 12:01:10 -07:00
diesieben07
deb5df542e Add PlayerEvent.StartTracking and .StopTracking & make trackedEntityIDs visible 
& Update, as discussed on IRC (squash)
 2014-05-30 01:59:05 +02:00
LexManos
96ee4caf39 Merge pull request #1089 from RainWarrior/render-events 
Added world display list render events
 2014-05-25 17:16:08 -07:00
RainWarrior
3980bf79da Added world display list render events 2014-05-26 04:09:21 +04:00
Lex Manos
acf8e468f3 Made WorldGenShrub respect Block.canSustainPlant, Closes #1096 2014-05-24 10:55:57 -07:00
Lex Manos
dc10db1d90 Add new PlayerEvent.Clone called when an EntityPlayer is cloned via dimension travil or respawn. 2014-05-24 10:50:52 -07:00
rwtema
576a1294da Fixed setBlock not using the location-specific version of getLightOpacity() 2014-05-23 22:37:41 +01:00
Clashsoft
e530089639 Update GuiScreen.java.patch 2014-05-22 16:12:52 +02:00
Lex Manos
7b062dd390 Fixed Stems not droping a random number of seeds based on metadata, Closes #1087 2014-05-19 11:11:04 -07:00
XCompWiz
cdad2dc55a Bug Fixes to Biome Decoration and Chunk 
Fixes issue with biome decoration crashing on worlds with exposed void
Fixes same issue in JungleBiome decoration
Fixes forge bug in getting lighting from a block in chunk
 2014-05-19 01:37:59 +03:00
Lex Manos
9d66c91c86 Added accessible instance to RenderBlocks and RenderItem for modders to use who don't wish to create there own instance. Warning: Other modders may influance the transient state of the instance, BE WEARY MODDERS. 2014-05-14 12:23:22 -07:00
Lex Manos
1c7341b982 Added Farmland to PLAINS type plants as that has changed in 1.7. Also made BlockTallGrass call it's super.canBlockStay to better support custom soils. Closes #1077 2014-05-14 12:21:24 -07:00
Lex Manos
5e6c346c7c In Flower Forest biome a Poppy should spawn instead of Blue Orchid Closes #1078 2014-05-14 12:20:04 -07:00
Lex Manos
f95ca18707 Fixed No Blue Orchids spawn in swamp when using bone meal Closes #1072 2014-05-12 12:36:36 -07:00
Adubbz
4454d3f341 Greatly simplified the addition of new biomes to the default world 2014-05-11 15:06:14 +10:00
bspkrs
e625622b6e Fixed unforeseen NPE 2014-05-08 10:22:48 -04:00
Lex Manos
9e1f038c16 Revert "Implemented hashCode and equals in ItemStack, Closes #986" 
This reverts commit 0b01545a03.
 2014-05-07 22:08:06 -07:00
Lex Manos
0b01545a03 Implemented hashCode and equals in ItemStack, Closes #986 2014-05-07 15:28:03 -07:00
Lex Manos
c8abc41aa0 Fix extended entity properties being lost when leaving the end, This introduces the concept of calling IExtendedEntityProperties.init when entites/worlds change. Lets see if mods explode. 2014-05-07 14:52:18 -07:00
bspkrs
eb2549c773 New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent 2014-05-07 16:52:10 -04:00
Lex Manos
d881baa581 Added new hook to WeightedRandom.getItem that allows for use of custom rnadom generators, prevents redundant code in mods. 2014-05-07 13:27:05 -07:00
Lex Manos
f81c0cb58f Fixed hard references in WorldGenBigTree and ForgeCommand that caused worlds to leak in the client. 2014-05-07 12:18:56 -07:00
Lex Manos
0fe2584b77 Updated FML: 
MinecraftForge/FML@2c56c32c5a Fix saving backups with the raw name. Fix air block not being assigned as the default.
MinecraftForge/FML@d0f8073fa5 Merge pull request #413 from sfPlayer1/master
MinecraftForge/FML@810b1f3075 Clean some generic warnings up. Make a generic list handler. Helpful for others I think too.
MinecraftForge/FML@fff86ee9d3 Fix refreshResources not happening if an error occurs.
MinecraftForge/FML@76d8d0e870 Fix mod version checking
MinecraftForge/FML@b84d0760ae Fix display of mod status at the server
MinecraftForge/FML@251af1d09d Fixed memory leak on the client caused by Netty holding references to the World.
 2014-05-07 12:17:52 -07:00
Azanor
2e1033b045 Fix for Block.getExplosionResistance getting passed the wrong parameters 
It is being sent the x, x, y coordinates instead of x, y, z
 2014-05-07 17:21:58 +02:00
LexManos
80fd60eaff Merge pull request #1051 from Deadrik/ChunkProviderFixes 
ReplaceBiomeBlocks Event changes
 2014-04-29 17:38:37 -07:00
Bioxx
f848955263 Adds a new ReplaceBiomeBlocks Event constructor that supplies the metadata array if applicable and updates the ChunkProviderGenerate class to pass in the metadata array. 2014-04-29 19:40:32 -04:00
CovertJaguar
5f6e1167f4 Fix issue with flexible rail return value 
Between 1.6 and 1.7 the return value to BlockRailBase.isFlexibleRail()
was inverted. While this is not a huge deal and could be worked around
by simply inverting your return value, it does mean its no longer
consistent with the function name and javadocs.
 2014-04-29 14:07:59 -07:00
Lex Manos
172ea90c59 Try and fix invalid framebuffer depth/stencil setup, Thanks Ivoforce. Closes #1032 2014-04-15 12:03:31 -07:00
iChun
cc54645bf3 Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher. 2014-04-08 01:09:17 +08:00
Alexander Behrhof
36298e2bfe Small Fix: Held Items & Multiple Render Passes 
Passes beyond 1 now have the correct icon.
 2014-04-06 17:29:23 -04:00
Lex Manos
7b19768c4c Fix line offset in Minecraft patch, and mix RenderPlayer looping once to many on multi-pass items. 2014-04-04 14:20:56 -07:00
Lex Manos
621fb050ce Finally do SoundSystem workup for 1.7, Closes #982 2014-04-03 03:12:22 -07:00
Lex Manos
5fbc70173c Add NPE protection to GuiingameMenu.actionPerformed, Closes #961 2014-04-03 02:11:17 -07:00
Lex Manos
72d22c5827 Update access transformer, Closes #951 and #1021 2014-04-03 02:10:43 -07:00
Lex Manos
5f62afb5f2 Add AnvilUpdateEvent which is fired when a user places a item in both input slots of a Anvil and allows modders to control the output. Closes #838 2014-04-02 18:33:13 -07:00
Lex Manos
33bf2c8a69 Add ANIMALS tpe to PopulateChunkEvent.Populate Custom providers should call this function if they spawn animals curing population. Closes #790 2014-04-02 17:40:03 -07:00
Lex Manos
56084b584d ItemStack sensitive version of Item.getAttributeModifiers, Closes #816 2014-04-02 17:24:25 -07:00