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

274 commits

Author SHA1 Message Date
Lex Manos
0923c2c2b8 Fix recipies for stone variants. 2014-12-25 01:39:22 -08:00
LexManos
30e44e19e9 Merge pull request #1592 from palechip/1.8 
Fix Scoreboard rendering for the sidebar.
 2014-12-24 16:06:17 -08:00
Lex Manos
51271dcc3a Fix MC-30864 (sending web links in chat) 2014-12-23 15:04:41 -08:00
LexManos
d5d312b452 Merge pull request #1491 from killjoy1221/master 
Fix MC-30864 (sending web links in chat)
 2014-12-23 14:33:10 -08:00
Lex Manos
7ddc5469b4 Fix crafting of non-oak fences/gates. 2014-12-23 14:14:40 -08:00
Lex Manos
3c936e88f2 Added chests to the ore dictionary. 2014-12-23 13:17:44 -08:00
Lex Manos
53275ff0ac Removed exclusion of white stained glass recipes in ore dictionary. 2014-12-23 12:15:40 -08:00
LexManos
93445248e6 Merge pull request #1503 from Kittychanley/master 
Removed exclusion of white stained glass recipes in ore dictionary.
 2014-12-23 12:13:17 -08:00
palechip
f6dc40c07d Fix Scoreboard rendering for the sidebar. 2014-12-22 14:34:35 +01:00
Lex Manos
d8cb28911c Fix userdev for new BlockState change. 2014-12-12 14:42:49 -08:00
LexManos
ca2d49b4cd Merge pull request #1518 from RainWarrior/model-event 
Added model bake event, ISmartBlock/itemModel, Block.getExtendedState, IExtendedState and IUnlistedProperty
 2014-12-12 12:44:05 -08:00
Lex Manos
0b41756125 Untie ItemModelMesher from using Item Ids internally by implementing our own simple mechanics using Trove. 2014-12-12 11:47:27 -08:00
Lex Manos
ecd4a259ec Fix EnumHelper for new ArmorTexture argument. 2014-12-11 16:41:27 -08:00
Lex Manos
f60f7d9aa6 Fixed NPE thrown when brewing event is fired and not all slots are filled. 2014-12-11 05:25:13 -08:00
Lex Manos
66018bd168 Make daylight sensor recipe use ore dictionary wooden slabs Closes #1565 2014-12-10 05:18:42 -08:00
Lex Manos
924db0ff03 Fixed NPE thrown when brewing event is fired and not all slots are filled. Closes #1564 2014-12-10 05:12:36 -08:00
Lex Manos
08960ffb7b Unbind Shaped/Shapeless Ore Recipies from Array list to normal List. 2014-12-08 05:03:43 -08:00
Lex Manos
f9955efb08 Expand PlayerWakupEvent to expose the three parameters passed into EntityPlayer.wakeUp. 2014-12-07 05:48:26 -08:00
Lex Manos
81086375e8 Expand PlayerWakupEvent to expose the three parameters passed into EntityPlayer.wakeUp. Closes #1486 2014-12-07 05:48:02 -08:00
Lex Manos
4e39515d12 Add quartz_ore tool init, more mojang special casing -.- Closes #1333 and Closes #1335 2014-12-07 03:43:02 -08:00
Lex Manos
4cc11b220a Add quartz_ore tool init, more mojang special casing -.- 2014-12-07 03:41:53 -08:00
Lex Manos
24213a8ca7 Added PotionBrewEvent.Pre/Post. To allow for modification and cancelation of Brewing. Closes #1248 2014-12-07 03:30:52 -08:00
Lex Manos
27524a02ae Added PotionBrewEvent.Pre/Post. To allow for modification and cancelation of Brewing. 2014-12-07 03:30:10 -08:00
Lex Manos
c9fe5ded9b Add LivingHealEvent called from EntityLivingBase.heal() Closes #1282 2014-12-07 02:35:07 -08:00
Lex Manos
44b21681e2 Add LivingHealEvent called from EntityLivingBase.heal() 2014-12-07 02:34:28 -08:00
Lex Manos
f2b1622355 Added CreateSpawnPosition event. 2014-12-07 01:52:29 -08:00
Lex Manos
877ba864e7 Added CreateSpawnPosition event Closes #1053 2014-12-07 01:52:17 -08:00
Lex Manos
0c11a1544f Cleanup deprecated code, and TODOs in OreDictionary. Down-typed things from ArrayList to List. Asking for the ores with a null stack will now throw an Exception. 2014-12-07 01:50:26 -08:00
Lex Manos
cf81ad7b15 Add "sand" to the OreDictionary 2014-12-07 00:44:29 -08:00
Lex Manos
9cf9d6a8e8 Add "sand" to the OreDictionary Closes #1487 2014-12-07 00:44:20 -08:00
Lex Manos
42938a1e7f Added Explosion Start and Detonate events to control explosion. 2014-12-07 00:28:41 -08:00
Lex Manos
861c00fdfc Added Explosion Start and Detonate events to control explosion. Closes #1469 2014-12-07 00:27:51 -08:00
Draco18s
bf26e639d9 Update RenderBlockFluid.java 
Added tessellator calls to render the block's back faces, so that the liquid properly renders when the player is immersed in the fluid.
 2014-12-04 16:50:26 -05:00
