Commit graph

328 commits

Author SHA1 Message Date
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
LexManos
a2f4a0d2dd Inital update to 1.4.6, Version bumped to 6.5 2012-12-17 22:33:28 -08:00
LexManos
2bdcc3a23a Remove erronious double call to PlayerDestroyItemEvent 2012-12-16 18:02:45 -08:00
LexManos
be6667f733 Make PlaySoundAtEntityEvent fire for players as well 2012-12-16 18:02:11 -08:00
LexManos
ad42901b7e Update patches for repackage. 2012-12-12 23:45:35 -08:00
LexManos
0e82a3952d Creative GUI will now remember what tab page you were on, thanks Matchlighter PR #290 2012-12-12 02:11:27 -08:00
LexManos
ee0763fb4a Add CloudRenderer for PR #304 2012-12-12 01:35:18 -08:00
LexManos
03f1418924 Updated FML to 486:
02b54ca8: Add a modid on the mods list, should make it easier to do things like forge chunkloading config
70670f2f: Fix build eclipse extractor task
b9fa3fc9: Add in storage, detection and validation of the ItemID array between client and server
5e5d8206: Fixing id map generation - should validate correctly now
f9fc06a8: Remade python dist as 32-bit.
93d47a1c: Reenabled replacement of the eclipse folder.
2012-12-10 15:53:30 -08:00
Christian
957afc4d62 Move server specific patch back to common from minecraft.
Update FML: 1f5c58b
1f5c58b Fix up MCP version
61e4db2 Merge joined.exc add update howto
5efc1eb Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone sho
3b3600d Modified merger to just consider all server classes as common. And moved
edcc5ca Forgot mcp.cfg
ca79dfe Updated to 1.4.5b
5945279 Fix python error
57bf643 Modified decompile so that we do not have to decompile the server, saves
d9d0a46 Cleaned up some tabs
2fac644 Change usage of ZipFile, fixes issues with Mac's default instation of py
2012-11-20 09:09:06 -05:00
LexManos
5bc4d22bdd Updated to MC 1.4.5b 2012-11-19 16:03:52 -08:00
Christian
ba65c08f19 Remove EntityFX patch - moved to FML. Patch SuspiciousClasses to add "forge"
Update FML: fa56701
fa56701 Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
96935bb Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. Fix NPE for FML crash report on server. Clean up dead pa
2012-11-16 23:06:37 -05:00
Christian
f13200e16a Fix the derpy torch flames properly. Closes MC-2497 properly ;) 2012-11-16 19:07:36 -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
5f2d1d1fc0 Add an ItemStack sensitive version of getIconForRenderPass, defers to
existing by default. Should allow NBT data to affect multipass icon rendering.
2012-11-13 16:01:57 -05:00
LexManos
5b82c5c20e Mods can use custom textures for Slot background overlay, instead of only items.png PR #245 and #246 2012-11-12 17:26:49 -08:00
LexManos
ba6c4dd7df Fix entity items rendering on the ground. 2012-11-09 16:21:23 -08:00
LexManos
e73cbd088f Update to 1.4.4 2012-11-08 20:19:12 -08:00
Christian
0f3b030a1d Temporary update for 1.4.3
Update FML: bd2123c
bd2123c Clean up some patch fuzz
c2a603c Update joined.exc file from latest conf
db12af4 Update to 1.4.3
2012-11-02 18:40:43 -04:00
LexManos
c19ae55885 Update FML: Updated MCP mapings, and fixed StartServer 2012-10-31 10:16:46 -07:00
LexManos
9aca08557d Fix issue where scroll bar would not render when switching tab pages. 2012-10-28 05:57:56 -07:00
LexManos
f6a7ea063b Changeable name tag render distance for PR: 174 2012-10-28 05:33:32 -07:00
LexManos
043f570ff9 Update to MC 1.4.1 and Forge 6.0.0 2012-10-23 16:04:58 -07:00
LexManos
717b80781b Fix color issues with Dyed Leather armor. 2012-10-23 05:24:36 -07:00
LexManos
dc9b1d90bd Fix NPE issue when mods add null EntityFX's to be rendererd. 2012-10-21 22:59:57 -07:00
LexManos
067458bdc0 Patches removing forge spawn protection, now a vanilla feature. 2012-10-21 10:21:39 -07:00
LexManos
c81f696cd7 Updated Render patches, Bipeds now have the ability to have helmets, of either blocks, or the new 'heads' 2012-10-21 10:19:17 -07:00
LexManos
fd1f09a34e Patches that applied with little to no functional changes. 2012-10-21 10:16:55 -07:00
LexManos
9eeda7b4db No longer needed, getRenderDistance removed because Vanilla has it now, TileEntity.func_82115_m 2012-10-21 10:05:02 -07:00
LexManos
305a1ef66b Moved to common where it should be 2012-10-21 10:02:23 -07:00
LexManos
34ebfcd978 Added ability for mods to cleanly define and display new creative tabs. 2012-10-19 08:46:39 -07:00
LexManos
91e88afdbe Allow hook into GuiSlot for background rendering for PR #203 2012-10-14 20:00:30 -07:00
iChun
528a295401 Fix not passing right render pass to Item class. 2012-10-05 03:57:52 +08:00
Christian
b82a462f64 Fix a problem with re-entering worlds too quickly- the worlds will now *always* save before the menu re-appears. 2012-10-04 00:07:59 -04:00
Christian
518264eff9 Merge branch 'master' of git://github.com/Chicken-Bones/MinecraftForge into Chicken-Bones-master 2012-10-03 01:57:56 -04:00
XCompWiz
babc12d2b5 MapStorage Fix
Fixes setting and timing of map storage object to allow for the
WorldProvider to use it during initialization
Forces single instance of map storage object (per side)
Moves setting of spawn to after provider setup
2012-10-03 02:41:32 +03:00
Chicken Bones
7208c2c059 Add some of the model subsystem to the server. The part that doesn't require openGL. This allows for systems that dual models as collision/selection boxes etc. 2012-10-01 11:10:09 +10:00
LexManos
520550dab9 Location aware version og Block.lightOpacity for PR #169 2012-09-26 22:12:47 -07:00
LexManos
0e5c0be23e Added preliminarty Player Interact event heavily based on the bukkit event. 2012-09-26 21:18:18 -07:00
LexManos
44e3843edb Fix bug where breaking texture would not apply to top/bottom of beds. 2012-09-26 12:19:16 -07:00
Christian
384f795d52 Some more tweaks to the chunkloading code. The world.load event fires slightly later- once the entity watcher is
set up, so entities can actually load into the server world. Also, tickets actually save and load properly
and null entities don't break the server
2012-09-25 19:12:10 -04:00
Christian
0fd2b137ac Some more fixes for chunkloading code. Works very reliably now. 2012-09-23 23:08:38 -04:00
LexManos
cf3bc6a9d9 Redirect a lot of functions through WorldProvider for Mystcraft, allowing them to be overriden by the provider. 2012-09-18 21:31:17 -07:00
LexManos
c2d53e7651 Added side sensitivity to standard EntityDiggingFX, added Block functions to override spawning of digging and breaking effects. 2012-09-18 19:23:36 -07:00
LexManos
62700fa7a8 96537dc - Fixup Item in hand rendering of textures > 16x
e88ddc5 - Make the exception print for headless servers if the Downloader cant initalize.
f24ff07 - Remove a bunch of warning about javadoc, not a real fix, but no more warning.
3420ea7 - Update MCP Mapings
87104f0 - Makes GetModSrc check the common folder when attempting to extract source files
640446b - Tie parent/child containers together again. Should close #96
2cf4917 - Village mating produces added villagers, and the egg should place added villagers too. Closes #97.
6394ee8 - Clean up stale references to the Player stored in the NetworkRegistry, closes #100
7299e05 - Merge pull request #99 from CovertJaguar/patch-1
c4bd040 - More readable init logs
2012-09-15 19:36:08 -07:00
LexManos
4524435e25 Fix a few patch fuzzes 2012-09-11 15:51:26 -07:00
LexManos
848837bd5c EntityLiving variation of drawBlockDamageTexture to allow for Non-player viewports. 2012-09-11 12:46:40 -07:00
Christian
98e17b10b2 Update FML: 70f55c5
70f55c5 Add in exclusion list for IFMLLoadingPlugin.
1c1716d Remove debug cruft
d567f79 To properly align with packet9respawn, make packet1login's dimension an int as well
ecd4e46 Attempt to build some protocol negotiation, and fix packet1login so that the dimension is a short, matching packet9respawn
16fe495 Compatibility level is now passed from server to client - and the client tracks it. This means certain packet changes can be made without b
4f70d23 Fix dependency checking: you can depend on specific versions of FML
2012-09-08 21:17:05 -04:00
LexManos
437d83e9b3 Fix placing torches and the like on inverted woden slabs. 2012-09-05 22:06:32 -07:00
Christian
c4852b02c3 Update FML: 12bc4ba
12bc4ba Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff
8fccfa2 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom chat messages rather than
a697d04 Rescan mod packages where there was a possible mod identified to try and make sure we load it. Fixes Matmos r16
2012-09-04 19:24:48 -04:00
Christian
955904e6b2 Update FML: c90a853
c90a853 Fix up addRenderer to catch exceptions from the basemod, also, addrenderer now supplies a list of the default renderers from MC for editing and will note the
18069d8 Change download location for FML libraries to files.minecraftforge.net, add an encoding param to the javac command line to force utf 8
a40f4a7 Add in random jar/zip files to the classpath. UGH this is so fucking ugly it's not funny.
5b6460b Use a null socket and try to prefer the result of getLocalHost in the broadcast data.
2012-08-31 12:37:15 -04:00
Christian
1a9f9185f4 Update FML: c0d1348
c0d1348 Add in an ItemRenderer null check so FML can run render adding mods
482c163 Inverted boolean logic. Grrr.
221d113 ModLoader mob spawns use packet 24- build a bypass system so that they can still use it
f19f426 Remove debug statements
2012-08-29 15:40:59 -04:00
LexManos
0b1997a9e6 Made helper hooks for EntityLiving and EntityRenderer hooks for Optifine 2012-08-22 18:02:14 -07:00
LexManos
dd5543b90d Update FML to 304:
Client side only classes are properly annotated, and denied loading on server side
Added missing client side only ModLoader.getContainerGUI function
Guis work for FML mods now.
Fixed MLProp handeling of null info
Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry
2012-08-21 12:46:35 -07:00
LexManos
d5610afdff Updated onItemUseFirst call to include the new hit vector information, and updated readme. 2012-08-19 21:06:32 -07:00
heldplayer
59c77d7ca4 Adds a SkyProvider class that can handle the rendering of the sky 2012-08-18 21:05:21 +02:00
LexManos
21b4525643 Added timeout to MC's download of sound resouces. 2012-08-17 13:32:20 -07:00
LexManos
db6ac47689 Merge pull request #121 from Draake/master-pr1
Added additional sound events to allow for low level information.
2012-08-15 16:03:01 -07:00
Draake
bd78b40bcd Removed SoundSetListenerEvent implementation. 2012-08-15 14:46:35 -07:00
LexManos
fc430243d1 Rename Orientation to ForgeDirection {Damn MCP naming a class Direction already} 2012-08-15 04:28:09 -07:00
LexManos
06aaa9e9a4 Add render distance property to TileEntity. 2012-08-15 02:18:23 -07:00
LexManos
2a8a917fdd Update release script to create universal binary distro. 2012-08-13 22:28:23 -07:00
Draake
ddd406bad3 Added additional sound events to allow manipulation of a sound source at its creation. 2012-08-13 18:36:55 -07:00
LexManos
83f7a57199 Fixed ItemRenderer not grabbing custom texture files properly for block items 2012-08-12 20:40:04 -07:00
LexManos
6b4288d00f Updated FML, fixed custom tool hooks, and spawn protection/player reach hooks. 2012-08-11 14:45:48 -07:00
LexManos
ba55320462 Fixed Diemsnion API related NPEs, and updated FML to 231. 2012-08-11 03:08:09 -07:00
LexManos
55636eabab Updated FML, updated patches 2012-08-10 20:30:59 -07:00
LexManos
f374723610 Update fml, impelemnted Diemsnion API stuff. 2012-08-10 18:15:10 -07:00
LexManos
acdcfd0a56 Added new pick block hook for blocks and entites to allow for better grained control of the result. 2012-08-10 02:09:11 -07:00
LexManos
f31b8a98a9 Cleaned up some more, fixed infinite loop with cancelable annotation, Client now compiles and enters world just fine. 2012-08-09 16:47:35 -07:00
LexManos
dae4a07c60 Updated Client side patches for the new Merged MCP workspace. 2012-08-09 03:06:41 -07:00
LexManos
316bf8d448 Finished World and EntityMinecart patches. 2012-08-07 16:54:14 -07:00
LexManos
41f1a60f32 More conversions, added all the entity living events. 2012-08-07 01:24:06 -07:00
LexManos
4e91293271 More work, moved over packet stuff, need to change everything to use new NetworkMod system 2012-08-06 20:45:37 -07:00
LexManos
e58129ddd2 A bulk of more patches converted, updated fml 2012-08-06 17:52:23 -07:00
LexManos
31a908b754 More patches converted.
Refactored some of the events to be a better hiarachy.
2012-08-06 15:07:53 -07:00
LexManos
80ad4be5b1 Some more patch migration before bed. 2012-08-06 03:54:57 -07:00
LexManos
d286154997 More progress on converting patches from 1.2.5 2012-08-06 03:35:57 -07:00
LexManos
545b905f11 Implemeneted adding grass seeds, as well as IShearable for BlockTallGrass 2012-08-05 19:41:18 -07:00
LexManos
cc74f7d7d0 Implemented BonemealEvent (IBonemealHandler replacement), and bonemeal making grass. 2012-08-05 19:15:13 -07:00
LexManos
2d7deacead Renamed MinecraftForge.eventBus to EVENT_BUS as it's constant. 2012-08-05 19:14:02 -07:00
LexManos
1fb042621c First push of some small patches and introduction of basic events. As well as the first cases for Forge's Access Transformer 2012-08-05 03:20:07 -07:00
LexManos
247ff9b737 Updated update_patches.py, and made first patch! 2012-08-04 22:50:54 -07:00
LexManos
c2d851cf20 Get rid of all old patches 2012-08-04 00:00:31 -07:00
LexManos
6eb4353b95 Rebase 2012-08-01 17:41:34 -07:00