RainWarrior
134fbaa1ff Added model bake event (allows mods to insert custom baked models, much like TextureStitchEvent allows to load custom textures), ISmartBlock/ItemModel (ability form models to react to block/item states), Block.getExtendedState, support for unlisted properties in block states. Includes example implementation of http://imgur.com/a/FyyJX 2014-12-04 14:16:30 +03:00
Lex Manos
59df94bd90 Updated FML: 
MinecraftForge/FML@9c8ca4a4e3 Unlink banner block and item id. Mojang should of matched these up but they didn't -.-
MinecraftForge/FML@84a101f344 Update Dev mcp mappings to 11-30 snapshot.
 2014-12-01 19:11:17 -08:00
Lex Manos
cbcdbf56bb Fixed Entities not being able to climb ladders, Closes #1535 2014-11-29 23:03:55 -08:00
Lex Manos
d6d4735a70 Fixed Entity extended properties init order. Closes #1532 2014-11-29 23:03:26 -08:00
Lex Manos
6bb769268f Fix interacting with entities. 2014-11-28 12:04:09 -08:00
Lex Manos
10efdbc085 Fix debug screen not showing grey background. Closes #1529 2014-11-28 11:18:59 -08:00
Lex Manos
d48f4d0a94 Update RecipeSorter for new 1.8 recipies. 2014-11-28 08:20:10 -08:00
Lex Manos
17e5480b6e Fix Entityies not taking damage correctly. Closes #1511 2014-11-28 07:43:10 -08:00
Lex Manos
53659fca06 Initial update to 1.8, Super beta. Most rendering related hooks are out due to major changes in 1.8. 
Some notes:
Almost all int x, int y, int z parameters have been changed to BlockPos class
ForgeDirection has been removed, replaced by net.minecraft.util.EnumFacing.
All FML classes have moved from packet cpw.mods.fml to net.minecraftforge.fml
Fluid Rendering has been disabled for the time being, to be re-evaulated and a test mod created for it.
Minecraft now uses a Model based system for rendering blocks and Items. The intention is to expand the model format to better suit modder's needed once it is evaulated.
As such, The model loaders from Forge have been removed, to be replaced by expanding vanilla's model format.
Metadata has been extracted out in Minecraft to IBlockState, which holds a list of properties instead of magic number metadata. DO NOT listen to the fearmongering, you can do EVERYTHING with block states you could previously with metadata.
Stencil Bits are disabled entirely by for the main Display, Modders must enable and recreate the FrameBuffer if they wish to use Stencil Bits.
 2014-11-26 00:00:54 -08:00
Kittychanley
4e79117755 Removed exclusion of white stained glass recipes in ore dictionary. Closes #1502 & #1481 2014-11-21 14:13:24 -06:00
Matthew Messinger
21ffd28adb Fix MC-30864 (sending web links in chat) 2014-11-10 15:24:27 -05:00
LexManos
5b82e18afc Merge pull request #1376 from founderio/patch-1 
Modify WavefrontObject to allow '.' in group object names
 2014-11-04 18:29:12 -08:00
Lex Manos
47305ff691 Player sensitive version of Block.getPickBlock Closes #1348 2014-11-04 18:27:02 -08:00
LexManos
bcaf8b7e79 Merge pull request #1450 from Adubbz/master 
Fixed desert list initialization. Fixes #1447
 2014-10-17 15:56:00 -07:00
Lex Manos
31e330090a Bump version for new RB. 2014-10-16 20:49:33 -07:00
matthewprenger
9c2f0ddfad Add username cache for determining a player's last known username 2014-10-15 16:14:36 -05:00
Lex Manos
ae4f979318 Compleetly disable stencil bits unless told not to by using the -Dforge.forceDisplayStencil=true flag. Should solve the 'menu in bottom corner' issue with Intel Integrated graphics cards. 2014-10-12 22:11:40 -07:00
LexManos
3aef547046 Merge pull request #1418 from Parker8283/wakeupevent 
Added PlayerWakeUpEvent
 2014-10-11 11:34:50 -07:00
Parker
ff36d4f1d3 Added PlayerWakeUpEvent 2014-10-11 14:13:25 -04:00
Adubbz
de5daadf11 Fixed desert list initialization. Fixes #1447 2014-10-10 21:22:47 +11:00
LexManos
38275c8232 Merge pull request #1364 from Adubbz/master 
Fixed biome weights not working with non multiples of 10
 2014-10-08 17:58:26 -07:00
Lex Manos
676ecab52e Disable by default the Display Stencil bits. Keep FBO bits. Acording to Mumfery and ChickenBones, it should not be nessasary and should solve the 1/4 main menu issue. Use -Dforge.forceDisplayStencil=true to enable old behavior. 2014-10-06 15:12:12 -07:00
LexManos
6da8a19094 Merge pull request #1219 from Lunatrius/master 
Prevent client only commands from bleeding through to the server.
 2014-10-06 14:50:47 -07:00
bloodshot
37f91681d9 Added PlaceEvent and MultiPlaceEvent which fires before placing a block. 
Before calling "ItemStack.tryPlaceItemInWorld", a recording flag is turned on for
setBlock to capture a blocksnapshot for each block that attempts to be placed.

If 1 block is captured, a "BlockEvent.PlaceEvent" is fired to notify mods.
If 2 or more blocks are captured, a "BlockEvent.PlaceEvent" is fired first with the first block
captured followed by a "BlockEvent.MultiPlaceEvent" with all captured blocks. This extra event
is required for items that have the ability to place 2 or more blocks such as a BlockBed.

If either event is cancelled, the recorded block snapshot(s), item stacksize, and item meta will
revert back to the captured snapshot(s).
If the events are not cancelled, a notification will be sent to clients and block physics will be updated.

What this means for mods is Forge will be able to capture all player block placement automatically and fire
a PlaceEvent and/or MultiPlaceEvent.
If for whatever reason your mod does not use the standard placement methods then you will need to fire the
appropriate placement events in order to notify mods/servers.

This commit also includes a new utility class called BlockSnapshot which is serializable. This new class is used in conjunction with
both PlaceEvent and MultiPlaceEvent in order to record a snapshot of block space before it is altered. This
allows us to restore the block(s) if an event is cancelled. The class also provides the ability to restore a snapshot
to any location using the restoreToLocation method. This should be helpful to many mods that are looking to be able
to capture block data then restore it to back to any location required.
 2014-10-02 11:33:25 -04:00
Lunatrius
7cff6f4c80 Prevent client only commands from bleeding through to the server. 2014-09-17 01:48:44 +02:00
Michael Lawrence
71cb9dfe52 check for IFluidBlock (in addition to Material.liquid) when 
determining render height so that non-liquids (gases) render correctly
 2014-09-08 05:51:34 -07:00
Oliver Kahrmann
da39ed066c Modify WavefrontObject to allow '.' in group object names 
Blender names objects with .001 ir .002 when separating vertices or duplicating objects and the importer would crash on them. This fixes the regex to allow dots in the name.
 2014-09-01 22:43:53 +02:00
cpw
24989689b3 GIANT FML UPDATE! Bump forge revision number, and fix patches for ItemStack changes. More to come on this branch I expect. 
MinecraftForge/FML@7c5cf21904 Implement STDOUT/STDERR redirection.
MinecraftForge/FML@bc78e31cb7 added support for \n in tooltip strings added \n test tooltip localization fixed int/double conversion error in slider entry added test slider scenario that highlighted conversion error
MinecraftForge/FML@a2908e5c59 Clean up a bunch of compiler warnings.
MinecraftForge/FML@7f67523d87 Update realms to 1.3.2
MinecraftForge/FML@73f23c24b8 Merge branch 'std-redir' of github.com:Emberwalker/FML
MinecraftForge/FML@1c6b25df74 If an IO exception comes from the datawatcher, spew it all over the console don't discard it silently. Should stop pixelmon blaming forge for their mistakes.
MinecraftForge/FML@e77da9eb2f And fix the read side too, incase someone is trying to bitbang and failing.
MinecraftForge/FML@305d8950c9 Make LogContext optional. This can be useful for debugging mod issues, but Apache's implementation in log4j2 is responsible for a very significant % of the overall runtime. Quite frankly this is shockingly bad performance from what is supposed to be a high performance logging framework. Anyway, until we can figure out if we can fix it, we're turning it off by default.
MinecraftForge/FML@bdfca1c8ed Make more noise when people screw up mod downloading and put .jar.zip in their mod folders.
MinecraftForge/FML@2108494112 Add a custom version range factory method. Should hush skyboy's complaints. Closes #486
MinecraftForge/FML@7c1e6aaa40 Add a delegate to every item and block. this should help with renaming fun stuffs. Also, fix all the tabs from my previous commits. *sigh*
MinecraftForge/FML@61fcb4df06 Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync.
MinecraftForge/FML@eb8c5ab146 Fix nested directory for language resources. Closes MinecraftForge#1264
MinecraftForge/FML@7c05e5f70d Default collections, so that we don't crash if useDependencyInfo is true. Closes #485
MinecraftForge/FML@9729fe2332 Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313
MinecraftForge/FML@21e875ef22 AllowPlayerLogins only after the server has completed the core init tasks. Closes #372
MinecraftForge/FML@46cfeade80 Add a constructor to CustomModLoadingDisplayException. Closes #387
MinecraftForge/FML@a6eab2683a Update README.txt
MinecraftForge/FML@f75838461c Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within.
MinecraftForge/FML@51f24e9e6d First draft of add alias. It is probably not properly persistent atm.
MinecraftForge/FML@2a4c642470 Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs.
MinecraftForge/FML@c1b1417ee1 FML now supports passing a json formatted modlist as an argument, as well as a comma separated argument list. These facilitate modpacks mostly, by meaning you don't need to duplicate mods. The modlist is arranged in the maven style, with mods referenced maven-like.
MinecraftForge/FML@3d42cda2a2 Build.Gradle Patch
MinecraftForge/FML@20c7add845 Merge pull request #484 from bspkrs/master
MinecraftForge/FML@26ed4b992e Clear button list on FML fatal error screens. The hidden cancel button should not be there. Closes #497
MinecraftForge/FML@ebe4f5c5e2 Merge pull request #494 from AntonBoch1244/patch-1
MinecraftForge/FML@ad0da05f5c Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming.
MinecraftForge/FML@65d380181a Extend timeout for client to 5 seconds. Should fix Forge #1322
MinecraftForge/FML@45486a0b6d Fix almost invisible NPE in TerminalTransformer when loading a non-existant class
MinecraftForge/FML@13da3efce0 Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496
MinecraftForge/FML@fda305edfe Some more tidying up of the exit handling
MinecraftForge/FML@b087f60c33 More cleanup of exit handling, also add a couple more noise classes to the list of things ignored.
MinecraftForge/FML@d6358a466b Cleanup override warnings
MinecraftForge/FML@af7a58b9e5 Update to legacylauncher 1.10 and asm 5.0.3
MinecraftForge/FML@e6d00440a6 ItemStack swapping
MinecraftForge/FML@8597e45a0e Fix NPE from a boolean
MinecraftForge/FML@b9b9daa8a9 Fix ups from feedback.
MinecraftForge/FML@d89165021f Mark the promise a success in the outbound handler.
MinecraftForge/FML@2e5ccf7988 Update for launchwrapper 1.11. Fixes java 6 compatibility.
MinecraftForge/FML@641250d853 Fix java 8u20. Closes #501 and a bunch of other bugs too.
MinecraftForge/FML@292be72639 Allow client handshake to be reset by server to support BungeeCord.
MinecraftForge/FML@092873fbe5 Merge branch 'bungeecord' of github.com:bloodmc/FML
MinecraftForge/FML@134f2f8e88 Fix bug with entityspawn - if the entity doesn't extend livingbase, it fails to write a headyaw byte, and everything will be derped for that packet.
MinecraftForge/FML@4852de81e0 Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489
 2014-08-30 00:16:46 -04:00
Adubbz
0d93bec5e7 Fixed biome weights not working with non multiples of 10 2014-08-30 10:35:05 +10:00
Bernhard Bonigl
53294b843b Write the correct default value for StringList comments in the config 2014-08-15 15:57:44 +02:00
Lex Manos
ba69a1a6fd Fix AIOOB in BiomeDictionary. Closes #1326 2014-08-14 20:33:23 -07:00
LexManos
948f7145d1 Merge pull request #1187 from Abastro/skylight 
Skylight Hooks for Minecraft Forge
 2014-08-11 16:00:11 -07:00
Abastro
f590ce8641 Skylight Hooks for Minecraft Forge 
Mainly for solar/lunar eclipse.
 2014-08-11 15:42:07 +09:00
LexManos
261ba628df Merge pull request #1217 from Glassmaker/patch-1 
Adds getLocalizedName and getUnlocalizedName to FluidStack
 2014-08-10 01:42:24 -07:00
ShetiPhian
22609b1d54 Legacy Liquid Load Fix 
nbt.getString("FluidName") no longer returns null, it returns an empty string.

This patch allows legacy liquids to be resolved once again.
 2014-08-05 21:08:53 -04: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
skyboy
5f8d501ed6 Add EntityFishHook AT 2014-08-03 19:52:59 -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
rwtema
eeb701cb16 Fixed ItemFluidContainer always draining the maximum amount, regardless of the amount remaining. 2014-07-31 20:52:52 +01:00
zarathul
7a1de8c13d - Added drainFluidContainer() and getContainerCapacity() helper methods. 2014-07-30 13:23:52 +02: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
skyboy
906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
Lex Manos
b2dddf545b Fixed NPE that happens sometimes when exiting the game witout fully loading a world {main a dev-time thing} 2014-07-16 18:36:12 -07:00
bspkrs
e35755c3e3 Fixed missing assignment of constructor arg (thanks @Lunatrius) 
I must have edited this out when I was cleaning up my formatting commit spam.
 2014-07-15 09:47:01 -04:00
Glassmaker
ff2696dff8 Adds getLocalizedName and getUnlocalizedName to FluidStack 2014-07-10 15:25:53 +03:00
cpw
27d5dc0a25 Add a system property for the stencil, in case config is not available.. 2014-07-09 10:59:33 -04:00
Lex Manos
af9229d3bc Add ability for modders to designate custom biome types. And remove note about automatically registering. Closes #1167 2014-07-07 21:29:37 -07:00
LexManos
7d24c2259b Merge pull request #1199 from Adubbz/master 
Enhanced the Biome Dictionary
 2014-07-07 19:50:56 -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
Adubbz
8d2ebdf25f Enhanced the Biome Dictionary with tags based on temperature, vegetation, moisture, trees and others 2014-07-08 12:09:44 +10: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
7c016d9ee8 Merge pull request #1210 from Ghosrec35/master 
Added Javadoc comments for Forge Event documentation.
 2014-07-06 17:16:46 -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
Alex
c410a2d9fc Added Javadoc comments for Forge Event documentation. 2014-07-06 18:41:11 -04:00
LexManos
d889765b10 Merge pull request #1159 from ganymedes01/master 
Added FluidStack sensitive version for Fluid's localised name
 2014-07-06 12:06:58 -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
Gerard Bruwn
aca429f17b Add RenderItemInFrameEvent 2014-07-01 09:58:44 -07: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
Lex Manos
219f5adf61 Add config option to disable attempting to creat screen with Stencil Bits. 2014-06-29 18:42:48 -07:00
bloodshot
2bfda259fa Fixed wrong method call in ChunkIOProvider. 
When a chunk fails to load async, we fallback to the original sync method.
In this case, it was calling the async method twice which ended up causing
a stackoverflow.
 2014-06-29 14:27:37 -04:00
bspkrs
f8be9a237c fixed compounding quotes issue with category names that require quotes when save is called more than once 2014-06-26 16:31:27 -04:00
cpw
ebf0e7617a Update to MC 1.7.10, bump to 10.13.0 
MinecraftForge/FML@bc420dcb0b Fix Eclipse launching attribute
MinecraftForge/FML@1e0134a1ca Merge pull request #455 from rumickon/feature
MinecraftForge/FML@1c5db211af Update for release 1.7.10
MinecraftForge/FML@79a0c5e559 Merge branch 'mc179'
 2014-06-26 15:07:51 -04:00
cpw
32e577d5bf Fix API incompatibilities. Should mean mods will work with new config changes. 2014-06-26 14:45:43 -04:00
luacs1998
23c6d0ef55 Update mc version string 
Or was I not supposed to?
 2014-06-26 09:03:22 +08:00