Compare commits

...
4691 Commits
Author SHA1 Message Date
cpw c3eed2f0da Fix up release jsons to clean up extraneous netty references 2016-05-11 11:20:43 -04:00
Fry ad40f24fb1 Merge pull request #2322 from bonii-xx/dynbucket
Fix bucket replacement not loading the bucket model by itself if repl…
2015-12-29 15:34:59 +03:00
Bernhard Bonigl 509cc79112 Fix bucket replacement not loading the bucket model by itself if replacing buckets.
This happens when no other mod that uses the bucket model is present.
Also added a simple method for registering the bucket model, should give
modders an idea on how to use the general model.
2015-12-29 13:31:35 +01:00
LexManos cce0f7a2ed Merge pull request #2320 from bonii-xx/slime
Add a hook for custom particle spawning for slimes
2015-12-28 13:17:28 -08:00
Bernhard Bonigl 7f52bc6547 Add a hook for custom particle spawning for slimes 2015-12-28 21:01:30 +01:00
LexManos 7298b21cb5 Merge pull request #2318 from diesieben07/entity-egg
Allow forge-type spawn-eggs to spawn child entities when clicking EntityAgeable
2015-12-28 07:12:39 -08:00
Take Weiland af1e769895 Allow forge-type spawn-eggs to spawn child entities when clicking EntityAgeable 2015-12-28 15:58:37 +01:00
LexManos d2248c3774 Fix Button/Torch/Lever placement on stairs and slabs. Closes #2291 2015-12-27 14:39:29 -08:00
RainWarrior 1cd0bf9ee4 Fixed random block position offset not applying correctly. 2015-12-25 09:31:32 +03:00
RainWarrior 097c0c6130 Added an ability to register custom item variants, not ending with "#inventory". Should allow grouping multiple item models into 1 blockstate json. 2015-12-24 06:06:38 +03:00
cpw a54b939ea3 Try and make sure active substitutions are immediately available in the block to item map. 2015-12-23 16:41:53 -05:00
cpw 95825e5de0 Actually use the delegate for the itemblock 2015-12-23 15:55:45 -05:00
cpw 54e9a36b67 Capture ItemBlock remaps. 2015-12-23 15:07:16 -05:00
cpw 53227982e3 Try and fix registry NPE when substitution is active. 2015-12-23 14:11:17 -05:00
cpw bcecf59a87 Blocks are no longer erased from the registry if the mod isn't present. This means that modded blocks can potentially retain their IDs
even if they are temporarily not present in the game. Currently TileEntity data associated with the block is erased.
2015-12-23 11:18:54 -05:00
cpw 5562c14c45 Fix up persistent substitution. Should close #2259 2015-12-23 10:37:11 -05:00
cpw d8ca68b280 Fix the channel handler naming. It now uses the standard netty namer for it, by careful use of cunning reflection. 2015-12-22 18:12:35 -05:00
LexManos 6a8a9b3097 Fixed vanilla bug related to spawning entities on top of fences. Closes #2303 2015-12-22 11:52:36 -08:00
LexManos cb609dbab3 Fixed registry issues that prevented connecting to 1.8 Forge servers.
More precisely: Servers with missing registries default back to frozen version.
Throw descriptive error if we do not have any information.
2015-12-21 13:42:40 -08:00
Fry c7790f7b35 Merge pull request #2282 from bonii-xx/dynbucket
Add a dynamic bucket model that displays the animated liquid contained
2015-12-22 00:26:25 +03:00
Bernhard Bonigl 4f6784b733 Add a dynamic bucket model that displays the animated liquid contained
Has a config option (default off) that replaces the vanilla buckets with the forge bucket model

New original bucket textures from mr_hazard
2015-12-21 22:22:40 +01:00
RainWarrior 56f35f4401 Fixed NPE caused by accessing undefined layer in MultiLayerModel. 2015-12-20 22:16:17 +03:00
LexManos f8473adf6f Merge pull request #2293 from Lunatrius/fix/client-command-autocomplete
Fix client side command auto-complete not working correctly.
2015-12-19 11:31:43 -08:00
Lunatrius b665026378 Fix client side commands adding parts of the color codes on autocomplete (prefix "7" and suffix "r"). 2015-12-19 12:55:26 +01:00
RainWarrior 1dcc9abab2 Fix dependency resolution for models with custom data/textures. 2015-12-17 04:41:54 +03:00
RainWarrior 80ba13be89 LightUtil.pack and .unpack now work correctly with unpacked arrays of size <4. 2015-12-15 23:31:09 +03:00
RainWarrior d67c57827a Delayed quad list resolution in MultiModel, fixes NPE in MultiLayerModel. 2015-12-15 23:03:09 +03:00
RainWarrior f0ae51bb34 Forge pipeline will now take original model lightmap into account, if present. 2015-12-15 22:27:01 +03:00
RainWarrior 7c4d643de2 Fixed java6 errors in previous commit. 2015-12-15 22:27:01 +03:00
RainWarrior 86c09722a0 IModel can now depend on a variant definition (ModelResourceLocation); added MultiLayerModel - simple model that'll render correctly in multiple layers + example of using it. 2015-12-15 21:49:19 +03:00
RainWarrior d6ee373e87 Preparations for the Animation system.
Changes to the Model API - IModelState now works with Optional. Handling of parts of the model is not optional, and coordinate space/result interpretation is up to the caller. IModel doesn't extend IModelPart by default anymore; MapModelState uses composition to achieve previous functionality, IModelPart implementations are disjoint now. Updated perspective handing to the new API, removed IPerspectiveState (MapModelState is now the same thing). Perspective transforms for the default fluid model.
2015-12-14 23:27:27 +03:00
LexManos 9032f7e37e Fix enchanting applying the same enchantment multiple times. Closes #2273 2015-12-14 03:49:58 -08:00
cpw 82537e5763 Merge pull request #2272 from AlgorithmX2/addLandingEffects
Added addLandingEffects allowing mods to override landing particles
2015-12-13 17:09:13 -05:00
cpw bf779e6803 Merge pull request #2270 from AlgorithmX2/getHighlightTip
Add getHighlightTip allowing a item to override its displayed renderToolHightlight
2015-12-13 17:00:02 -05:00
AlgorithmX2 a319adba53 Added addLandingEffects allowing mods to override landing particles, for blocks that require world information to determine textures. 2015-12-13 15:35:15 -06:00
cpw 94eadab9fd A test for issue #1848. Please try this with any mods you can @ 1.8.8, and see if you still get log spam of any kind (not just the
log message from the issue either).
2015-12-13 14:22:53 -05:00
AlgorithmX2 8db720151d Add getHighlightTip allowing a item to override its displayed renderToolHightlight. 2015-12-13 04:47:25 -06:00
LexManos 2ed4f39a13 Merge pull request #2268 from minzmann/master
[1.8.8] Minor Fixes to PotionEffect.java.patch
2015-12-12 19:48:23 -08:00
cpw 0632f2aadf Fix derpage when loading a 1.8 world, with persistent state being entirely ignored in that case. 2015-12-12 18:53:44 -05:00
minzmann bf6c31c879 Update PotionEffect.java.patch 2015-12-12 17:05:14 +01:00
LexManos c6d64cd94a Merge pull request #2239 from bonii-xx/potionhiding
Add shouldRender() to Potions that allows to hide them completely in …
2015-12-12 00:18:18 -08:00
cpw cef50616d8 Merge pull request #2228 from Minecrell/patch-2
Fix some issues with the console command completion
2015-12-11 15:42:06 -05:00
cpw 3631955641 Use ItemStack.hasEffect. closes #2230 2015-12-11 15:30:43 -05:00
cpw 46840fb71a Merge pull request #2233 from liachmodded/mcl-typo
Fix a typo in jar detection
2015-12-11 15:16:24 -05:00
Fry 5fd04595f2 Merge pull request #2248 from AlgorithmX2/isOpaqueFace
Added doesSideBlockRendering to provide finer grain face culling.
2015-12-11 22:57:40 +03:00
AlgorithmX2 ea75a3be69 Added doesSideBlockRendering to provide finer grain face culling.
Implemented for BlockStairs and BlockSlab.
2015-12-11 13:42:04 -06:00
LexManos c356105e6d Fix wrong EventType passed for Emerald ore-gen. 2015-12-10 12:41:48 -08:00
LexManos dcda451a0a Deprecate int IDs in FluidRegistry. Modders should only ever use the String name. Also add a 'friendly' exception when attempting to get an ID for a unregistered fluid. Closes #1374 2015-12-10 02:54:00 -08:00
LexManos 2302963a9f Add EMERALD and SILVERFISH to GenerateMinable event. Closes #1158 2015-12-10 02:16:58 -08:00
LexManos b9d1d92654 Fixed ModList GUI rendering incorrectly. Closes #2254 2015-12-10 01:01:51 -08:00
LexManos 3f163fd41e Merge pull request #2253 from simon-i1-h/patch-1
[1.8.8] Fixed edge case where position dependent light would not update.
2015-12-09 20:07:50 -08:00
simon-i1-h 4c4223a817 Fixed that oldLight is not being used. 2015-12-10 00:40:58 +09:00
RainWarrior 724405d6d8 Workaround for https://github.com/google/guava/issues/738 2015-12-09 14:56:01 +03:00
RainWarrior 3254e2acc6 Fixed orientations of generated item faces. Fixes #2215. 2015-12-08 12:26:02 +03:00
LexManos 12cd28715a Fixed colored leather armor, and custom armor textures. 2015-12-08 00:54:27 -08:00
LexManos 01f4a627be Remove MCP reference patches. 2015-12-08 00:34:42 -08:00
Bernhard Bonigl 2324c2fd20 Add shouldRender() to Potions that allows to hide them completely in the inventory 2015-12-05 10:09:02 +01:00
Minecrell bb3596b31e Improve the console command completer
- Fix space after command getting removed when completing a
  subcommand together with the command prefix
- Add support for completing without input (shows command list)
- Sort command completion results
- Fix console spamming command prefixes after closing the input stream
2015-12-04 16:50:07 +01:00
cpw 30bc2653c5 Add a flag to the modidremapping event. If the remapevent is because the registry is refreezing, it'll be true. 2015-12-03 17:21:04 -05:00
liach ee61baee73 Fix typo in guava 2015-12-01 22:01:21 -08:00
cpw f8447264e6 Clean up chunk patch. 2015-12-01 19:54:40 -05:00
LexManos 4416537776 Merge pull request #2231 from techbrew-mc/patch-1
Initialize sources list
2015-12-01 16:04:56 -08:00
techbrew-mc 606b402c2d Initialize sources list
Fixes crash NPE thrown by addFile()
2015-12-01 16:02:45 -07:00
cpw 31faf63e94 Most requested feature of all time? TileEntity init method called after it's ready to roll. remove all the if (firstTicks) 2015-12-01 15:20:10 -05:00
cpw e6681ada93 Merge branch 'Emberwalker-lang-adapter-fix' into 1.8.8
Closes #1898
2015-12-01 14:43:42 -05:00
Arkan Emberwalker 7a960edb35 Fix language adapter loading.
The language adapter is now properly picked up after the mod is loaded
on the classpath, fixing the ClassNotFoundException occurring before.
Also fixed some minor formatting and made it throw a full
RuntimeException on failure.

Fix up some formatting
2015-12-01 14:43:14 -05:00
cpw a703367553 Be noisy when API is in a coremod. It'll never work and modders should realize that fact. 2015-12-01 13:08:35 -05:00
cpw 8e9feb21fa Merge branch 'mezz-potionIsBadEffect2' into 1.8.8 2015-12-01 09:03:23 -05:00
cpw d967c6d5d4 Merge branch 'potionIsBadEffect2' of https://github.com/mezz/MinecraftForge into mezz-potionIsBadEffect2 2015-12-01 09:02:36 -05:00
cpw 5087f30ca5 Merge branch 'kashike-fix/secman' into 1.8.8 2015-12-01 08:47:52 -05:00
cpw 413f380781 Merge branch 'fix/secman' of https://github.com/kashike/MinecraftForge into kashike-fix/secman 2015-12-01 08:47:26 -05:00
cpw 8187f48ddc Allow entity selectors to select "." in entity names. Closes #2125 2015-12-01 00:14:05 -05:00
cpw a2e06d968e Merge branch 'Minecrell-jline' into 1.8.8 2015-11-30 14:16:18 -05:00
cpw ff42107b92 A few fixes 2015-11-30 14:14:56 -05:00
cpw cf4c0ca001 Fixup Jline integration 2015-11-30 14:14:03 -05:00
cpw 321665efff Merge branch 'jline' of https://github.com/Minecrell/MinecraftForge into Minecrell-jline 2015-11-30 13:14:49 -05:00
cpw 55e707cc07 Some tweaks - GameRegistry is modder facing API, so avoid having MC methods there. Fix a couple of registry bugs. 2015-11-29 23:12:34 -05:00
cpw 0af45cbf25 Merge branch 'PotionRegistry2' of https://github.com/bonii-xx/MinecraftForge into bonii-xx-PotionRegistry2 2015-11-29 22:43:23 -05:00
cpw d58ad8db68 Fix problem with spam from registry on loading a second world. Empty the staging. 2015-11-29 22:41:11 -05:00
Bernhard Bonigl 57d1a657a0 Add a PotionRegistry to handle dynamic distribution and remapping of Potion IDs 2015-11-29 22:02:55 +01:00
LexManos a13ed35031 Merge pull request #2209 from lumien231/MemoryWorldLeak1.8.8
Fixed: Server not being stopped, causing Worlds to stay loaded
2015-11-28 16:51:38 -08:00
cpw 21173c3b65 Fix up blockstate rebuild. Closes #2221. Also fix formatting. IDEA has differences. Solved now. 2015-11-28 16:31:54 -05:00
LexManos 02e9b9d99c Add chunk loading protection to WorldSever.getTileEntitiesIn, may prevent orphanced chunks and a CME in EntityPlayerMP. Note: The 'max' parameters are NON-inclusive. 2015-11-28 03:36:33 -08:00
cpw 97ef6a5d1f Giant registry fixup 2015-11-28 03:07:53 -05:00
LexManos 5549b06f96 Compiler warnings pass, undeprecated SplashProgress related stuff. 2015-11-26 19:38:21 -08:00
LexManos e2818a2803 Removed IItemRenderer class, all functionality is possible with new rendering system. 2015-11-26 19:37:44 -08:00
LexManos d878a2ae26 Fixed Large mushrooms generating incorrectly. 2015-11-26 19:36:53 -08:00
LexManos 81f9f3f20d Fixed placing blocks on snow layers with more then one layer. 2015-11-26 19:36:38 -08:00
LexManos eb26b3ca0f Bump version for new Minecraft version. 2015-11-26 17:05:45 -08:00
cpw 7e5a2cb5ca Propogate AbortException. Closes #2206. Also fix tracing printstream when printStackTrace is called. 2015-11-25 16:28:06 -05:00
Lumien 2ecc92c4b3 Fixed: The Integrated Server not being stopped when exiting a singleplayer world to the main menu 2015-11-25 20:54:48 +01:00
cpw cb2d5992d2 Add .exc for StatList patch
More tweaking
2015-11-25 02:23:21 -05:00
cpw cde6be7742 Fix up a couple of patches, affected by the recent update 2015-11-25 02:23:21 -05:00
cpw 4f2feee931 Fix button and lever placement problem. Closes #2204 2015-11-24 22:00:27 -05:00
cpw 1351215182 Merge pull request #2205 from Illyohs/bugfix/mdk
[1.8.8] Remove trailing */ causing errors in the mdk build script
2015-11-24 21:15:26 -05:00
Anthony Anderson 91fe229bf0 Remove trailing */ in the build.gradle
Signed-off-by: Anthony Anderson <[email protected]>
2015-11-24 20:10:02 -05:00
cpw 85d7b69d19 More cleanups, some documentation, a bunch of deprecations. 2015-11-24 16:47:46 -05:00
cpw c5a980f8a4 Cleaning up some derpy names 2015-11-24 16:17:08 -05:00
cpw 8c5038c301 Clean up some very long dead code. Bukkit hasn't existed in a very long time now. IASM never worked, and I'm not about to implement it. 2015-11-24 15:52:14 -05:00
cpw f227f4ff72 Deprecate it as well, because hey, it's redundant now. 2015-11-24 15:39:18 -05:00
cpw aa40a8edd7 ONE EVENT BUS TO RULE THEM ALL AND IN THE DARKNESS FIRE THEM! 2015-11-24 15:35:24 -05:00
cpw 44c4011575 Yeah, amount is NOT deprecated. 2015-11-24 15:30:22 -05:00
cpw 1280462ec7 Fix MDK for 1.8.8 using FG2.1 snapshot 2015-11-24 15:30:09 -05:00
cpw c713309769 OMG! Documentation? WUT? I haz lost my mind.
Also, Functional interface for IMC. Senders can send a classname implementing Guava's function, and receivers
will be able to get that function, and do, well, whatever, really. Probably best for those callback type
scenarios, connecting up APIs and stuffs.
2015-11-24 14:44:19 -05:00
cpw b4dc15a9cb Cleanup Fluid deprecations stuff. 2015-11-24 10:05:35 -05:00
LexManos 22e99a2cff Update universal manifest for 1.8.8's json. 2015-11-24 03:37:17 -08:00
cpw 68dfcccd57 Update mappings to 20151122. 2015-11-23 23:18:52 -05:00
cpw 84c3ef0f5c Merge branch 'master' into 1.8.8 2015-11-23 22:39:49 -05:00
cpw 231ec7eaea Merge remote-tracking branch 'origin/noci-1.8.8' into 1.8.8 2015-11-23 22:08:42 -05:00
RainWarrior 9815d729b5 Fixed NPE is B3D loader caused by the missing vertex normal; updated the example chest model - it's now has 2 meshes; Updated ModelAnimationDebug - it now uses the new chest model, renders the base with the static world renderer, and only the lid with the TESR. 2015-11-23 10:12:01 +03:00
RainWarrior 11d237f5f2 Fixed forge lighting working incorrectly outside 0x1000000 coordinates. 2015-11-23 06:54:18 +03:00
RainWarrior 0d06ea6758 Removed face doubles from item models. 2015-11-23 06:54:18 +03:00
RainWarrior b5af11a89d Fix holes in generated item models. 2015-11-23 06:54:18 +03:00
RainWarrior f6ab01843c B3D loader: removed 2 redundand null checks, changed constructor args to final to fix (java6?) inner arg error. 2015-11-23 06:54:17 +03:00
RainWarrior f9024d2eb3 Implemented interpolation of TRSR transformations; B3D: added interpolation capabilities to B3DState, animated TESR example in ModelAnimationTest (pure TESR right now, no separation inside the example model between the static and dynamic parts right now). 2015-11-23 06:54:11 +03:00
cpw 918d59d6a6 Fix derpy fir trees in the taiga. So many patches. See if we can find any more mistakes?! 2015-11-22 22:35:21 -05:00
cpw 4320a0f1ed Fix weird patch issue where the this FG commit: https://github.com/MinecraftForge/ForgeGradle/commit/2f0ca9921b961133689d29b807333241010a802d
breaks if the exact end of a line is a srgname. Not ideal, but should work.
2015-11-22 16:27:13 -05:00
cpw 2abca14a05 Small tweak to the OUT/ERR logger - should skip the Throwable stuffs now. 2015-11-22 15:31:06 -05:00
cpw e70fb50b51 Back to srgnames for patches. We should be starting to look OK now. 2015-11-22 00:46:26 -05:00
RainWarrior 82d83feab1 Fixed forge lighting working incorrectly outside 0x1000000 coordinates. 2015-11-22 02:11:08 +03:00
cpw b5815a3b8d Use the 2.1 snapshot for FG 2015-11-21 13:24:02 -05:00
cpw aeff5272f3 Re-add trove and vecmath. Mojang no longer ship them. 2015-11-21 13:23:39 -05:00
cpw 059ba15b5a Fix a typesig that was broken 2015-11-21 13:23:20 -05:00
Minecrell e24c38bbb0 Add jline-based console with colors and tab-completion 2015-11-21 15:06:09 +01:00
RainWarrior c4742aadbc Removed face doubles from item models. 2015-11-21 08:09:38 +03:00
RainWarrior 62d0f01236 Fix holes in generated item models. 2015-11-21 07:45:56 +03:00
Lex Manos 1246f1a791 Fix invalid position passed to isAir/getLight in World.playAmbientSound 2015-11-20 11:18:00 -08:00
LexManos 8b70d770d5 Merge pull request #2196 from Choonster/master
BiomeManager: Fix off-by-one errors
2015-11-19 18:55:41 -08:00
Lex Manos 6e68d8fe74 Fix bold font rendering, Unicode is 2x pixel density of normal. 2015-11-19 18:38:33 -08:00
Choonster 48b82567d2 BiomeManager: Fix off-by-one errors 2015-11-20 11:02:37 +11:00
RainWarrior 07ccf667e4 B3D loader: removed 2 redundand null checks, changed constructor args to final to fix (java6?) inner arg error. 2015-11-19 23:40:44 +03:00
kashike 7689ea4f28 Use the FMLSecurityManager checkPermission(Permission) method for context-based permission checks. Fixes #2067 2015-11-18 15:39:00 -08:00
Lex Manos 767d733948 Enable the normal ModList GUI in game. Use GL_SCISSOR to support the transparent in-game GUI. 2015-11-18 00:28:26 -08:00
Lex Manos 904a30123d Moved client side Block.onBlockDestroyed to after Item.onBlockDestroyed to match server order. 2015-11-17 04:47:43 -08:00
Lex Manos a3a16d6593 Fix incorrect position passes to Block.getExplosionResistance from entities. 2015-11-17 04:46:50 -08:00
RainWarrior 13d7530e43 Implemented interpolation of TRSR transformations; B3D: added interpolation capabilities to B3DState, animated TESR example in ModelAnimationTest (pure TESR right now, no separation inside the example model between the static and dynamic parts right now). 2015-11-16 06:51:39 +03:00
cpw eb73c30b28 This should be everything needed to separate blocks and items completely. 2015-11-14 10:52:03 -05:00
cpw 06a2af3386 Merge branch 'master' into noci-1.8.8 2015-11-14 09:36:08 -05:00
LexManos 41e971ecc9 Merge pull request #2117 from lumien231/master
Fixes Client Login Issue when logging into a non existent dimension
2015-11-14 04:20:34 -08:00
Lumien 39e77bf468 Fix Client Login Issue when logging into a non existent dimension 2015-11-14 12:03:47 +01:00
cpw f4c59a3a5d Remove a suppression 2015-11-13 14:06:16 -05:00
RainWarrior deb26f5c80 ExtendedBlockState, Properties generic updates. 2015-11-13 19:29:44 +03:00
cpw 41c3846c51 Some generic and other warning cleanups 2015-11-13 10:13:47 -05:00
cpw 02e6d581d3 Merge branch 'master' into noci-1.8.8 2015-11-13 09:46:50 -05:00
RainWarrior c5ee4e6451 Model stuff: updated to generics, fixed various warnings, added handling of new perspective types. 2015-11-13 17:23:37 +03:00
cpw fe7f713b67 A few tweaks, things are starting to work now.. 2015-11-13 02:59:43 -05:00
cpw da03639bd7 All the patches done? Some code fixups.. It begins. 2015-11-13 02:32:08 -05:00
cpw a26c4017b1 Fix a newly missing AT. Remove all CL_ references. OBFID is gone. 2015-11-13 00:09:34 -05:00
cpw ce40f91fb0 WorldGen rejects, lots of them. Couple of small fixes elsewhere. 2015-11-12 23:30:53 -05:00
cpw 8f94ff14ff Enchantment,EnchantmentHelper,EntityEnderman,EntityZombie,EntityVillager,FurnaceRecipes,RecipeFireworks,RecipeRepairItem,NetworkSystem,S00PacketServerInfo
PotionEffect,StatList,Session,WeightedRandomChestContent,Explosion,ExtendedBlockStorage,SaveHandler.

All NBT patches seem to have been merged upstream, so removing. The IntegratedServer and MinecraftServer pending queue changes also removed, as fixed upstream.
2015-11-12 22:02:41 -05:00
Lex Manos df56bea102 Bump version for Recomended Build. 2015-11-12 13:48:53 -08:00
RainWarrior 7258d577cd Overlay patch fix: use the correct block position. 2015-11-13 00:05:19 +03:00
RainWarrior b77b036459 EntityRenderer, StringTranslate rejects fixed. 2015-11-12 23:26:44 +03:00
RainWarrior 3a5b7427a1 TextureMap, TextureManager and Stitcher rejects fixed. 2015-11-12 22:42:41 +03:00
RainWarrior e80f66778b Manually updated WorldChunkManager, Chunk and BiomeDecorator patches, removed imports. 2015-11-12 21:26:52 +03:00
RainWarrior bf63855292 ItemBlock, ItemBow, ItemMonsterPlacer, ItemReed, ItemSign rejects fixed. 2015-11-12 20:27:54 +03:00
RainWarrior a8a69775a1 PlayerManager, PlayerProfileCache, ServerConfigurationManager, NetHandlerHandshakeTCP rejects fixed; ItemInWorldManager patch error fixed. 2015-11-12 20:05:25 +03:00
RainWarrior c976ec494e TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed. 2015-11-12 19:27:14 +03:00
RainWarrior 8000e22830 ItemRenderer, RenderGlobal, StateMap, RenderItem rejects updated. 2015-11-12 19:12:58 +03:00
RainWarrior 9deb54b75f RenderEntityItem, RenderPlayer, RendererLivingEntity, LayerArmorBase, ItemStack rejects fixed; changed Armor Layer hook to catch LayerBipedArmor only. 2015-11-12 18:25:08 +03:00
RainWarrior 632c190e6f GuiButton, GuiChat, GuiCreateWorld, GuiIngameMenu, ServerListEntryNormal, GuiStats rejects updated. 2015-11-11 23:30:06 +03:00
RainWarrior b6f91817f0 EntityPlayer patch updated. 2015-11-11 22:21:38 +03:00
RainWarrior 426340fed5 Updated FML Gui methods to WorldRenderer API changes. 2015-11-11 19:17:32 +03:00
cpw 13c7d038eb LoadingScreenRenderer,Minecraft,GuiContainerCreative,PlayerControllerMP,LanguageManager,Locale,SimpleReloadableResourceManager,EntityList,EntityLivingBase,EntityWither,EntityMinecart,EntityPlayerMP
NethanlderPlayClient patch is now in vanilla. The FMLCommonHandler future exception catcher is not needed anymore, it's in Util. The caching of player profiles is now in vanilla (SkinManager).
2015-11-11 10:33:37 -05:00
cpw 5147742049 Delete rejects that I initially processed. 2015-11-11 08:48:04 -05:00
RainWarrior 41bd8a41fa BlockOre, BlockRotatedPillar, SoundManager, EntityPlayerSP, GuiScreen, GuiAchievements, GuiContainer, BlockModelRenderer, ContainerEnchantment, Slot updated manually and imports removed; GitSlot patch updated. 2015-11-11 15:51:32 +03:00
Lex Manos 49d4005805 Merge pull request #2179 from arideus101/patch-1
Fixed issue where custom colored armor wouldn't be colored. (reverted from commit dee0b2084b)
2015-11-11 02:57:06 -08:00
LexManos dee0b2084b Merge pull request #2179 from arideus101/patch-1
Fixed issue where custom colored armor wouldn't be colored.
2015-11-10 17:28:28 -08:00
LexManos 5670868c5e Merge pull request #2177 from gabizou/master
Fix a possible NPE when checking supertypes of interfaces.
2015-11-10 17:24:58 -08:00
arideus101 1f20abde59 Allows Custom Armor Coloring to be done easily 2015-11-10 17:23:58 -08:00
cpw 112c41a707 Merge branch '1.7.10' - fix up some oredictionary and substitution related issues 2015-11-10 18:35:38 -05:00
cpw aa8eaf2b28 Fix firing the remap event. It always fires now, and additionally fires when the registry reverts to frozen.
Most mods refer to the gameregistry for ids they care about, so this shouldn't affect anything significantly,
but if your mod was dependent on their being content in the remap event, and only acting on that content,
empty content means it's "reverted to frozen" state - the state at the start of the game.
2015-11-10 16:40:27 -05:00
Gabriel Harris-Rouquette d08cf58d80 Fix a possible NPE when checking supertypes of interfaces. Closes #2176.
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2015-11-10 11:46:49 -08:00
RainWarrior d31ca0dbd8 EntityAIAttackOnCollide, ServerStatusResponse, MinecraftServer, NetHandlerLoginServer, Vec3, BiomeGenBase, AnvilChunkLoader, ChunkProviderServer, MapGenRavine, MinecraftServer updated; fix in Block, GuiIngameForge; can load the world and play with ~20 more manual error fixes. 2015-11-10 21:47:08 +03:00
RainWarrior df05edaa11 WorldProvider, WorldType, WorldServer, WorldServerMulti 2015-11-10 20:09:49 +03:00
RainWarrior adddfab850 IntegratedServer, World, EnumChatFormatting and EnumFacing 2015-11-10 19:39:41 +03:00
RainWarrior 4c4d1096a7 FontRenderer + Item patch update; WorldVertexBufferUploader patch derp fix. 2015-11-10 01:14:37 +03:00
RainWarrior f20b40fb80 Fix generics and error in the BlockState patch. 2015-11-10 00:42:56 +03:00
RainWarrior e833ee81fb Updated various rendering-related patches and classes to 1.8.8; forge still uses vecmath. 2015-11-10 00:03:39 +03:00
cpw c474da04b3 Two more corner cases in the oredictionary. Should work for all cases now. 2015-11-09 15:20:53 -05:00
cpw 98125a97c9 Patches and rejected patches. Note: some which had imports are not listed here because they need
to be refactored not to have imports.
Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 01:50:45 -05:00
cpw 1a6c816bac Test of mcp patching 2015-11-08 23:09:33 -05:00
Lex Manos bc05bfda4f Fixed Stronghold Library not having anything in it's chests. 2015-11-08 12:53:01 -08:00
Lex Manos ffbad6633d Fixed Open url confirm screen not showing URL. 2015-11-08 12:52:41 -08:00
cpw b1aa31215f regenerate reference patchset at patches.mcp. These will be used to generate a new patchtree under patches. 2015-11-08 15:50:52 -05:00
cpw ff19efe146 1.8.8 initial work 2015-11-08 12:53:56 -05:00
cpw 95b30f5153 Merge pull request #2174 from diesieben07/findBlockFix
Fix GameData.findBlock
2015-11-08 10:30:18 -05:00
Take Weiland e6d8fde415 Fix GameData.findBlock 2015-11-08 15:34:31 +01:00
RainWarrior b6664c76c5 Fixed anaglyph transformation not being applied in the forge lighting fully. 2015-11-08 15:11:22 +03:00
RainWarrior cbe2766c0a Provide ItemCameraTransforms for vanilla models when possible. 2015-11-08 09:37:33 +03:00
RainWarrior 8a11ad7a7a OBJ loader: reworked texture resolution: keys now have to start with #, like every other model loader; models without explicit library now work, remapping is possible by using the key "#OBJModel.Default.Texture.Name"; in addition to remapping by material name, remapping by texture name works too, like in other model formats. 2015-11-07 20:36:57 +03:00
RainWarrior 3d03461a52 Performace fix for item rendering. 2015-11-07 12:58:23 +03:00
LexManos f466a0c387 Merge pull request #2167 from Choonster/master
Fix texture error message for broken textures
2015-11-05 15:09:02 -08:00
Choonster 729fca7722 Fix texture error message for broken textures
-- Fixes #2100
-- Iterates over badTextureDomains instead of missingTextures.keySet()
as a domain can have broken textures without any missing textures
2015-11-06 06:52:09 +11:00
Lex Manos d790008353 Introduce a new centralized version checking system.
Using the @Mod annotation mods can opt-in to a centrally controlled update system.
This is PURELY a notification system and will NOT automatically download any updates.
The End User can control which mods check for updates and disabel the system entirely using the Forge Config and GUI.
Format for the json the URL must point to is described here: https://gist.github.com/LexManos/7aacb9aa991330523884
2015-11-04 14:37:15 -08:00
Lex Manos 479c7f8b54 Redesign the ModList GUI to use a scrolling list for the main body content.
Allowing for larger information to be displayed.
URLs are auto-detected and now clickable.
Mod Logos are now centered, it looks better.
2015-11-04 13:57:47 -08:00
Lex Manos d0a33c4d9d Merge FML and Forge lang file, and update crowdin project. 2015-11-04 13:49:54 -08:00
RainWarrior c3141b6ed6 Fixed block color multiplier not being cached properly in the forge renderer, performance improvement. 2015-11-03 16:00:44 +03:00
RainWarrior cf8972262a OBJ model: use original vertex material when defining face. 2015-11-03 01:53:58 +03:00
LexManos bdbcf31fc2 Merge pull request #2161 from The-Fireplace/master
Fixed a bug with GuiConfigEntries.SelectValueEntry
2015-11-01 16:15:23 -08:00
The_Fireplace 6dc50ace6b Fixed a bug that caused the config option name to overlap with the selectable values when using GuiConfigEntries.SelectValueEntry, fixes #2114 2015-10-31 18:28:29 -05:00
RainWarrior 51653fb9b7 Obj loader: fix vertices shared between faces having the same attributed (uvs/normals). 2015-10-31 21:19:35 +03:00
RainWarrior 12e6fe9db7 OBJ loader: fixed another whitespace-related issue; removed unused "modifyUVs" property for now; added the "flip-v" property to switch between OpenGL-style and DirextX-style model UVs; fixed normals - they are now correct in-world, still a bit strange for the items; fixed normals a little bit for B3D models too. 2015-10-29 22:50:45 +03:00
RainWarrior c3b15e3f6c Fix color multiplier applied incorrectly for items. 2015-10-29 20:27:26 +03:00
cpw a92f2a263b OreDictionary will warn if there's an invalid ore being registered now, rather than just
using -1 and doing weird things with the list as a result.
2015-10-29 12:46:12 -04:00
cpw 945d3887d2 Fix substitutions for recipes and oredict recipes. Should mean that substitutions start working properly. 2015-10-29 08:46:23 -04:00
Fry 887f3bf31d Merge pull request #2154 from shadekiller666/OBJ_Loader
OBJLoader Update: Fix for normal generation, whitespace handling, and UVs outside 0-1 range
2015-10-29 13:53:09 +03:00
RainWarrior a9d5d0097d Fix for the previous commit - transparent blocks were handled improperly. 2015-10-29 13:32:43 +03:00
RainWarrior 3d972a11a8 Changed how the forge lighting system handles holey models for opaque blocks; it now mimics vanilla behaviour, which allows light to pass through them. 2015-10-29 13:14:35 +03:00
shadekiller666 7a20543d5f OBJLoader: Quick bandages to support/fix the new way that face/vertex normals are calculated, a very quick bandage to patch TextureCoordinates for the time being, and the Parser now uses a Pattern to split strings on whitespace instead of only splitting on " ". 2015-10-29 02:21:28 -07:00
LexManos 4c1e3ac7db Merge pull request #2151 from AbrarSyed/patch-1
Update FG version to 2.0.2
2015-10-28 14:31:08 -07:00
LexManos d6a6316771 Merge pull request #2146 from bonii-xx/potionidfix
Fix Potion IDs above 127
2015-10-28 00:29:42 -07:00
Abrar Syed 459e20df3f Update FG version to 2.0.2 2015-10-27 23:45:49 -05:00
LexManos 7d5b860ff3 Merge pull request #2126 from diesieben07/join-world-fix
Fix CME when entities are spawned from EntityJoinWorldEvent
2015-10-27 18:46:18 -07:00
RainWarrior 6fc96ef94e More lighting fixes, flat lighting now works correctly for grass and torches. 2015-10-28 00:58:44 +03:00
RainWarrior 5214ed29b7 Fixed normal calculation for vanilla models, fixed the grass darkening and simular issues. 2015-10-28 00:29:16 +03:00
RainWarrior 6b10b41b02 Fixed piston rendering (WorldRenderer offset wasn't applied); fixed TESR being registered too early in one of the debug mods. 2015-10-27 19:02:22 +03:00
RainWarrior ef2bcb056d Fixed another generic issue in MultiModel. 2015-10-27 18:52:49 +03:00
RainWarrior da19eda51e Provide a IModel for "builtin/generated", fixes #2147 2015-10-27 18:36:57 +03:00
RainWarrior b75593b0c6 Fixed AO being applied to OBJ model transparency, and OBJ loader trying to force the loading of the builtin white texture. 2015-10-27 18:36:57 +03:00
RainWarrior a96ba1b7f7 Fixed generic bug in MultiModel 2015-10-27 18:36:57 +03:00
RainWarrior 7c7547227c Perspective awareness for vanilla and multi models, fixes #2148.
Improved error handling in MultiModel.
2015-10-27 17:40:05 +03:00
Fry cf568ae85f Merge pull request #2091 from shadekiller666/ItemModelLoadingFix
Fixed a bug with item model loading
2015-10-27 09:59:50 +03:00
RainWarrior 8c82b0296a Small fix for reworked classic lighting 2015-10-27 00:19:04 +03:00
shadekiller666 33e2e0b028 Fixed a bug with item model loading that would occur if ModelBakery.addVariantName() was called with the same string location parameter for 2 different items, and the string pointed to a location that didn't exist, where ModelLoader.loadAnyModel() would substitute the blockdefinition in for the item model, but wouldn't remove the original input location from the loadingModels list, which would cause the location from the second call to throw an IllegalStateException even though that location now has a model. 2015-10-26 10:15:13 -07:00
shadekiller666 d1b220f6a3 Added OBJ loader for the ModelLoaderRegistry system. 2015-10-26 19:38:49 +03:00
RainWarrior d5a658b5ea Added back in the lost class 2015-10-26 19:32:19 +03:00
RainWarrior dd365d7220 Model pipeline system.
Should replace all ad-hoc quad generation methods in forge, and make IBakedModel -> WorldRenderer data transfer faster. Added IVertexConsumer + helper classes; lighting that works correctly for non-axis-aligned faces using the new infrastructure. Changed smooth lighting algorithm, now it should work correctly for everything.
New block lighter can be disabled in the forge config options.
2015-10-26 19:25:48 +03:00
Bernhard Bonigl 336eaa336b Fix Potion IDs above 127 2015-10-25 12:16:17 +01:00
mezz ebdcc11c80 Allow server to access Potion isBadEffect() 2015-10-12 21:35:15 -07:00
LexManos ebe9b6d4cb Merge pull request #2022 from simon816/guava-apache-lcl-exclusion
Add Guava and Apache to LaunchClassLoader exclusion list on server
2015-10-12 12:29:45 -07:00
LexManos 7cc7ce3ba2 Merge pull request #2129 from darkevilmac/master
Add PlayerSetSpawnEvent
2015-10-11 14:52:02 -07:00
darkevilmac b9f5e152de Add PlayerSetSpawnEvent 2015-10-10 15:39:27 -07:00
Take Weiland 76753c06df Fix CME when entities are spawned from EntityJoinWorldEvent 2015-10-04 18:46:47 +02:00
RainWarrior e280f72cfb '#' is now added automatically to the beginning of the texture names in B3D models, and the remapping is expected via the blockstate JSON, since it's more reasonable than adding it to the file name in the modelling program or matching the resource location with the filename. 2015-10-03 04:42:35 +03:00
RainWarrior d71384bc33 Fixes Attributes.transform affecting only 1 vertex. 2015-09-29 02:29:16 +03:00
LexManos 605457deec Merge pull request #2103 from olee/patch-1
Fix possible crash in EventBus
2015-09-27 14:41:29 -07:00
LexManos 90829a3164 Merge pull request #2120 from luacs1998/eventbus_fix
Fix a possible crash in EventBus
2015-09-27 02:12:50 -07:00
luacs1998 05f6ede2ea Fix a possible crash in EventBus 2015-09-27 12:47:37 +08:00
LexManos 1e7fbb7018 Merge pull request #2118 from rubensworks/itemmonsterplacer-dispenser
Fix dispenser action for modded spawn eggs
2015-09-22 12:18:26 -07:00
Ruben Taelman 385159c25e Fix dispenser action for modded spawn eggs 2015-09-22 19:53:34 +02:00
Lex Manos fb9ffa40fd Fix entity count being incorrect for spawning logic. Now filter out 'persistant' entities. 2015-09-14 13:18:34 -07:00
Lex Manos eacffb2b6e Update Gradle wrapper to 2.7 2015-09-14 13:18:02 -07:00
LexManos fb7b47adb4 Merge pull request #2002 from ganymedes01/master
Disallow conflicting furnace recipes
2015-09-09 11:23:08 -07:00
RainWarrior d70ca1a357 Workaround for MinecraftForge/ForgeGradle#256 2015-09-02 22:01:30 +03:00
ganymedes01 31a3a18ec7 Disallow conflicting furnace recipes 2015-09-02 19:04:57 +01:00
cpw 5074f26ccd FMLNetworkHandler.openGui should not try and open a GUI on a FakePlayer.
Fixes #2082 and probably dozens of mod errors. Also, side benefit of the
merged codebase! FML code can ref Forge code!
2015-09-02 13:50:00 -04:00
cpw 4315637f75 Merge branch 'laci200270-patch-1' 2015-09-02 13:30:00 -04:00
cpw b7e8dcff7b Format a bit better 2015-09-02 13:29:43 -04:00
cpw 5a9129f802 Merge branch 'patch-1' of https://github.com/laci200270/MinecraftForge into laci200270-patch-1 2015-09-02 13:27:42 -04:00
RainWarrior b175d265b9 Much requested temporary hack for items and TESRs. Context: #1582, #1597, #1713, #2058 and others. 2015-09-02 07:35:24 +03:00
LexManos e5ee9377fd Merge pull request #2086 from Vorquel/master
Fix faulty channel name checking
2015-09-01 16:32:26 -07:00
LexManos edcb45640f Merge pull request #2069 from simon816/profile-request-fix
Use already provided profile for the player's own skin
2015-09-01 16:32:07 -07:00
simon816 d61a55b661 Use already provided profile for the player's own skin 2015-08-31 03:28:59 +01:00
simon816 b312584ca4 Add Guava and Apache to LaunchClassLoader exclusion list on server
Move exclusions to common place. Less likely to get out of sync
2015-08-31 03:15:30 +01:00
Björn Zeutzheim ac5c7124de Fix possible crash in EventBus
There is currently no way to check if an event handler has been registered or not.
But when trying to unregister a not-registered event handler, Minecraft crashes with a NullPointerException.
This is a simple fix to prevent such crashes.
2015-08-31 03:39:33 +09:00
cpw 57d575f941 More cleanup of the default eclipse workspace. The project is now called "MDKExample" not "Minecraft".
The project tree is now contemporary, instead of a copy from 1.5.x era MC. The launches are cleaned up, and refer to
a better default "runDir" of "run" rather than "eclipse".. Updating to FG2.0.1 which will contain relevant binary fixes.
2015-08-26 21:57:31 -04:00
cpw d41e51f47b Fix eclipse workspace inside the mdk - don't run it through the tokenconverter. Also add in CREDITS-fml.txt to the MDK - it's still required. 2015-08-26 13:57:51 -04:00
Lex Manos 90a88efd8a Fixed issue where config folder would not be created before SplashProgress tried to read from it.
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
2015-08-22 18:55:32 -07:00
Lex Manos 4b299529b7 Update gradle wrapper and fix changelog task. 2015-08-22 17:57:12 -07:00
James 589465bb81 Fix faulty Channel name 2015-08-21 16:06:07 -07:00
cpw 0d320e2e31 Fix crowdin again. Run, jenkins, for god's sake, run! 2015-08-21 09:52:33 -07:00
cpw 4903febd96 Fix crowdin task. Good luck jenkins, lets roll! 2015-08-21 09:43:30 -07:00
cpw bbe96a3577 Fix ciWriteBuildNumber task. Ugly, but it works. 2015-08-20 13:42:58 -07:00
cpw b211aca5ce Merge branch 'fg2' 2015-08-20 12:27:20 -07:00
cpw 58ab3de7c1 Remove patches 2015-08-20 12:14:02 -07:00
laci200270 ba8ae53867 Update FMLSecurityManager.java 2015-08-19 20:27:42 +02:00
cpw 7e600c0dd8 Fix packaging the gradle wrapper properly. There is still a problem with
the MDK- it fails to run setupDecompWorkspace.

Filed an issue at ForgeGradle, since this seems to be something FG2 shouldn't
be doing, but is?

https://github.com/MinecraftForge/ForgeGradle/issues/235
2015-08-15 10:16:00 -07:00
cpw 9a0a00c7a4 Trying to fix the MDK to include gradle wrapper, but the gradle-wrapper.jar is
corrupted. @AbrarSyed can you take a look?
2015-08-15 09:56:56 -07:00
cpw 91927e6bc7 The final nail in the coffin. BYE! 2015-08-13 23:07:53 -07:00
cpw fc045f210d Fix MDK task - it now runs. 2015-08-13 23:07:17 -07:00
LexManos eecc691cdf Merge pull request #2072 from AbrarSyed/fg2
Added MDK package
2015-08-09 20:35:50 -07:00
AbrarSyed 7a6557a9e2 added MDK package 2015-08-09 20:30:31 -05:00
LexManos b45fd787f3 Merge pull request #1969 from diesieben07/blockhighlight
Re-introduce RenderBlockOverlayEvent
2015-08-05 11:48:53 -07:00
cpw c2523c685a FML's metabolic processes are now history. FML's off the twig. FML's kicked the bucket, FML's shuffled off this mortal coil,
run down the curtain and joined the bleedin' choir invisible!! THIS IS AN EX-PROJECT!
2015-08-02 00:20:19 -04:00
cpw dfd62a3bd8 Vestigal fml-ectomy. 2015-08-02 00:03:47 -04:00
cpw 614bbcb0da FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace. 2015-08-01 23:51:40 -04:00
cpw 9a859f8d5c Merge branch 'master' of https://github.com/AbrarSyed/MinecraftForge into fg2 2015-08-01 20:55:58 -04:00
cpw 5045d8df68 Merge branch '1.7.10' 2015-08-01 20:30:22 -04:00
AbrarSyed 9908310384 fixed deployment credentials 2015-08-01 14:08:04 -05:00
Lex Manos 7b18eab02d Fix placing skulls on fence posts. Closes #2055 2015-07-31 15:10:47 -07:00
LexManos bd4b3debc3 Merge pull request #1968 from modwizcode/master
Fix harvest logic running in addition to shearable logic
2015-07-31 12:57:05 -07:00
LexManos 5623634f56 Merge pull request #2048 from shadekiller666/UnlistedPropertyValue
Fix for ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty preventing block placement.
2015-07-25 15:12:57 -07:00
shadekiller666 87bbbfafcc Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed. 2015-07-25 14:55:42 -07:00
LexManos 2a85ab0eab Merge pull request #2017 from liach/add-enum
Add hook for adding EnumPlantType and fixed npe in BiomeType
2015-07-24 17:08:16 -07:00
LexManos 65123c66a0 Merge pull request #2004 from simon816/sign-nbt-fix
Fix placing signs with NBT prompting for text
2015-07-24 13:53:27 -07:00
LexManos d72caa5005 Merge pull request #2047 from Zaggy1024/forgeblockstatesv1fixes
Fixed two bugs with the Forge blockstates v1 loader.
2015-07-24 11:28:23 -07:00
Zaggy1024 e580d3b6b6 Fixed a Forge blockstates json removing models causing an NPE in the loader.
Fixed the deep clone of a V1 Variant not cloning the submodels properly.
2015-07-24 13:20:10 -05:00
LexManos 5eea9cebae Merge pull request #1983 from clienthax/patch-1
Make layer methods public
2015-07-23 12:13:00 -07:00
LexManos b8fe3913e9 Merge pull request #2044 from rubensworks/enumfacing-server
Remove SideOnly's from EnumFacing allowing full class to be used on both sides.
2015-07-23 10:58:17 -07:00
Ruben Taelman 04d4b2cf76 Make EnumFacing events available server-side 2015-07-23 16:51:45 +02:00
LexManos 81bb69b6c9 Merge pull request #2035 from rubensworks/master
Fix source block check for BlockFluidClassic
2015-07-21 16:43:44 -07:00
Ruben Taelman 0cf1f0d51c Fix source block check for BlockFluidClassic 2015-07-21 10:51:53 +02:00
cpw c308a47124 Cherry pick some changes from 1.8 for inner class discovery, also fix the negativecache. Closes #1872 2015-07-18 12:47:31 -04:00
LexManos cd313c195b Merge pull request #2023 from diesieben07/entity-pick
Allow the new entity eggs to be created via middle-click on an Entity while in creative mode.
2015-07-16 11:33:01 -04:00
diesieben07 9f571ff15d Allow the new entity eggs to be created via middle-click 2015-07-16 14:13:48 +02:00
liach e2ee54a27d Add an EnumHelper hook and fixed an issue 2015-07-14 08:55:51 +08:00
cpw 0f456b4684 Be a little bit more helpful when the ObjectHolder misses. Should help figure out what is going in in #2006 2015-07-09 17:05:20 -04:00
cpw 8636eb1883 Wake up the FluidRegistry before any mods start loading. Should stop mods claiming to own water or lava (depending on who accessed
FluidRegistry first)
2015-07-09 16:53:31 -04:00
cpw 50677ad87a Actually rebuild the fluidNames each rebuild, don't just try and force changes in. Should fix #1973 2015-07-09 16:40:51 -04:00
simon816 81eb6a8bb4 Fix placing signs with NBT prompting for text 2015-07-08 22:27:17 +01:00
Clienthax 97f8c246b8 Signed-off-by: Clienthax <[email protected]> 2015-06-30 22:29:34 +01:00
Fry 20bf76464a Merge pull request #1978 from RainWarrior/model-rotation
Custom transformations in forge blockstate json.
2015-06-30 22:14:31 +03:00
RainWarrior c4f370a7e6 Custom transformations in forge blockstate json. 2015-06-30 21:37:11 +03:00
AbrarSyed 9ebc77ef22 updated installed gradle. not finished 2015-06-30 00:14:41 -05:00
AbrarSyed 2fce67c8b7 fixed local-building fail with changelog 2015-06-29 21:56:35 -05:00
AbrarSyed a55536c0dc added jenkins compat tasks 2015-06-29 21:56:35 -05:00
AbrarSyed 1ae0498534 Added FG2 buildscript + updated for Gradle 2.4 2015-06-29 21:56:35 -05:00
AbrarSyed c02c379bed removed old unnecessary stuff 2015-06-29 21:56:35 -05:00
AbrarSyed c5ac5b0264 DeobfuscationData no longer required at dev time 2015-06-29 21:56:35 -05:00
AbrarSyed 0fb705f8f5 added hardcoded fml version file 2015-06-29 21:56:35 -05:00
AbrarSyed bbfae84ee8 removed broken and duplicate AT lines 2015-06-29 21:56:30 -05:00
LexManos cab151ec44 Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975 2015-06-26 17:54:38 -07:00
LexManos 7a733d635e Merge pull request #1974 from Lunatrius/white-screen-fix
Fixed error GUIs showing a white screen
2015-06-26 16:16:01 -07:00
Lunatrius 44077774be Fixed error GUIs showing a white screen and replaced a rogue direct GL call. 2015-06-27 01:12:24 +02:00
Fry 37b4936e9d Fix particle texture of the generated item models. 2015-06-27 01:26:59 +03:00
LexManos 637e2c6f56 Merge pull request #1972 from bonii-xx/StateMapDomainFix
Fix StateMap always mapping properties to the "minecraft" domain
2015-06-26 04:03:25 -07:00
Lex Manos 2bfa1ffc05 Add debug for max texture size and output when Texture Atlas can not stitch all textures. 2015-06-26 03:32:09 -07:00
Bernhard Bonigl e55ee43fd5 Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions. 2015-06-26 10:29:10 +02:00
cpw 204cb16bc4 ObjectHolder works great, but it should be a lot less spammy about failed lookups. They're usually mod options. 2015-06-25 14:41:45 -04:00
diesieben07 ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update 2015-06-25 19:09:32 +02:00
Starbuck Johnson fe2c4c569d Fix harvest logic running in addition to shearable logic 2015-06-24 14:28:47 -05:00
Lex Manos b2033d642c More descripotive error if Patcher is passed invalid data for vanilla classes. 2015-06-23 20:36:23 -07:00
RainWarrior 74501f509f There's no Map.getOrDefault in java6. 2015-06-23 17:03:19 +03:00
RainWarrior 8f65678b99 Vanilla models can now use custom textures. Fixes #1962 2015-06-23 16:52:42 +03:00
RainWarrior 510b5523d5 Fixed perspective transformations for item models. 2015-06-23 15:56:18 +03:00
Lex Manos d7c4a06ce8 Fix AT for Block constructor. 2015-06-23 01:26:33 -07:00
RainWarrior 1582e401ed Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator. 2015-06-23 04:43:48 +03:00
cpw bae83e6724 Merge remote-tracking branch 'origin/master' 2015-06-21 22:08:08 -04:00
cpw 16ff1be093 Merge branch '1.7.10'
Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
	fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
2015-06-21 21:59:51 -04:00
LexManos 8bb34107f1 Merge pull request #1858 from FlansMods/master
Hook for Camera Angles, Including Roll
2015-06-21 11:19:26 -07:00
cpw 2c24c7618a Mods that are extracted to the mods dir by unzipping or whatever will now cause the game to crash. Too much info is in the META-INF now,
and more will be being added. Extracting to the mods dir just completely breaks that.
2015-06-20 14:47:55 -04:00
LexManos 240ed53a88 Merge pull request #1956 from lawremi/mesadictfix
fix logic for guessing mesa tag in biome dict
2015-06-19 11:25:49 -07:00
larman 2cb971c38f fix logic for guessing mesa tag in biome dict 2015-06-19 07:04:19 -07:00
Lex Manos 7041fbc27e Time each bar in the loading screen and print it to the log, useful information to see where most time is spent in loading. 2015-06-18 22:18:27 -07:00
Lex Manos e519278888 Add TextureManager to loading screen. 2015-06-18 22:17:21 -07:00
Lex Manos 4235ca36ea Make TextureMap for items and blocks skip the first pass of loading/stitching textures.
Should decrease loading times for large packs.
May cause issues with some mods so use -Dfml.skipFirstTextureLoad=false to disable.
2015-06-18 20:13:31 -07:00
Lex Manos 6527792d06 Add the stitching allocation stage to loading screen. 2015-06-18 20:13:17 -07:00
Lex Manos 716dfdae47 Create config folder in SplashProgress if it does not exist. 2015-06-18 20:11:23 -07:00
Lex Manos c158af902f New system in EntityRegistry to allow modders to register spawn eggs.
For entites that do not use the global ID system.
{Which no mod entity should}
Vanilla spawn eggs will now detect a 'entity_name' entry in it's NBT data and use that for spawning/rendering.
2015-06-18 18:05:12 -07:00
Lex Manos ed09a25c65 Patch line number update. Ignore this. 2015-06-18 18:02:22 -07:00
LexManos 94dc49e522 Merge pull request #1952 from ganymedes01/master
Change permission levels on ore recipes parameters
2015-06-18 11:55:46 -07:00
LexManos 40bc035d74 Merge pull request #1953 from ganymedes01/patch-1
Fixed NPE when calling canBrew
2015-06-18 11:51:48 -07:00
Lex Manos 01aac69514 Use Guava instead of Nio for J6 compatibility. 2015-06-18 11:48:14 -07:00
ganymedes01 953ddae475 Fixed NPE when calling canBrew
Oversight on my part,

If the ingredient doesn't return true in Item.isPotionIngredient, Items.potionitem.getEffects(stack) returns null, causing an NPE to be thrown later on.

This invalidates #1947.
2015-06-18 13:32:21 -03:00
ganymedes01 ab548afbfb Change permission levels on ore recipes parameters 2015-06-18 13:21:00 -03:00
Fry f2eec981ff Merge pull request #1922 from RainWarrior/model-fluid2
1.8 model fluid renderer
2015-06-18 14:29:22 +03:00
RainWarrior 07038f8342 Added fluid renderer. 2015-06-18 14:26:53 +03:00
Lex Manos f59b0a2932 Make Item.shouldCauseReequipAnimation is bit more precise and copy over the new item for rendering even if the animation is diabled. 2015-06-17 20:33:35 -07:00
Lex Manos 030084f2b3 Add vanilla block rotation support back in for certain blocks that were missed in 1.8 update. Closes #1903 2015-06-17 17:28:18 -07:00
LexManos bf63879a92 Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader
Bugfix for B3DLoader
2015-06-17 16:52:08 -07:00
LexManos ed8b8bcf8f Merge pull request #1932 from cheeserolls/patch-1
Fix incorrect block position in BlockReed canPlaceBlockAt
2015-06-17 16:48:42 -07:00
LexManos 1dc7a80d4f Merge pull request #1506 from mezz/GuiScreenInputEvents
Add GuiScreenEvents for keyboard and mouse input
2015-06-17 16:45:41 -07:00
LexManos 87b55860af Merge pull request #1781 from ShetiPhian/Block.getPickBlock
Player sensitive version of Block.getPickBlock
2015-06-17 16:37:03 -07:00
Lex Manos 453ec39496 Add Item.shouldCauseReequipAnimation to allow modders more control over the 'Reequip' animation. 2015-06-17 16:36:41 -07:00
Lex Manos 6ec1ec2575 Fixed compile issues with irtimaled's PR. 2015-06-17 16:01:33 -07:00
Lex Manos e7724c13cc Fixed Wavefront Object Importer reading files with integer values. Closes #1651, #1654 2015-06-17 15:48:22 -07:00
Lex Manos 38a85280de Make FML Gui classes use GlStateManager. Closes FML#615 2015-06-17 15:16:48 -07:00
LexManos 20ea3bc0ce Merge pull request #1749 from irtimaled/master
Copy fortress.dat from the overworld to the Nether. Fixes #1747
2015-06-17 14:23:58 -07:00
xxmicloxx b45c90ceb8 Bugfix for B3DLoader 2015-06-17 19:48:51 +02:00
Lex Manos e94288bbb1 Fixup model loading errors not being printed by making ICustomModelLoader.loadModel propogate IOExceptions as needed. 2015-06-16 16:03:10 -07:00
Lex Manos d0902c096e Cleanup code format in LayerBreakingTest. 2015-06-16 16:01:09 -07:00
Lex Manos c50adf2433 Include the thread state in the potential error handleing for SplashProgress. 2015-06-16 15:26:00 -07:00
Lex Manos 64263a9f8e Throw more descriptive errors when mods attempt to register invalid global entity IDs. 2015-06-14 17:06:00 -07:00
cpw 114ac38910 Merge branch '1.7.10'
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java
	fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
	fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
2015-06-14 13:57:23 -04:00
LexManos 1f6086c175 Merge pull request #1935 from superckl/master
Fixed two exceptions in BiomeDictionary related to adding new Biome Types.
2015-06-12 17:47:32 -07:00
superckl c84f7a740f Fixing two IndexOutBoundsExceptions from the BiomeDictionary 2015-06-12 17:08:19 -07:00
Daniel Howard 16be913abc Fix incorrect block position in BlockReed canPlaceBlockAt
block.canSustainPlant is called on the wrong block position.  It should be called on the block below (the 'soil' block).
2015-06-12 10:14:22 +01:00
Lex Manos b3a1548cfa Cleanup mod state dump to be easier to read by displaying the states in abreviation and placing them before the mod info. 2015-06-09 23:06:06 -07:00
Lex Manos b94c2799ab Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none. 2015-06-09 22:25:13 -07:00
Lex Manos d4f6e9e419 Quiet CrashReport class pre-loading debug, no flag to re-enable. 2015-06-09 21:37:33 -07:00
Lex Manos 847c0246cd Quiet FMLControlledNamespacedRegistry debug spam by default. Reenable using -Dfml.debugRegistryEntries=true. 2015-06-09 21:33:52 -07:00
Lex Manos b985384fab Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true. 2015-06-09 21:31:18 -07:00
Lex Manos 851f9c1da6 Cleanup some spammy output. 2015-06-09 21:20:53 -07:00
Lex Manos acbb330214 Bump version for new RB 2015-06-09 17:17:35 -07:00
Lex Manos db7d82a889 Copy over parent's modelSet value in variants as well. 2015-06-09 17:17:23 -07:00
Lex Manos 9ef7b13442 Bump version for new RB. 2015-06-09 15:06:42 -07:00
cpw db42d1f532 Merge branch '1.7.10' 2015-06-09 17:57:35 -04:00
LexManos 7406e3df9f Merge pull request #1795 from lumien231/ExperienceEvent
Added LivingExperienceDropsEvent to change how much experience an entity drops
2015-06-09 13:23:01 -07:00
LexManos 8b50f9ab36 Merge pull request #1907 from johnjohn/master
Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom ItemMaps
2015-06-09 12:37:33 -07:00
Lex Manos fef959d1e9 Redefine removal value in IRetextureableModel from null to empty string {""} due to ImmutibleMap not allowing null Values. Closes #1927 2015-06-09 12:36:36 -07:00
LexManos f62ee5c4f5 Merge pull request #1881 from ganymedes01/master
Added a brewing recipe registry system
2015-06-09 12:05:40 -07:00
johnjohn 486c0955cf Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom maps 2015-06-09 12:42:45 -06:00
ganymedes01 0373920f99 Added a brewing registry system 2015-06-09 14:01:45 -03:00
Lex Manos 1ad05f7f22 Missed patch for sign fix. 2015-06-08 16:23:30 -07:00
Lex Manos 15a1d4cf0d Remove worlds from WorldBorder when unloaded tol prevent memory leak, Closes #1923 2015-06-08 16:19:53 -07:00
Lex Manos 1b689802a4 Limit Sign text to 384 json characters and strip control codes. This is 1.8.7's Sign fix. Thanks Searge. 2015-06-08 16:19:02 -07:00
cpw b35aec4347 Attempt to synchronize the state for vanilla client completions and quit the handler if the vanilla
thread has already setup the connection. Should fix #1924
2015-06-08 18:24:35 -04:00
Lex Manos ee1e229b66 Change custom payload lock to be buffer itself incase multiple packets use the same backend buffer. Closes #1908 2015-06-07 00:06:00 -07:00
Fry e007f7cf39 Merge pull request #1868 from fuami/ISmartBlockModel_Damage
Add Block Breaking Animation for ISmartBlockModels
2015-06-06 03:39:11 +03:00
Fuami 5cd4564a32 Added Breaking Animation for Smart Models, Checking each layer.
Added Layered Smart Render Test.
2015-06-05 19:23:17 -05:00
LexManos 26bc23602a Update README.txt 2015-06-05 13:28:07 -07:00
RainWarrior d6bc936ffa B3D Improvements
- fixed keyframe transformation application
 - textures are now resolved the same way as in vanilla models
 - added the ability to use forge blockstate texture information
 - removed unused code from the B3D example
2015-06-04 18:58:42 +03:00
RainWarrior 581363fddd fixed AT missing for getModelBlockDefinition 2015-06-04 18:58:42 +03:00
RainWarrior 685a97fd93 Fixed missing variant logging; added the possibility to specify the item variant in the blockstate json. 2015-06-04 18:07:03 +03:00
RainWarrior 897d41fa77 Fixed partial variant detection in the forge blockstate loader. 2015-06-04 16:59:18 +03:00
Lex Manos 5064d33519 Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json. 2015-06-03 23:16:25 -07:00
LexManos 107e760aa3 Merge pull request #1912 from clienthax/master
Add missing forge patch from 1.8 port
2015-06-03 19:53:01 -07:00
Clienthax 9b53b7e111 Add missing forge patch from 1.8 port
https://github.com/MinecraftForge/MinecraftForge/blob/1.7.10/patches/minecraft/net/minecraft/client/Minecraft.java.patch#L88
2015-06-04 01:55:13 +01:00
cpw 63f2300794 Fix up the client/server fluid race condition that could cause the game to bail when an SSP game connects.
There's still a teeny gap, but it's MUCH less prominent than it was before.
2015-06-03 19:26:53 -04:00
LexManos 61f9c5a201 Merge pull request #1885 from LexManos/EnhanvedBlockStateJson
Hook BlockState's Json loading to add support for simplified Forge format.
2015-06-02 16:52:06 -07:00
Lex Manos 267e1ee62f Hook BlockState's Json loading to add support for simplified Forge format.
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
2015-06-02 16:49:56 -07:00
Lex Manos 950da28d54 Fixed missing import in last merge. 2015-06-02 16:32:10 -07:00
cpw e2dc863086 Merge branch '1.7.10'
Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
	fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
2015-06-02 07:30:44 -04:00
cpw f8cb411df1 So we can't print a lot of unicode in the splash screen, so restrict to a hard subset we know we CAN print, closes #1910 2015-06-02 07:24:26 -04:00
LexManos 41cae458a4 Merge pull request #1911 from AlgorithmX2/ItemFramesOnSolidSurfaces
Allow placing item frames on Solid Block Faces (isSideSolid)
2015-06-01 20:45:28 -07:00
AlgorithmX2 885d7602f9 Allow placing item frames on Solid Block Faces (isSideSolid) 2015-06-01 22:31:55 -05:00
Lex Manos e6eeb03108 Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
(cherry picked from commit 19d7e16fa6)

Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
2015-06-01 17:15:06 -04:00
Lex Manos f088b1b460 Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message.
(cherry picked from commit e3211eec04)

Conflicts:
	fml/src/main/java/cpw/mods/fml/client/SplashProgress.java
2015-06-01 17:09:28 -04:00
cpw 3c640fa32d Bump minor version # to 2 because of the fluid changes (mirroring what happening in 1.7.10) 2015-06-01 16:31:16 -04:00
cpw d02636213a Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	fml/src/main/java/net/minecraftforge/fml/common/Loader.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	patches/minecraft/net/minecraft/item/ItemArmor.java.patch
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/WorldProvider.java.patch
	src/main/java/net/minecraftforge/common/ForgeVersion.java
	src/main/java/net/minecraftforge/common/network/ForgeMessage.java
	src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
	src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
	src/main/java/net/minecraftforge/fluids/FluidRegistry.java
	src/main/java/net/minecraftforge/oredict/OreDictionary.java
2015-06-01 16:29:34 -04:00
cpw bd6630810f Add in an ItemStackHolder - a way to inject ItemStacks without having to have complex lookup code everywhere.
Example: https://gist.github.com/cpw/9af398451a20459ac263
2015-05-30 14:07:54 -04:00
Lex Manos 3331d2a496 Fixed damage reduction rate of vanilla armor incorrectly scaling with armor's current durability. 2015-05-26 23:34:32 -07:00
LexManos f9b1e4e23b Merge pull request #1892 from AlgorithmX2/vanilla_lighting_bug
Fix Vanilla Lighting Bug - Fixes Top/Bottom Faces interpolation.
2015-05-26 19:24:37 -07:00
Lex Manos 2bb090bf2b Force netty downgrade on dedicated server to match client. Netty bug: https://github.com/netty/netty/issues/2302 Closes #1848 2015-05-26 19:20:46 -07:00
AlgorithmX2 76f8843017 Fix Partial Face Lighting on Top/Bottom Faces ; Vanilla MC-80148 2015-05-26 19:33:56 -05:00
Lex Manos 9fa51447a2 Fixed command exploit with C12 2015-05-25 16:08:42 -07:00
Lex Manos c608e7c04e Fixes MC-75630 - Exploit with signs and command blocks 2015-05-25 15:28:14 -07:00
Lex Manos 19d7e16fa6 Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662 2015-05-25 14:32:35 -07:00
Lex Manos e3211eec04 Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message. 2015-05-25 13:34:35 -07:00
Lex Manos 89994bda39 Cleanup a lot of spammy output. Everything hidden behind environment flags now. Scale anvil image down 50% 2015-05-25 13:34:34 -07:00
Lex Manos df5e594e95 Loosen up ServerChatEvent to support IChatComponent Closes #1893 2015-05-25 13:34:34 -07:00
LexManos 8d7b999506 Merge pull request #1804 from Prototik/font
Add true support for unicode fonts
2015-05-21 10:43:22 -07:00
Prototik 2798fc4e49 Add true support for unicode fonts 2015-05-21 20:14:56 +07:00
LexManos 61b2929ae6 Merge pull request #1886 from diesieben07/texture-load-crash
Fix crash when texture loading throws RuntimeException without message
2015-05-20 12:19:18 -07:00
diesieben07 1501f467cf Fix crash when texture loading throws RuntimeException without message 2015-05-20 17:43:52 +02:00
Flan 306af4feee Added CameraSetup sub-event for camera angles
Allows players to alter yaw and pitch of renderViewEntity, but more importantly, adds the ability to roll the view.

Added camera roll hook
2015-05-19 16:14:44 +01:00
LexManos d3ab6d36a4 Merge pull request #1882 from t1g3l/master
Changed forge command tab completion to use getListOfStringsMatchingL…
2015-05-18 10:08:46 -07:00
t1g3l 6a299a483a Changed forge command tab completion to use getListOfStringsMatchingLastWord() 2015-05-18 13:51:05 +02:00
LexManos 8944983d0f Merge pull request #1878 from t1g3l/master
Added tab completion to /forge command.
2015-05-17 14:55:39 -07:00
cpw 06398fa259 Clean up transformers a bit. Can't use COMPUTE_FRAMES even though it's required - the game refuses to even
run if I do. Note for j8: when we force Java8 classes, all coremods will need a thorough overhaul - the
current way we do things is not sustainable when Java8 becomes the universal norm.
2015-05-17 10:35:56 -04:00
cpw 3bbf5c04a6 Strip control codes in progress bar messages. They cause crashes sometimes. 2015-05-17 10:15:44 -04:00
t1g3l fe327fbd76 Added tab completion 2015-05-17 11:00:42 +02:00
cpw 686db5e5eb Hardcode the FML version in-game as a specific value. 2015-05-16 13:43:35 -04:00
cpw 5fe653cf82 Attempt to fix the slow loading problem. Instead of forcing the main thread to wait around
on every call to processWindowMessages, we will simply skip it, if the mutex is already
claimed by the display thread. This should fix slow loading issues seen by some with
the new loading screen.
2015-05-16 12:55:15 -04:00
cpw 58fdfb6fa1 Fix patches after last fml merge. 2015-05-14 13:56:10 -04:00
cpw dca8a4a550 Merged FML @ 1.7.10 2015-05-13 20:00:48 -04:00
cpw cb6f92e3c7 Merged FML 2015-05-11 18:46:21 -04:00
cpw 081a949bfd Merge branch '1.7.10'
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
	src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
	src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
	src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
	src/main/java/net/minecraftforge/fml/common/LoadController.java
	src/main/java/net/minecraftforge/fml/common/Loader.java
	src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
	src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
	src/main/resources/fml_at.cfg
2015-05-10 23:55:11 -04:00
LexManos 1f679be553 Merge pull request #1863 from Tmtravlr/master
Initialized the Nether Fortress chest loot
2015-05-10 16:04:07 -07:00
Tmtravlr b2de64bc70 Initialized the Nether Fortress chest loot
Forced the nether fortress chest loot to initialize in ChestGenHooks
like the other types.

Changed tabs to spaces. Silly Eclipse.
2015-05-10 15:59:07 -07:00
cpw 228ce68639 Update current json 2015-05-08 13:54:11 -04:00
cpw 4270f0fb4a MinecraftForge/FML@0b84b6aa29 Expose the state of the loader 2015-05-07 14:24:14 -04:00
cpw dd49a0cd84 Merge branch '1710ls' into 1.7.10 2015-05-07 14:23:37 -04:00
cpw 76c7177553 Expose the state of the loader 2015-05-07 14:17:45 -04:00
Fry 7ab952d410 Merge pull request #1853 from Silfadur/master
Added hook for  IPerspectiveAwareModel in RenderItem.renderItemIntoGUI f...
2015-05-05 04:22:01 +03:00
Silfadur b756bd5f9a Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI 2015-05-05 02:23:38 +02:00
RainWarrior 88a7c0b233 Updated FML:
MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore.
MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
MinecraftForge/FML@91338433fa Add classloader exclusion for ASM
MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes MinecraftForge/FML#651
MinecraftForge/FML@8ccfa24764 Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10
MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen.
MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now.
MinecraftForge/FML@dda4313539 Revert "Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10.
MinecraftForge/FML@5dbb481732 Eliminated texture name allocation race condition
MinecraftForge/FML@450b82ca0e Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed
2015-05-04 22:18:38 +03:00
RainWarrior c28794fe38 Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed 2015-05-04 22:10:36 +03:00
RainWarrior fb18c07722 Eliminated texture name allocation race condition 2015-05-04 21:54:33 +03:00
cpw 1b1fbbb70d MinecraftForge/FML@dda4313539 Revert "Merge pull request #650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. 2015-05-04 09:26:09 -04:00
cpw 65ab79cf69 Revert "Merge pull request #650 from luacs1998/1.7.10"
This undoes the seriously broken change from Sponge to support Mixins, that breaks
a wide variety of coremods. Given the widespread incompatibility it introduces, it
won't be re-added at 1.7.10.

This reverts commit 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing
changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a.
2015-05-04 08:50:08 -04:00
cpw 815b97bf7c MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
MinecraftForge/FML@91338433fa Add classloader exclusion for ASM
MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes #651
MinecraftForge/FML@8ccfa24764 Merge pull request #650 from luacs1998/1.7.10
MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen.
MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now.
2015-05-02 22:15:08 -04:00
cpw c43e4a8022 Fix the ordering of the messages, so they make sense now. 2015-05-02 22:13:41 -04:00
LexManos a003d1b360 Merge pull request #1843 from Zaggy1024/getlightvaluefix
Make World.setBlockState check whether the light value from getLightValue(IBlockAccess, BlockPos) has changed.
2015-05-01 17:58:30 -07:00
Zaggy1024 ee003ef77e Fixed a bug which caused the light level not to update when a block implements Block.getLightValue(IBlockAccess, BlockPos) to change the light value for different block states. 2015-05-01 17:10:08 -05:00
LexManos 4e8d5255ed Merge pull request #652 from AbrarSyed/patch-2
remapped parameters and added ending newlines
2015-04-29 14:45:59 -07:00
AbrarSyed 8e14f9e1cc remapped parameters and added ending newlines 2015-04-29 13:37:09 -05:00
cpw 858c64ffd3 Optifine can tell us when they're ready for the new splash screen. 2015-04-29 08:15:35 -04:00
LexManos fd8c2ba08c Merge pull request #650 from luacs1998/1.7.10
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
LexManos 1aacf9cfe2 Merge pull request #649 from luacs1998/master
Add classloader exclusion for ASM
2015-04-27 15:29:34 -07:00
cpw ddc6b0a19f Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1)
for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping
commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects
Closes #651
2015-04-26 11:32:28 -04:00
luacs1998 0c933be8dd Add classloader exclusion for ASM 2015-04-26 20:40:22 +08:00
luacs1998 aad4678d40 Add classloader exclusion for ASM 2015-04-26 20:14:35 +08:00
LexManos c6525cb3f3 Merge pull request #1832 from Parker8283/lhsf-1.8
[1.8] Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 17:21:30 -07:00
LexManos 083e4758a4 Merge pull request #1831 from Zaggy1024/clientonlyrenderinlayer
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 17:00:37 -07:00
Parker Young 9a7c20e791 Fixes MC-52974: Host's skin doesn't load in LAN 2015-04-25 19:58:24 -04:00
Zaggy1024 2589a0d1f6 Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer. 2015-04-25 18:45:49 -05:00
RainWarrior 626a192ce6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack 2015-04-26 00:22:43 +03:00
cpw 37075d0437 MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore. 2015-04-25 15:06:20 -04:00
cpw 46c5505565 Splash progress screen will not load in the presence of optifine anymore. 2015-04-25 15:05:28 -04:00
cpw 63e71af229 MinecraftForge/FML@94821fac98 Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json 2015-04-25 01:34:25 -04:00
cpw 89daceb9eb Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
Example here: https://gist.github.com/cpw/d3edc292631708f2d454
2015-04-25 01:30:17 -04:00
cpw 66a4db5fa0 MinecraftForge/FML@4fe7b469b5 Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
MinecraftForge/FML@31ae43590a Fix trying to close the screen during error.
2015-04-25 00:47:09 -04:00
cpw 4e6aa905f0 Fix trying to close the screen during error. 2015-04-25 00:41:50 -04:00
RainWarrior 794ff1d1b4 Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now. 2015-04-25 05:12:02 +03:00
cpw 55cbba0764 MinecraftForge/FML@36688e781a Add in resource reloading to the bar. Tidy up some of the labels a bit.
MinecraftForge/FML@a1dc465a55 More progress bar action!
MinecraftForge/FML@bfcbf4ef43 More progress bar hooks
MinecraftForge/FML@a6670c415e Thread errors should be correctly displayed in the crash report now
MinecraftForge/FML@9a16d26186 fixed bar text positioning
MinecraftForge/FML@0059c63028 Track mipmaps and texture upload
MinecraftForge/FML@ef5f809752 Fix broken log message in vanilla.
2015-04-24 19:16:55 -04:00
cpw 1fdd18398e Fix broken log message in vanilla. 2015-04-24 19:02:54 -04:00
cpw 454e2e36a4 Track mipmaps and texture upload 2015-04-24 19:01:49 -04:00
RainWarrior 753115678a fixed bar text positioning 2015-04-25 01:37:39 +03:00
RainWarrior c8acd763ef Thread errors should be correctly displayed in the crash report now 2015-04-25 01:27:57 +03:00
cpw 3d03b31d00 More progress bar hooks 2015-04-24 17:47:39 -04:00
cpw d18d493174 More progress bar action! 2015-04-24 17:11:49 -04:00
cpw ab3413a31e Add in resource reloading to the bar. Tidy up some of the labels a bit. 2015-04-24 16:00:22 -04:00
Lex Manos 591971936d Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824 2015-04-23 23:46:55 -07:00
RainWarrior a297a615b9 MinecraftForge/FML@5785a9c9e8 Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645
MinecraftForge/FML@bd117be9c3 Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:51:44 +03:00
RainWarrior 53a21e7e47 Correctly track exceptions thrown in the loading screen rendering thread 2015-04-24 05:38:32 +03:00
LexManos 68def9c352 Merge pull request #647 from AbrarSyed/patch-1
Fixed scala module libs in dev json
2015-04-23 18:55:27 -07:00
AbrarSyed 99c60ee156 fixed scala module libs in jsons 2015-04-23 20:54:14 -05:00
LexManos 3f59b560d7 Merge pull request #1814 from Lunatrius/block-dispatcher
Extracted the creation of RegionRenderCache into a method for extendability
2015-04-22 13:25:48 -07:00
Lunatrius ea9d805e4f Extracted the creation of RegionRenderCache into a method.
Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc).
2015-04-22 15:40:07 +02:00
cpw 87e6c29028 Fix up multiple injections of cmdline files via versionspecificmoddir.
Closes #645
2015-04-22 08:31:25 -04:00
cpw c12bb689fb MinecraftForge/FML@a39482c4b7 Splash screen implementation
MinecraftForge/FML@01fea095cd Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
MinecraftForge/FML@364b4bbbb0 Call some loader stuffs
MinecraftForge/FML@61a891280d Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:30:52 -04:00
cpw ba354da317 Make sure to close the splash screen if there's gonna be an error display 2015-04-21 00:28:19 -04:00
cpw 6398961c48 Call some loader stuffs 2015-04-20 23:34:36 -04:00
cpw 8c54026f2d Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10 2015-04-20 23:15:37 -04:00
RainWarrior 5b06b71d04 Splash screen implementation 2015-04-21 06:09:29 +03:00
cpw 50215307f2 MinecraftForge/FML@d14d1a8fea Update to use the inherited jar format. Simplifies a lot.. 2015-04-20 22:27:10 -04:00
cpw b049b39760 Update to use the inherited jar format. Simplifies a lot.. 2015-04-20 22:25:29 -04:00
cpw 96cbadb874 Expose the fluid that a block was constructed with, useful for 'non-default'
configuration of fluidblocks. Shouldn't be used outside of this purpose.
2015-04-20 10:29:04 -04:00
cpw 50608986fe Replace the OLD fluid in the fluidID map, not the new one.. 2015-04-20 10:01:36 -04:00
cpw 7bbe8df2b8 Fix static initializer derp. 2015-04-20 09:26:27 -04:00
cpw 0543828603 Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present. 2015-04-20 09:06:23 -04:00
cpw 7e9d2fb509 Reformat ItemArmor$ArmorMaterial.getBaseItem to use an if/then/else structure. The switch
causes the generation of an internal class which may derp custom armor addition.
Closes #1799
2015-04-19 12:04:22 -04:00
cpw dcb2f2588c Actually use the override constraint in ticket requests. Closes #1802 2015-04-19 11:57:39 -04:00
cpw 178acfbb20 Change logging to avoid the String.format bug. Closes #1809 2015-04-19 11:52:23 -04:00
cpw 57408af2a3 MinecraftForge/FML@8f9e3a7e30 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638 2015-04-18 21:54:01 -04:00
cpw e1ed3c07c2 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638 2015-04-18 21:48:49 -04:00
cpw 54af750717 Verify that the fluid registry doesn't contain "junk" fluids thru reflection. 2015-04-18 21:37:45 -04:00
Lex Manos 1effc27790 Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
(cherry picked from commit de066a86da)

Conflicts:
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
2015-04-18 21:22:44 -04:00
Lex Manos de066a86da Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker. 2015-04-17 02:07:01 -07:00
KingLemming 61984561cd Merge pull request #1805 from KingLemming/1.7.10
OreDict functionality updates.
2015-04-16 17:20:43 -04:00
King Lemming cd3bbfb02c Adds some new Ore querying functionality.
Also attempts to size initial Hashmaps in a logical manner.

Signed-off-by: King Lemming <[email protected]>
2015-04-16 17:18:37 -04:00
Lumien 81ab4cbc5f Added LivingExperienceDropsEvent to change the amount of experience an entity drops 2015-04-14 11:58:00 +02:00
Lex Manos c5f22f56d8 Dissallow color codes in mod names displayed in Mod gui list. And code formatting. 2015-04-13 21:52:53 -07:00
LexManos 475d7fc02d Revert KL's change, requesting a ore WILL register it.
Registering like this and returning a new empty list allows for modders to register their recipes and such without requiring to be executed after someone actually adds an item. If handled properly this allows for more flexible load orders, and more responsive code.
2015-04-13 21:28:16 -07:00
KingLemming b30b551197 Merge pull request #1796 from KingLemming/1.7.10
Adjusts OreDictionary to prevent invalid registrations.
2015-04-13 22:41:25 -04:00
King Lemming 3cd7f6bd87 Adjusts OreDictionary to prevent invalid registrations.
Getting Ore Names for a non-existent ore will no longer automatically add that Name to the list nor generate an ID.

Tweaks a warning message in the FluidContainerRegistry. No functionality change.

Signed-off-by: King Lemming <[email protected]>
2015-04-13 22:40:38 -04:00
LexManos 5a5ef86da9 Merge pull request #636 from tterrag1098/betterModList
Fix control codes being used for mod list sort. Clean up sorting code.
2015-04-13 17:13:52 -07:00
tterrag1098 3fbd6b0810 Fix control codes being used for mod list sort. Clean up sorting code and fix a bug with right click clearing. 2015-04-12 00:51:03 -04:00
cpw 5ac654dc1c MinecraftForge/FML@888e489394 Allow registering custom language adapters.
MinecraftForge/FML@906f94ca14 Some tidyup of the PR
MinecraftForge/FML@1c025f1843 Patch TracingPrintStream to handle Kotlin IO.
2015-04-11 18:21:50 -04:00
cpw 277495c8e4 MinecraftForge/FML@dfce4cd8d0 Allow registering custom language adapters.
MinecraftForge/FML@9fecd72cf0 Some tidyup of the PR
MinecraftForge/FML@10ac2a4fd9 Fix itemCtorArgs javadoc in registerBlock
MinecraftForge/FML@86f70d37a4 Patch TracingPrintStream to handle Kotlin IO.
2015-04-11 18:20:11 -04:00
Arkan Emberwalker 5f7c3bd72d Patch TracingPrintStream to handle Kotlin IO.
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:15:35 -04:00
Arkan Emberwalker 6cdde0f9e4 Patch TracingPrintStream to handle Kotlin IO.
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:13:25 -04:00
tterrag1098 592c9c8e42 Fix itemCtorArgs javadoc in registerBlock 2015-04-11 18:09:31 -04:00
cpw 4af2ba3949 Some tidyup of the PR 2015-04-11 18:05:00 -04:00
Arkan Emberwalker 0055973f43 Allow registering custom language adapters.
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 18:05:00 -04:00
cpw 1fa358ccee Some tidyup of the PR 2015-04-11 18:02:00 -04:00
cpw 5c88164211 And handle the null case in the constructor itself. Closes #1794 (again) 2015-04-11 17:38:15 -04:00
cpw 230d757a89 Fix NPE - Closes #1794 2015-04-11 17:27:14 -04:00
cpw 9671179453 Fluids are now tracked internally by mod. This allows for the server and the world to specify a "default"
in the case of a possible alternative fluid implementation. If you always called registerFluid, things
should work pretty seamlessly, but if you didn't (gating with an isFluidRegistered check for example)
you should change to register anyway. This way, even if you're not default in the overall instance, you may
become default if you're the only mod present on a server, for example, or in a world save.

This should radically decrease the mixups caused by mod load ordering problems, and other issues around fluid
tracking.
2015-04-11 17:18:53 -04:00
Arkan Emberwalker 2b3cdaa752 Allow registering custom language adapters.
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 17:36:16 +01:00
cpw eb12936a52 MinecraftForge/FML@0da1263ff9 Enhance error output for bad textures a bit more and try and capture more types of error.. 2015-04-11 12:30:20 -04:00
cpw fa5ab52acd Enhance error output for bad textures a bit more and try and capture more types of error.. 2015-04-11 12:12:37 -04:00
cpw 345d905438 MinecraftForge/FML@be5ec06e31 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable format. 2015-04-11 01:03:50 -04:00
cpw c7622c06d7 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable
format.
2015-04-11 00:52:58 -04:00
cpw 6049d371f3 MinecraftForge/FML@ce791cb1f2 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
MinecraftForge/FML@852710962a Clean up some dead code
2015-04-10 22:46:53 -04:00
cpw 994f722843 Clean up some dead code 2015-04-10 22:34:06 -04:00
Lex Manos 4be96044d0 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. 2015-04-10 22:28:39 -04:00
KingLemming 6d3494a853 Merge pull request #1791 from KingLemming/1.7.10-fluid
FCR Warning + Denial
2015-04-10 20:11:17 -04:00
King Lemming 37d63b3fe9 Adds a warning to the FluidContainerRegistry when a mod does something stupid! Also denies the registration.
Signed-off-by: King Lemming <[email protected]>
2015-04-10 20:09:58 -04:00
KingLemming 291c57b624 Merge pull request #1789 from KingLemming/1.7.10-fluid
1.7.10 fluid
2015-04-10 16:41:29 -04:00
King Lemming 186f92479d Fixes FluidContainerRegistry properly - no more corner case where client/server mods disagree.
Also clarifies the 2x Fluid registration error message somewhat.

Signed-off-by: King Lemming <[email protected]>
2015-04-10 16:38:45 -04:00
KingLemming 7e9dfb1a11 Merge pull request #4 from MinecraftForge/1.7.10
1.7.10
2015-04-10 16:24:33 -04:00
Lex Manos 07e14a9fa4 MinecraftForge/FML@4a753227ad Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. 2015-04-10 03:36:51 -07:00
Lex Manos aeb4b03bf4 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. 2015-04-10 03:28:41 -07:00
KingLemming 806b4a3bdf Merge pull request #1784 from KingLemming/1.7.10-fluid
Change to FluidContainerRegistry
2015-04-09 17:45:09 -04:00
King Lemming 433b7ca589 Fixes #1782
Signed-off-by: King Lemming <[email protected]>
2015-04-09 17:28:20 -04:00
KingLemming 78db5732ca Merge pull request #2 from MinecraftForge/1.7.10
1.7.10
2015-04-09 16:56:04 -04:00
LexManos c11952714c Merge pull request #1752 from AbrarSyed/patch1
changed run configs to GradleStarts
2015-04-09 12:11:32 -07:00
Timothy Tomkins dfd42ab573 Player sensitive version of Block.getPickBlock
Block.getPickBlock was patched in 1.7 but was overlooked in 1.8.

Closes: https://github.com/MinecraftForge/MinecraftForge/issues/1709
2015-04-09 02:09:58 -04:00
LexManos 24802143eb Merge pull request #1775 from Prototik/patch-1
[1.7.10] Fix FluidRegsitry.registerFluid
2015-04-08 09:25:01 -07:00
Sergey Shatunov a42cf1ae37 Fix FluidRegsitry.registerFluid
FluidRegistry:
```java
    static BiMap<String, Fluid> fluids = HashBiMap.create();
    static BiMap<Fluid, Integer> fluidIDs = HashBiMap.create();
...
    public static boolean registerFluid(Fluid fluid)
    {
        if (fluidIDs.containsKey(fluid.getName()))
            ^^^^^^^
```
There is definitely should be fluids instead fluidIDs. This mistake broke many mods.
2015-04-08 17:26:40 +06:00
Lex Manos 2f5b5f5ffe Updated FML:
MinecraftForge/FML@c8160311d5 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
MinecraftForge/FML@9a894952af Merge pull request #627 from GotoLink/patch-1
MinecraftForge/FML@40faac6452 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 20:12:19 -07:00
Lex Manos 02ebc9ca21 Restore binary compatibility issues in FluidRegistry caused by recent changes. 2015-04-07 20:06:55 -07:00
Lex Manos 1fd39578b0 MinecraftForge/FML@31cf2a9cab Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. 2015-04-07 20:06:01 -07:00
Lex Manos 79ca5bbf86 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. 2015-04-07 19:36:20 -07:00
Lex Manos f6c50cc3af Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. 2015-04-07 19:32:25 -07:00
Irtimaled 1eb535f14f Copy fortress.dat from vanilla location
Fixes #1747

If the dat file isn't in the dimension specific folder but is present in the vanilla data folder then copy it over.
2015-04-07 14:40:17 +01:00
cpw 4f0e2fb9c4 You shouldn't be creating FluidStacks from unregistered Fluids. Warn clearly on failed registrations, and make a useful log message for failed fluidstack
creations. Should help a lot with tracking down broken mods that are doing this wrongly.
2015-04-05 22:48:09 -04:00
King Lemming f7395f517b Allow for duplicate Fluid Blocks. It's annoying to be sure but just as with the OreDictionary, we'll have to handle it.
Signed-off-by: King Lemming <[email protected]>
2015-04-05 22:30:39 -04:00
cpw defaddecec Fix formatting 2015-04-05 22:30:39 -04:00
cpw 7506a5b7ad Add in a fluidid transformer 2015-04-05 22:30:39 -04:00
King Lemming 3fc40b955a Removed fluidID from ItemStack.
This fixes a rather huge issue where FluidStacks on the client could be desynced if a modder was unaware of it.

This is a breaking change but can be mitigated with a transformer to the getter getFluidID().

Signed-off-by: King Lemming <[email protected]>
2015-04-05 22:30:39 -04:00
LexManos cf7122ed59 Merge pull request #1771 from iChun/master
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 14:31:43 -07:00
iChun b2f1b036de Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex. 2015-04-04 22:30:23 +01:00
LexManos e0bc6fc65c Merge pull request #1770 from iChun/master
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
2015-04-03 21:14:46 -07:00
iChun 8c35bc1dc7 Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
RenderPlayerEvent.Specials was removed because the special effects are done in the LayerRenderer now.
2015-04-03 21:11:43 +01:00
cpw 38b9febfe5 Forge really should have always supported the concept of an "exact spawn". Individual world providers can still
change this behaviour of course, but for default maps it makes sense to support it as a config option.
2015-04-03 10:31:25 -04:00
cpw e837b2e2cd MinecraftForge/FML@12ccf9cf49 Rather than try to fall back to the backup level.dat in case of weirdness in the ID map, just fail hard. There is probably a serious modder derp in this case and there's nothing FML can do to recover the situation except avoid making it worse.
MinecraftForge/FML@e8cd368da3 It's an IllegalState not an IllegalArgument *sigh*
MinecraftForge/FML@2be9c74342 And fix itemblocks being removed, leaving behind a residual block. This is a legitimate action - use the missing mapping event to let the mod tell us about it
MinecraftForge/FML@7d8804cf65 You can't setAction to BLOCKONLY
MinecraftForge/FML@c73861efe6 Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
MinecraftForge/FML@94c45b48c1 Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since it's a vanilla bug. Closes #619
2015-04-03 10:26:17 -04:00
LexManos 6d71b05838 Merge pull request #627 from GotoLink/patch-1
Stop IllegalFormatConversionException thrown
2015-04-02 13:32:56 -07:00
cpw 38cdbc16e2 Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since
it's a vanilla bug. Closes #619
2015-04-02 13:07:40 -04:00
GotoLink 5071e76881 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
%d is not a valid format for getModId(), which returns String.
2015-04-02 18:33:19 +02:00
Matthew Messinger ee414b2037 Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747
Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
2015-04-01 19:51:44 -04:00
cpw 01000f9d34 Update FML - merge the 1.7.10 changes in to forge @ 1.8. Wow git is (sorta) AWESOME!
MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast.
MinecraftForge/FML@dfebcafd49 Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int) dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers but bumping a server to this version will allow clients with this version as well to now login in dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am..
MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty.
MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly
MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
MinecraftForge/FML@13ac015f0c Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization.
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
MinecraftForge/FML@12ccf9cf49 Rather than try to fall back to the backup level.dat in case of weirdness in the ID map, just fail hard. There is probably a serious modder derp in this case and there's nothing FML can do to recover the situation except avoid making it worse.
MinecraftForge/FML@e8cd368da3 It's an IllegalState not an IllegalArgument *sigh*
MinecraftForge/FML@2be9c74342 And fix itemblocks being removed, leaving behind a residual block. This is a legitimate action - use the missing mapping event to let the mod tell us about it
MinecraftForge/FML@7d8804cf65 You can't setAction to BLOCKONLY
MinecraftForge/FML@13df640d9d Pull in a lot of the FML tweaks from 1.7 to 1.8
MinecraftForge/FML@447beaa99e Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:50:58 -04:00
cpw 8fe5d26e94 Merge remote-tracking branch 'origin/1.7.10'
Conflicts:
	fml
2015-04-01 17:43:25 -04:00
cpw 9d1f554075 Merge remote-tracking branch 'origin/1.7.10' 2015-04-01 17:17:24 -04:00
cpw c3559b2dbd Pull in a lot of the FML tweaks from 1.7 to 1.8
Merge remote-tracking branch 'origin/1.7.10'

Conflicts:
	src/main/java/cpw/mods/fml/common/MissingModsException.java
2015-04-01 17:06:12 -04:00
cpw 0a61ffb57e MinecraftForge/FML@2afd55ab82 Fix scala mods, Closes #621
MinecraftForge/FML@c541b08ef6 Merge pull request #622 from diesieben07/scala-fix
MinecraftForge/FML@d5021417dd Forgot the register handling bit. Registration should work now..
MinecraftForge/FML@5a65c65686 OK, this is finally actually working, I think...
2015-04-01 16:08:42 -04:00
cpw 45ec6e0833 OK, this is finally actually working, I think... 2015-04-01 15:56:48 -04:00
RainWarrior 46b1b82f13 Fixed mipmapping not being enabled by expanding 1x1 texture 2015-04-01 16:06:03 +03:00
cpw e1c83de490 Comment on previous commit fix - it worked. Thanks to skyboy and tterrag for investigating and verifying.
A chest as an acheivement icon will recreate the original problem, for note.
2015-04-01 07:13:14 -04:00
cpw 1b7ce7592c Experimental "fix" for the weird rendering in the Acheivements screen. Thanks skyboy for spotting this. 2015-03-31 20:50:16 -04:00
cpw 0d79aa1e0a You can't setAction to BLOCKONLY 2015-03-31 15:38:53 -04:00
cpw d684a4e066 And fix itemblocks being removed, leaving behind a residual block. This
is a legitimate action - use the missing mapping event to let the mod
tell us about it
2015-03-31 15:29:51 -04:00
cpw 0b8ff5890a It's an IllegalState not an IllegalArgument *sigh* 2015-03-31 15:11:39 -04:00
cpw 0bff21315c Rather than try to fall back to the backup level.dat in case of weirdness
in the ID map, just fail hard. There is probably a serious modder derp in this
case and there's nothing FML can do to recover the situation except avoid
making it worse.
2015-03-31 15:09:49 -04:00
cpw 8309a32ad2 Forgot the register handling bit. Registration should work now.. 2015-03-31 13:38:30 -04:00
LexManos 8ce395ea4e Merge pull request #622 from diesieben07/scala-fix
Fix scala mods, Closes #621
2015-03-28 11:23:59 -07:00
diesieben07 8f5bb75ef2 Fix scala mods, Closes #621 2015-03-28 16:00:50 +01:00
Lex Manos 0f162ddc6a Updated FML:
MinecraftForge/FML@2a268cd566 Improve mod list GUI, add sort and search
MinecraftForge/FML@951fc2d9fd First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items.
MinecraftForge/FML@410582222d Merge pull request #614 from tterrag1098/betterModList
MinecraftForge/FML@ba0b176430 Fix ModDiscoverer ignoring inner classes.
MinecraftForge/FML@9cc313eab9 Merge pull request #617 from diesieben07/innerclass-disc
MinecraftForge/FML@01aaa7dc97 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
MinecraftForge/FML@8cecc47b85 Merge pull request #620 from killjoy1221/extra-coremod-fix
MinecraftForge/FML@38d9a5f444 Enhance output of common FML errors in crash reports and server

Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.GUI.
2015-03-27 03:03:31 -07:00
Lex Manos 9e7e9e5cbf MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.
2015-03-27 02:54:55 -07:00
Lex Manos ddcc6a1aa4 Enhance output of common FML errors in crash reports and server GUI. 2015-03-27 01:40:23 -07:00
Lex Manos 68c3a85fef Enhance output of common FML errors in crash reports and server GUI. 2015-03-27 01:17:57 -07:00
LexManos b1f18107e6 Merge pull request #620 from killjoy1221/extra-coremod-fix
Fixed typo causing coremods to be missed in certain situations.
2015-03-24 05:13:45 -07:00
Matthew Messinger 8da78750aa Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 2015-03-23 22:58:02 -04:00
cpw ce10d0dfd0 MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
MinecraftForge/FML@13ac015f0c Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization.
2015-03-22 13:07:06 -04:00
cpw c2f11ecc35 Change iterator behaviour for the registry - include substitutions in the standard iterator, so that
vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the
absolute set, used mostly for sanity checking and serialization.

Closes #618
2015-03-22 12:56:05 -04:00
cpw 2451e49df2 Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever. 2015-03-22 12:54:05 -04:00
cpw 3df54d3d0f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
Closes #616
2015-03-22 12:03:37 -04:00
LexManos 3bb9c6a92c Merge pull request #617 from diesieben07/innerclass-disc
Fix ModDiscoverer ignoring inner classes.
2015-03-21 13:15:43 -07:00
LexManos 8d09b39d80 Merge pull request #1755 from simon816/custom-tileentity-data
Add getTileData() to TileEntity
2015-03-21 13:10:43 -07:00
diesieben07 961570f253 Fix ModDiscoverer ignoring inner classes. 2015-03-21 19:15:26 +01:00
simon816 301088acdc Add getTileData() to TileEntity
- The same idea as Entity.getEntityData()
2015-03-21 01:23:55 +00:00
cpw c9fd2b6173 MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast.
MinecraftForge/FML@dfebcafd49 Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int) dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers but bumping a server to this version will allow clients with this version as well to now login in dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am..
MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty.
MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly
2015-03-20 16:12:05 -04:00
cpw f4972b7611 Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events)
works properly
2015-03-20 15:55:16 -04:00
cpw 613c5edc7d Forgot that I need a noarg ctor. I'm so rusty. 2015-03-20 15:11:12 -04:00
cpw a8cbbfcd99 Clean up my patch. Terrible person I am.. 2015-03-20 15:00:19 -04:00
cpw 889c967a5b Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int)
dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers
but bumping a server to this version will allow clients with this version as well to now login in
dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
2015-03-20 14:19:54 -04:00
LexManos 36d6d74e95 Merge pull request #1754 from JamiesWhiteShirt/master
Added newVolume and newPitch to PlaySoundAtEntityEvent.
2015-03-19 13:47:36 -07:00
JamiesWhiteShirt 3b567a92d8 Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity. 2015-03-19 12:37:21 +01:00
AbrarSyed 07c42b89fd changed run configs to GradleStarts 2015-03-17 23:40:48 -05:00
LexManos 888bab92c3 Merge pull request #1723 from Geforce132/master
Add an EntityMountEvent.
2015-03-16 10:01:53 -07:00
LexManos 5ac394de0e Merge pull request #614 from tterrag1098/betterModList
Improve mod list GUI, adds sort buttons and a search bar
2015-03-16 10:01:12 -07:00
cpw d81fd22792 First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items.
It probably doesn't work yet though.
2015-03-15 16:22:28 -04:00
cpw 278612ad98 Try and improve performance of the registry by avoiding superType.cast. 2015-03-14 15:32:34 -04:00
Geforce132 d2f36d56f1 -Added EntityMountEvent. 2015-03-13 19:12:16 -05:00
tterrag1098 a27e7e03dd Improve mod list GUI, add sort and search 2015-03-13 18:38:10 -04:00
LexManos 588f4e3350 Merge pull request #1745 from diesieben07/ingamegui-fix
Fix jukebox message being too low
2015-03-11 15:46:14 -07:00
diesieben07 642003e065 Fix jukebox message being too low with forge 2015-03-11 23:25:41 +01:00
Lex Manos 5229abc26d Updated FML:
MinecraftForge/FML@3e7ae47f8f Fix Event Bus Access Issues
MinecraftForge/FML@c8e2a5f377 Fixed WorldInfo properties not loaded
MinecraftForge/FML@7f96b2c69a Fix Debug packet logger on local memory connections.
2015-03-04 21:13:15 -08:00
Lex Manos 418b7794d2 Fix Debug packet logger on local memory connections. 2015-03-04 21:00:31 -08:00
LexManos 6244e88f10 Merge pull request #1739 from robin4002/master
Remove translation and add a note for contributors
2015-03-04 11:33:06 -08:00
robin4002 af0316ab9b remove translation and add a note for contributors 2015-03-04 20:21:16 +01:00
LexManos 4d4f82816f Merge pull request #610 from Zot201/1.8
Fixed WorldInfo properties not loaded
2015-03-04 10:34:25 -08:00
Zot201 189619fcdd Fixed WorldInfo properties not loaded 2015-03-05 03:21:19 +09:00
LexManos 7223e1a7d9 Merge pull request #609 from Zot201/1.8
Add transformer to allow protected/private classes to use the event bus.
2015-03-04 09:49:25 -08:00
LexManos d93e8bcf48 Merge pull request #1733 from Zot201/enchantment-fix
Fixed enchanting table applying secondary enchs. Closes #1428
2015-03-02 12:10:12 -08:00
Zot201 ecca5720c8 Fixed enchanting table applying secondary enchs. 2015-03-02 17:00:38 +09:00
LexManos 7355bdf600 Merge pull request #1721 from me4502/update-event
Added NeighborNotifyEvent fired on server side only, allows for monitoring and disabling world 'physics' updates.
2015-02-28 22:54:48 -08:00
Me4502 c21e38cd3b Add NeighborNotiftyEvent. 2015-03-01 16:53:32 +10:00
Zot201 ccffcf60f8 Fix Event Bus Access Issues
1) Allow overriding methods in subclass without extra SubscribeEvent annotations
2) Transform event subscribers to have public method/class
2015-03-01 15:37:47 +09:00
Lex Manos 1af0734f51 Fix compile error in ClientHax's PR. 2015-02-26 23:20:43 -08:00
LexManos d82e80b2cf Merge pull request #1729 from clienthax/master
Add method to set entity placement type.
2015-02-26 22:16:22 -08:00
clienthax 848dee14d2 Current spawner implementation checks the EntitySpawnPlacementRegistry hashmap to check where a entity should spawn
as there is no way to modify this without the use of reflection or a AT, you can not specify where you want your entity to spawn
adding this helper method will allow developers to specify where they want their entity to spawn.

Signed-off-by: Clienthax <[email protected]>

Update EntitySpawnPlacementRegistry.java.patch
2015-02-27 03:58:40 +00:00
LexManos 31e1aae91a Merge pull request #1730 from Tmtravlr/master
Added Nether Fortress chest to the ChestGenHooks
2015-02-26 17:34:56 -08:00
Tmtravlr f152741bba Added Nether Fortress chest to the ChestGenHooks
I tried to follow the directions on

https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge

as best as I could. =)

If anything is wrong, let me know and I'll change it!
2015-02-26 14:25:41 -07:00
RainWarrior 638af63f4d Hopefully fix NPE during baking of empty vanilla item models 2015-02-23 16:02:10 +03:00
Lex Manos 7c03542d94 Fire WorldEvent.Load for Client worlds. Closes #1719 2015-02-23 02:18:58 -08:00
Lex Manos b2ca559851 Make Container.mergeItemStack respect Slot.isValidItem Closes #1630 2015-02-23 02:03:52 -08:00
Lex Manos f16a7ff890 Fix JukeBoxes not storing the inserted record. All TE's in minecraft are in net.minecraft.tileentity EXCEPT JukeBoxes. Closes #1633 Closes #1714 2015-02-23 01:44:54 -08:00
Lex Manos 938b752036 Fix NPEs in last commit. 2015-02-21 19:49:13 -08:00
Lex Manos 9335e2907b Fix NPEs in mlast commit. 2015-02-21 19:48:48 -08:00
Lex Manos 899ecd0d64 Updated FML:
MinecraftForge/FML@c9cf3136c2 New @Mod properties to define which environment to load the mod on.
clientSideOnly will only be loaded in the Client environment.
serverSideOnly will only be loaded in the Dedicated server environment.
Combine with acceptedMinecraftVersions to prevent users from loading the mod in the incorrect environment.
2015-02-21 18:43:21 -08:00
Lex Manos 7269d22449 New @Mod properties to define which environment to load the mod on.
clientSideOnly will only be loaded in the Client environment.
serverSideOnly will only be loaded in the Dedicated server environment.
Combine with acceptedMinecraftVersions to prevent users from loading the mod in the incorrect environment.
2015-02-21 18:33:30 -08:00
Lex Manos 46695cf4cf Updated FML:
MinecraftForge/FML@5eff408975 Filter more known libraries from potential mod canidates.
MinecraftForge/FML@feb4c436db Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
MinecraftForge/FML@41e806fa95 Fix double decoding of UTF8 characters in lang files.
2015-02-21 17:28:53 -08:00
Lex Manos 0281b74c7c Fix double decoding of UTF8 characters in lang files. 2015-02-21 17:27:21 -08:00
Lex Manos ae085bb84d Fixed using items on the wrong block client side caused by iChuns eyeheight update. 2015-02-19 18:09:36 -08:00
LexManos ccfd928c9a Merge pull request #1718 from iChun/master
Reimplement variable eyeHeight for players which was removed in the 1.7 to 1.8 port.
2015-02-18 19:01:06 -08:00
iChun d66951b368 Reimplement variable eyeHeight for players which was removed in the 1.7 to 1.8 port. 2015-02-19 02:08:03 +00:00
RainWarrior 0e34510032 Removed event bus call from the ModelLoader 2015-02-17 21:20:19 +03:00
LexManos 83ca72bef2 Merge pull request #1708 from matthewprenger/PR-1
Ability to add prefixes and suffixes to the player's display name
2015-02-16 22:52:03 -08:00
Lex Manos 5b28eb53e8 Add safty to URL detection in chat. Closes #1712 2015-02-16 22:46:55 -08:00
RainWarrior b14cfa45e5 RenderItem can now use baked quad color 2015-02-17 05:02:16 +03:00
RainWarrior 93cd9722b0 Added a default white texture; Fixed B3DLoader crashing when the brush has empty texture specified 2015-02-17 05:02:16 +03:00
LexManos 9e4ef54753 Merge pull request #1711 from Parker8283/patch-1
Added ATs for EnumFacing
2015-02-16 13:49:11 -08:00
Parker Young e04240e5e3 Added ATs for EnumFacing
This publics the VALUES array and HORIZONTALS array in EnumFacing, thus giving modders access to these arrays, much like ForgeDirection had.
2015-02-16 16:30:55 -05:00
Lex Manos 0a8a535e2c Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true. 2015-02-15 17:30:56 -08:00
Lex Manos d14ad7dd9a Filter more known libraries from potential mod canidates. 2015-02-15 17:30:18 -08:00
RainWarrior d741b1bafc Attributes.put (de)normalization now works as intended 2015-02-16 03:53:33 +03:00
Matthew Prenger b4f8945fec Add the ability to add prefixes and suffixes to the player's display name. 2015-02-15 17:47:13 -06:00
Lex Manos f6ca556a38 Hold a weak reference to the Minecraft fake player object. Closes #1705 2015-02-15 13:00:09 -08:00
LexManos e5cd5fc256 Merge pull request #1689 from matthewprenger/master
Minor tweak to UsernameCache to also cache usernames of offline players
2015-02-15 12:37:50 -08:00
RainWarrior 44e31f802a Updated FML 2015-02-14 05:17:56 +03:00
RainWarrior 68efb9d6f4 Moved transformer wrappers to a separate package (should fix signing errors), fixed debug mods not loading in forgedev (string comparison). 2015-02-14 05:17:14 +03:00
RainWarrior 5616d0c1b0 ModelRotation.getMatrix() now returns the correct matrix; fixed the application of custom transformations to vanilla models; fixed application of transformations to B3D models; fixed the culling of rotated vanilla models 2015-02-14 04:44:41 +03:00
LexManos 316ec27e77 Merge pull request #599 from diesieben07/master
Handle empty lines in language files gracefully
2015-02-13 14:04:53 -08:00
RainWarrior 87ef833d32 Alternative models work once again 2015-02-14 00:23:03 +03:00
diesieben07 1a2c521b63 Handle empty lines in language files gracefully 2015-02-13 15:34:54 +01:00
RainWarrior 3e1d959a23 Updated FML 2015-02-13 08:24:32 +03:00
Fry c85aa9351a Merge pull request #597 from RainWarrior/blame
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:05:20 +03:00
RainWarrior a4e70e44e1 Added blaming of coremods and mods not targetting Java 6 2015-02-13 08:07:27 +03:00
RainWarrior dfc2e04255 fix ModelLoader.setCustomModelResourceLocation not storing same item with different metadata values 2015-02-09 17:19:10 +03:00
Lex Manos 0e69e84d89 Try a maven mirrior to fix build issues. 2015-02-08 17:24:44 -08:00
RainWarrior 2419d4913b made renderLayer ThreadLocal, now it should hold correct value for use inside custom baked models 2015-02-09 02:46:01 +03:00
RainWarrior 9a6fb600ec Reworked vanilla texture resolution, hopefully fixes NPE bug in FaceBakery 2015-02-08 15:51:41 +03:00
RainWarrior 9e90febd37 fixed NPE during loading of B3D models without textures/brushes.
changed default B3D color to have full opacity.
2015-02-08 15:50:35 +03:00
Matthew Prenger 0f43b95821 Minor tweak to UsernameCache to also cache usernames of offline players. 2015-02-07 03:58:27 -06:00
Lex Manos f0d96b7c50 Fixed being kicked from the server while swimming. 2015-02-06 21:35:27 -08:00
Lex Manos 7ed7da159e Fixed debugging Dedicated server in Forge Dev workspace. 2015-02-06 21:35:11 -08:00
Lex Manos 9704f25aa8 Fixed potential NPEs in Structure code caused by componenets not being able to load. 2015-02-05 17:03:43 -08:00
Lex Manos c80e75de9b Fixed potential NPEs in Structure code caused by componenets not being able to load. Closes #1686 2015-02-05 17:02:30 -08:00
Lex Manos e903f0ff69 Added ability for language files to opt-in to loading using normal Java properties format.
This allows for escape characters, as well as keeping %d and %f replacements in tact.
To opt-in, the lang file must have this comment line:
# PARSE_ESCAPES
As this is opt-in, any errors resulting from misused format strings is on the modder/end user.
2015-02-04 17:23:41 -08:00
Lex Manos b036b37a35 Fixed BlockBush and BlockCrops not respecting custom soils. Closes #1683 2015-02-04 12:20:24 -08:00
Lex Manos 48c24246a5 Fixed InitMapGenEvent's fire order so values are used. And added OCEAN_MONUMENT type. Closes #1681 2015-02-04 12:20:24 -08:00
RainWarrior 9cb7cc557a Restore binary backwards compatibility 2015-02-04 10:05:07 +03:00
RainWarrior b8add23d9b ModelBakeEvent now has ModelLoader as an argument instead of ModelBakery; Added various static hooks to ModelLoader to allow registering model-related information before it's needed (prevents file-not-found errors on first baking pass); ModelLoader waits until ModelBakeEvent is done before showing any missing model exceptions; It's now possible to define models completely in-code (as illustrated by ModelBakeEventDebug). 2015-02-04 09:45:23 +03:00
Lex Manos 501665fc1e Bump version to 11.14.1 for next development cycle. 2015-02-03 19:44:29 -08:00
Lex Manos 9c50745bdb Updated FML:
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
2015-02-03 00:26:17 -08:00
RainWarrior 3a0de2edca Fixed tracking of UV locking state. Closes #1679 2015-02-03 10:40:30 +03:00
Lex Manos c814be0359 Updated FML: MinecraftForge/FML@22c9656196 Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. 2015-02-02 13:08:02 -08:00
Lex Manos 79356d7023 Fixed ItemFrames not having a model. Closes #1678 2015-02-02 13:06:57 -08:00
Lex Manos 1b80328d3f Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. Closes #588 2015-02-02 12:09:26 -08:00
Lex Manos 76825d19b8 Fixed Buttons not dropping anything when broken. Closes #1676 2015-02-01 10:49:17 -08:00
Lex Manos 80c0ff4066 Fixed domain support in ArmorMaterial texture name. Closes #1675 2015-02-01 10:48:48 -08:00
Lex Manos 072aca4350 Updated FML:
MinecraftForge/FML@d00feb58c7 Remove debug code that was causing console spam in Forge.
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
MinecraftForge/FML@9c3013e02a Merge remote-tracking branch 'origin/1.8'
2015-01-31 19:00:38 -08:00
Lex Manos c374ba5463 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:56:00 -08:00
Lex Manos 79b5c28d38 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:33:32 -08:00
LexManos c7c29979c9 Merge pull request #595 from Grinch/master
Update to ASM5 for Java 8 support, IF ANYONE MAKES A MOD THAT REQUIRES JAVA8 BEFORE MINECRAFT FORCES IT ALL USERS REQUESTING SUPPORT WILL BE BANNED FROM ALL FORGE RELATED SERVICES.
2015-01-31 03:37:15 -06:00
RainWarrior ab39b7e4e0 Removed leftover debug messages 2015-01-30 03:14:12 +03:00
LexManos a420927007 Merge pull request #1666 from TechStack/1.8
Fixes issue #1552 Where the flowIntoBlock method was not setting the Block to the fluid and causing crashes
2015-01-29 16:29:30 -06:00
LexManos 7581ead65f Merge pull request #1664 from Lunatrius/fix-debug
Fixed debug text rendering one line to low.
2015-01-29 16:19:20 -06:00
TechStack 146b08a8cd Closes #1552
Set the destination block the to the fluid.
In the previous code the destination block was still Air and would would
cause a crash because air doesn't have a property for LEVEL
2015-01-29 17:11:22 -05:00
RainWarrior 67121d9ebc Merge pull request #1521 from RainWarrior/model-system
Model loader registry
2015-01-29 13:25:47 +03:00
RainWarrior 6eba0ebb93 Added model loader registry
Entry point: ModelLoaderRegistry
loader interface: ICustomModelLoader
custom model: IModel

ModelLoader is responsible for splicing into vanilla model system.
(you probably don't need to use it directly)

Interop with vanilla models isn't great yet
(vanilla models can't refer to custom ones as parents), will improve in
the future.

Includes loader for B3D models, with animation support
(net.minecraftforge.client.model.b3d).
Blender export plugin with compatible coordinate system:
https://github.com/RainWarrior/B3DExport

OBJ loader is being written, will be included at some point in the
future. For now you can convert OBJ to B3D via blender, or wait.
2015-01-29 11:33:52 +03:00
Steven Downer 79d224f76e Update to ASM5 for Java 8 support
SpecialSource updated ASM5 and ForgeGradle supports ASM5 as well but
neither FML or Forge were actually updated to support ASM5 opcodes. This
commit resolves this.

Signed-off-by: Steven Downer <[email protected]>
2015-01-28 20:17:21 -06:00
Lunatrius 39eb036b0e Don't skip the first line when rendering (debug) text. 2015-01-28 21:41:39 +01:00
LexManos c9670d3c1d Merge pull request #1646 from Ivorforce/patch-1
Fix fluid tanks incorrectly reading NBT when empty
2015-01-22 21:09:59 -08:00
Lex Manos 8b6ef01ecc Updated FML:
MinecraftForge/FML@a55e412453 Save the mod list of players in their NetworkDispatcher (Make it accessable for mods)
MinecraftForge/FML@69d479d46a Fixed getEffectiveSide() for Netty Server threads
MinecraftForge/FML@0f9a33cf14 Exclude only log4j2 queue from class loader
2015-01-19 11:38:05 -08:00
LexManos 9a2c4998ae Merge pull request #591 from Minecrell/patch-1
Exclude only log4j2 queue from class loader
2015-01-18 14:46:18 -08:00
Ivorius e629774753 Fix fluid tanks incorrectly reading NBT when empty
If the Empty flag was set, the tank would not correctly read the data, keeping the outdated FluidStack instead. This is especially relevant with updatable TileFluidHandler TEs.
2015-01-17 00:36:42 +01:00
LexManos c4b0fea9ee Merge pull request #1647 from Parker8283/fluid-icons
Re-enabled Icon setting for Fluids
2015-01-16 15:22:09 -08:00
LexManos 698b1558cd Merge pull request #1645 from Lunatrius/chat-npe-fix
Fixed NPE when canceling ClientChatRecievedEvent. Fixes #1644
2015-01-16 15:18:02 -08:00
LexManos c7da6c703f Merge pull request #575 from lumien231/1.8
Save the mod list of players in their NetworkDispatcher
2015-01-16 14:40:06 -08:00
Parker Young bfcce919b9 Re-enabled Icon setting for Fluids 2015-01-16 17:30:00 -05:00
Minecrell 8cfca4376f Exclude only log4j2 queue from class loader
Right now the complete com.mojang package is excluded from the LaunchClassLoader on the server. This means mods can't transform authlib for example which doesn't need to be excluded for the UI to work. By excluding only the specific log4j2 QueueLogAppender, mods can also transform the classes in the com.mojang.authlib package.
2015-01-16 23:15:17 +01:00
Lunatrius 4380ca026e Fixed NPE when canceling ClientChatRecievedEvent. Fixes #1644 2015-01-16 23:09:45 +01:00
Lex Manos f6a378e136 Silently eat exceptions when getting a TE's rendering bounding box, this 'fixes' Bukkit servers screwing up world data and causing clients to crash. 2015-01-14 19:02:50 -08:00
LexManos 204c6119e7 Merge pull request #1635 from asiekierka/master
Fix shouldRefresh being too broad in tile entity update
2015-01-11 13:03:00 -08:00
asiekierka 0a707236e1 fix shouldRefresh being too broad in tile entity update 2015-01-11 11:12:54 +01:00
RainWarrior dcabad2bd1 Merge pull request #1602 from Chicken-Bones/1.8
Allow blocks to render in multiple layers
2015-01-10 13:35:29 +03:00
LexManos 465e330566 Merge pull request #1615 from lumien231/master
Fix versionCheck config option
2015-01-09 04:37:26 -08:00
LexManos 7d82925017 Merge pull request #1627 from CovertJaguar/tile-refresh
Bulk Chunk Data packets should also check TileEntity.shouldRefresh().
2015-01-09 03:42:46 -08:00
Lex Manos 64bf7bb3be Fix value passed for Item.getModel useRemaining argument. Closes #1623 2015-01-08 23:37:06 -08:00
Lex Manos fb88b021c5 Made Chunk.fillBlock respect TileEntity.shouldRefresh. 2015-01-08 23:22:45 -08:00
Lex Manos d899f8fb84 Call World.init from DimensionManager.initDimension Closes #1551 2015-01-08 23:02:25 -08:00
Lex Manos 5328701219 Fix potential NPE when loading a single player world where you were saved in a unloaded dimension. Closes #1575 2015-01-08 21:42:13 -08:00
CovertJaguar 30196b8696 Bulk Chunk Data packets should also check TileEntity.shouldRefresh(). 2015-01-07 15:37:54 -08:00
Lumien 404e8fa89e Fix versionCheck config option 2015-01-01 17:52:44 +01:00
LexManos bca990cc93 Merge pull request #1609 from lumien231/1.8
Fixes #1603: Moving the start of the update thread to the pre init of the forge mod container
2014-12-28 14:28:51 -08:00
Lumien 9d34bbece7 Fixes #1603: Moving the start of the update thread to the pre init of the forge mod container 2014-12-28 22:49:31 +01:00
Chicken-Bones 0cbc685d3c Allow blocks to render in multiple layers 2014-12-26 15:45:00 +10:00
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
LexManos 58a458c250 Merge pull request #578 from HEmile/1.8
Fixed getEffectiveSide() for Netty Server threads
2014-12-23 14:15:41 -08:00
Lex Manos 7ddc5469b4 Fix crafting of non-oak fences/gates. 2014-12-23 14:14:40 -08:00
LexManos 389abd98c1 Merge pull request #1338 from MinestrapTeam/renderpane
Fix Stained Glass pane rendering issues
2014-12-23 14:03:36 -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
HEmile a7ff70eaa4 Fixed getEffectiveSide() for Netty Server threads 2014-12-23 20:26:37 +01:00
palechip f6dc40c07d Fix Scoreboard rendering for the sidebar. 2014-12-22 14:34:35 +01:00
Lex Manos 959eaf0218 Fix BlockSnapshots not firing correctly due to patch mixup in 1.8 update. Closes #1591 2014-12-21 18:55:46 -08:00
LexManos 005e0c8451 Merge pull request #1586 from Lunatrius/fix-chat-1.8
[1.8] Fixed messages not being added to the chat history
2014-12-18 14:13:33 -08:00
Lunatrius 7916a21682 Fixed messages not being added to the chat history and ClientCommandHandler not being called when sleeping. 2014-12-18 20:46:24 +01:00
LexManos 010e687664 Merge pull request #1581 from Lunatrius/fix-chat
Fixed messages not being added to the chat history
2014-12-18 10:33:13 -08:00
Lex Manos ae1321b8c8 MinecraftForge/FML@5a4d362293 Finish removing marker in mapping entry names. FMLMissingMappingsEvent/FMLModIdMappingEvent should fire with correct names now. 2014-12-18 08:11:36 -08:00
Lex Manos 4aaabdd0e0 Fix incorrect logic in world change clumping. 2014-12-18 08:11:30 -08:00
Lex Manos 7419c2aa91 Fix incorrect logic in world change clumping. 2014-12-18 08:11:06 -08:00
Lex Manos cd4e73edfa Remove our changes to Stitcher slot allocation. 2014-12-18 08:10:38 -08:00
Lunatrius 9453c1d209 Fixed messages not being added to the chat history and ClientCommandHandler not being called when sleeping. 2014-12-17 03:38:26 +01:00
Lex Manos 2096bcb5ab Finish removing marker in mapping entry names. FMLMissingMappingsEvent/FMLModIdMappingEvent should fire with correct names now. 2014-12-15 06:57:59 -08:00
Lex Manos 9d95952dc1 Remove our changes to Stitcher slot allocation. 2014-12-13 18:07:31 -08:00
Lex Manos fd859812eb MinecraftForge/FML@e3785c2893 Ensure that EntitySpawn and OpenGUI packets are handled in the world thread. Also log all errors that are thrown in FutureTasks. 2014-12-13 18:07:13 -08:00
Lex Manos e9dbc71362 Ensure that EntitySpawn and OpenGUI packets are handled in the world thread.
Also log all errors that are thrown in FutureTasks.
2014-12-13 17:45:38 -08: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 bf66e45699 Fix texture stitcher not using all avalible spaces. 2014-12-11 16:40:48 -08:00
Lex Manos 64952331e2 Fix texture stitcher not using all avalible spaces. Closes #1557 2014-12-11 16:40:28 -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 a6c6a79916 Fixed log spam when breaking DoublePlants. Closes #1555 2014-12-10 05:44:07 -08:00
Lex Manos 7c79a4226f Fix missed patch causing Dispensed Armor to go into the wrong slot. Closes #1560 2014-12-10 05:36:15 -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 4cc278a125 Improved Control of Enchantment.canApplyTogether() in Mod Enchantments, allowing both enchantments to determine if they can apply together. Closes #1434 2014-12-07 05:37:11 -08:00
Lex Manos fd3f948e4c Improved Control of Enchantment.canApplyTogether() in Mod Enchantments, allowing both enchantments to determine if they can apply together. 2014-12-07 05:20:50 -08:00
Lex Manos 309fe700cd Changed ToolMaterial's repair material to ItemStack version to allow metadata sensitive versions. 2014-12-07 04:30:10 -08:00
Lex Manos 35fac1f691 Changed ToolMaterial's repair material to ItemStack version to allow metadata sensitive versions. Closes #1355 2014-12-07 04:29:55 -08:00
Lex Manos 83bcebf3b1 Fix invalid argument being passed to Block.isNormalCube from World.updateNeighbors. Closes #1339 and Closes #1346 2014-12-07 03:49:36 -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 49eeedd854 Fixed bug in ServerConfigurationManager.transferPlayerToDimension where it would send the old dimension's information. Closes #1548 2014-12-07 00:39:30 -08:00
Lex Manos b417594e71 Fixed bug in ServerConfigurationManager.transferPlayerToDimension where it would send the old dimension's information. 2014-12-07 00:39:09 -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
LexManos 6910f40fc2 Merge pull request #1547 from Draco18s/patch-1
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-06 22:57:21 -08:00
mezz 75c7862e78 Add GuiScreenEvents for keyboard and mouse input 2014-12-06 19:06:19 -08:00
Lumien 6f19fd1513 Save the mod list of players in their NetworkDispatcher (Make it accessable for mods) 2014-12-06 16:31:58 +01: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 1fc1570663 Only call blockBreak when block itself changes, not just meta. Fixes bottles poping out of brewing stands. 2014-12-02 21:40:50 -08:00
Lex Manos 07db77401d Fix finding of spawn location for mobs. Closes #1546 2014-12-02 21:37:15 -08:00
Lex Manos c683bce659 Remove debug patch I left in. 2014-12-01 19:17:11 -08: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 5b07c7fead Update Dev mcp mappings to 11-30 snapshot. 2014-12-01 18:28:18 -08:00
Lex Manos 7b2e7ac3c9 Unlink banner block and item id. Mojang should of matched these up but they didn't -.- 2014-12-01 18:00:28 -08:00
Lex Manos 4caf09cd33 Fix stickey pistons not retracting properly. 2014-12-01 14:53:30 -08:00
Lex Manos 6ff24351d3 Fixed blocks not breaking properly when instantly destroied. 2014-11-30 23:55:28 -08:00
Lex Manos 9f4ef7b38a Fixed vanilla issue where exceptions in World tasks would not be logged. 2014-11-30 23:55:04 -08:00
Lex Manos 7cc7056c57 Fix NPE with BlockSnapshots that caused items with TileEntities to be used up in creative mode. 2014-11-30 23:54:17 -08:00
Lex Manos 2a02804379 Fixed vanilla bug where top part of double plants would flicker a tifferent texture before dissapearing. 2014-11-30 23:50:56 -08:00
Lex Manos c539d5389a Fix BlockPane's connection detection. 2014-11-30 08:36:24 -08:00
Lex Manos b4779be2f6 Fixed snow layers not being able to stack more then twice. Closes #1534 2014-11-29 23:04:22 -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 5de6cf571c Updated FML:
MinecraftForge/FML@36644e9771 Finalize modded handshakes in the World tick thread. Prevents potential CMEs when login event takes to long to fire.
2014-11-28 11:20:06 -08:00
Lex Manos f35a53bad5 Fix not being able to place blocks in liquids, and related issues. 2014-11-28 11:19:30 -08:00
Lex Manos 10efdbc085 Fix debug screen not showing grey background. Closes #1529 2014-11-28 11:18:59 -08:00
Lex Manos 4a92959cc1 Finalize modded handshakes in the World tick thread. Prevents potential CMEs when login event takes to long to fire. 2014-11-28 10:37:55 -08:00
Lex Manos dcefcc9047 Fix destroy particles not being added. Closes #1528 2014-11-28 08:31:14 -08:00
Lex Manos d48f4d0a94 Update RecipeSorter for new 1.8 recipies. 2014-11-28 08:20:10 -08:00
Lex Manos aa07fa4443 Fix potential NPE in Block.isToolEffective 2014-11-28 08:19:40 -08:00
Lex Manos d879b2c70d Fix wrong state being passed to Block.getDrops 2014-11-28 07:43:50 -08:00
Lex Manos 17e5480b6e Fix Entityies not taking damage correctly. Closes #1511 2014-11-28 07:43:10 -08:00
Lex Manos a059a9a7fb Fix inverted logic preventing blocks from breaking. 2014-11-28 07:10:37 -08:00
Lex Manos 8dc71d5ffa Fixed crash with caomparators due to wrong position. Closes #1512 2014-11-28 06:51:55 -08:00
Lex Manos b9c2968c0e Fix creative picking a CommandBlock minecart returning wrong item. Closes #1523 2014-11-28 06:09:33 -08:00
Lex Manos 74a57bd9d6 Fix creative picking a CommandBlock minecart returning wrong item. Closes #1523 2014-11-28 06:08:39 -08:00
Lex Manos 0edeb1e04b Fix acedential inversion causing some tress to not have leaves. Closes #1522 2014-11-28 06:02:41 -08:00
Lex Manos dce17105ea Fix fog colors, Closes #1524 2014-11-28 06:01:03 -08:00
Lex Manos 277fc4ea7d Fix local variable conflict in Forge patch and latest MCP mappings. 2014-11-26 01:12:11 -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
LexManos 0e91787efb Merge pull request #1492 from XCompWiz/clientrain
Fixes client-side fake rain
2014-11-10 16:03:29 -08:00
XCompWiz a5358eb916 Fixes client-side fake rain
Changes the updateWeather function in WorldServer to only send the
weather info to players in the correct dimension, rather than all
players on the server. This is what causes the client-side rain, as the
client believes that it has started raining locally, rather than in
another dimension.
2014-11-11 01:39:26 +02:00
Matthew Messinger 21ffd28adb Fix MC-30864 (sending web links in chat) 2014-11-10 15:24:27 -05:00
Lex Manos 229848a4cb Add details message to MissingModsException and WrongMinecraftVersionException to make the Crash logs more useful. 2014-11-08 15:13:59 -08:00
Lex Manos 0dc112a198 Add duplicate protection to ModDiscoverer, do not process files in the mods directory if we already found them in the classpath. {Such as if LiteLoader is installed and added it} Closes #557 2014-11-05 15:27:43 -08: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
Lex Manos ef0e0d7393 Fix slots being black due to vanilla blending leakage Forge fixes. Closes #1325 & #1242 2014-11-04 18:07:42 -08:00
LexManos a8cce392ab Merge pull request #1005 from luacs1998/patch-1
Create CONTRIBUTING.md
2014-10-22 02:38:09 -07:00
LexManos 27e1b65755 Merge pull request #547 from Parker8283/1.8
Re-enabled Entity-Render registration
2014-10-19 18:09:12 -07:00
Parker Young 2544df8e44 Re-enabled Entity-Render registration 2014-10-19 20:05:39 -04: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
Lex Manos 2af2795288 Fix logic error in Blodd's Snapshot capture that caused blocks to not be updated to the client. Closes #1451 2014-10-16 20:49:00 -07:00
LexManos 5aa313cf00 Merge pull request #1461 from Azanor/master
Fix for biome weights under 10
2014-10-16 06:24:48 -07:00
Azanor 46dfaa6d0c Fix for biome weights under 10
This solves the problem where custom mod biomes with weights under 10
not being generated in the world.

Cleaned up the code and made the patch smaller
2014-10-16 12:28:10 +02:00
LexManos 6283e9327e Merge pull request #1368 from matthewprenger/patch-1
Added username cache
2014-10-15 17:16:13 -07:00
matthewprenger 9c2f0ddfad Add username cache for determining a player's last known username 2014-10-15 16:14:36 -05:00
LexManos 619ceefa49 Merge pull request #1457 from AbrarSyed/master
implemented crowdin support
2014-10-15 01:27:44 -07:00
LexManos a300935cbc Merge pull request #545 from bspkrs/1.8
changed pass-thru method name to fix MCP name conflict
2014-10-14 23:28:48 -07:00
bspkrs 7e53132918 changed pass-thru method name to fix MCP name conflict
fixed a few old javadoc object name mistakes
2014-10-15 02:08:41 -04:00
AbrarSyed 8af641a86d implemented crowdin support 2014-10-15 01:07:15 -05:00
Lex Manos 878f995711 Add the ability to register custom variant names in ModelBakery. 2014-10-13 20:48:09 -07: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
Lex Manos 70b57c337a Removed unneeded rebuild, was toying with where to put it. 2014-10-09 05:22:50 -07:00
Lex Manos c002b98e5e Automatically register BlockStates when block is initally registered, and clear the list when new snapshots are injected. Modders DO NOT touch the registry in Block directly. Closes #537 2014-10-09 05:05:43 -07: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 b0190bb50d Fix vanilla lighting issue and blending issues in achievements gui. Closes #1445 2014-10-08 17:54:20 -07:00
Lex Manos 97bdcc7991 Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds.
Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
2014-10-06 15:36:17 -07:00
Lex Manos 3c51b1a8c8 MinecraftForge/FML@d00feb58c7 Remove debug code that was causing console spam in Forge. 2014-10-06 15:30:58 -07:00
Lex Manos 471c9c5fd5 Remove debug code that was causing console spam in Forge. 2014-10-06 15:28:29 -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
Lex Manos cfaedc384a Update TerminalTransformer for new FML package. Closes #535 2014-10-06 00:53:38 -07:00
Lex Manos e4cdefb0e1 General class name cleanup, spelling mistakes and FF decompile issues. 2014-10-04 02:05:43 -07:00
Lex Manos 468d35e635 Take control over Item.BLOCK_TO_ITEM map and register Block's to this map from GameRegistry. 2014-10-03 17:48:57 -07:00
Lex Manos f759f73801 Renamed TileEntityRendererChestHelper -> TileEntityItemStackRenderer
This class is used to render any tile entities in a non-location specific major
  Such as EntityItems, In minecarts, Held by entities, anyhting that isn't in world.

Switched the class names for BiomeGenForest $1 and $2 as Fernflower decompiled
  them in oposite order.
2014-10-03 17:48:28 -07:00
LexManos fe552616bf Merge pull request #533 from AbrarSyed/patch-2
Added mappings to default build.gradle
2014-10-03 14:03:06 -07:00
Abrar Syed 20d78df6e6 added mappings to default build.gradle 2014-10-03 15:57:04 -05:00
LexManos 9879143b96 Merge pull request #1367 from bloodmc/blockplace
Added PlaceEvent and MultiPlaceEvent which fires before placing a block.
2014-10-02 13:32:02 -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
Lex Manos 1b587948f8 Add joptsimple as a server required library. Closes #531 2014-10-01 11:26:06 -07:00
Lex Manos 10d3062fc6 Restructure block and item mapping data in world save and network to potentially expand to custom mod ID registry syncing. Tip: ONLY use those functions in GameData that are marked as public API as internal API may change in 1.8. 2014-10-01 01:07:23 -07:00
LexManos 27ea6bb6fa Merge pull request #527 from bspkrs/1.8
Update Config Gui stuff for 1.8
2014-09-30 13:05:00 -07:00
bspkrs 927df1559e Update Config Gui stuff for 1.8
updated mappings to snapshot 20140930
got rid of derpy generics code
2014-09-30 05:20:56 -04:00
Lex Manos 28ff001cc0 Move FML to net.minecraft.fml package. 2014-09-22 22:50:54 -07:00
Lex Manos 1f1166e722 Move vanilla trades to inner class to prevent initilizer order issues. 2014-09-22 19:30:14 -07:00
Lex Manos 511c370193 Preliminary network protocol re-work. vanilla clients can now connect. Further cleanup needed. 2014-09-22 19:29:40 -07:00
Lex Manos 1ac0c5d87f Inital 1.8 patch update. 'It compiles!' 2014-09-19 17:25:14 -07:00
Lex Manos ebb91ba280 1.8 Conf update. Uses MCPData Snapshots now. 2014-09-18 17:57:33 -07:00
Lunatrius 7cff6f4c80 Prevent client only commands from bleeding through to the server. 2014-09-17 01:48:44 +02:00
cpw 9ccf454b88 Merge branch 'new' 2014-09-14 18:20:53 -04:00
cpw 97f715bf6d MinecraftForge/FML@63b64482e6 Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime.
MinecraftForge/FML@5365f5ea3e Add IEventExceptionHandler for EventBus to allow special handeling exceptions that are fired while running an event. Events now track what 'phase' they are in during the execution process. Each EventPriority is a 'phase'. An exception is thrown if the event attempts to set its phase to a previous one.
2014-09-14 18:20:06 -04:00
LexManos 647e476c8f Merge pull request #1402 from nekosune/new
Fixed Clientside GameProfile UUID being null on offline mode
2014-09-09 17:06:35 -07:00
nekosune f9c68bba81 Fixed Clientside GameProfile UUID being null on offline mode 2014-09-10 00:24:36 +01:00
LexManos e2ae05ccb6 Merge pull request #1395 from lawremi/rendergasfix
Fix rendering height of non-liquid fluids
2014-09-09 13:28:54 -07:00
Lex Manos 5f65fb754e Add IEventExceptionHandler for EventBus to allow special handeling exceptions that are fired while running an event.
Events now track what 'phase' they are in during the execution process. Each EventPriority is a 'phase'.
An exception is thrown if the event attempts to set its phase to a previous one.
2014-09-08 17:54:41 -07:00
Lex Manos 6192119682 Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime. 2014-09-08 17:50:46 -07: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
cpw 69700d2227 MinecraftForge/FML@7ab69aff2e Clean up import
MinecraftForge/FML@c5a90bd456 Is vanilla possible with this mod load, side tests.
MinecraftForge/FML@cad11f3165 Allow injecting alternative container types. This is the core support code for allowing sponge plugins!
2014-09-08 08:52:45 +12:00
cpw ad752886b0 Allow injecting alternative container types. This is the core support code for allowing sponge plugins! 2014-09-07 20:51:54 +12:00
cpw 3dae97cb4a Is vanilla possible with this mod load, side tests. 2014-09-07 20:13:37 +12:00
cpw 509d244ed4 Clean up import 2014-09-07 19:59:56 +12:00
LexManos a7ce64dfbc Merge pull request #1390 from diesieben07/beacon-items
Added Item#isBeaconpayment
2014-09-06 15:55:13 -07:00
diesieben07 126d7e3ebe Added Item#isBeaconpayment 2014-09-06 23:39:38 +02: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 d9865fed66 MinecraftForge/FML@dc02d56195 Fix derp with ModType annotation. mods should load again now.. 2014-09-01 16:05:51 -04:00
cpw 9c27520427 Fix derp with ModType annotation. mods should load again now.. 2014-09-01 16:05:04 -04:00
cpw de521cf531 MinecraftForge/FML@4ce3e73bfe Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the MessageHandler instance directly, allowing to specify the same handler for multiple messages.
MinecraftForge/FML@cbe2ccbda4 Add in ModType to the jar manifest. If it's present, and doesn't have value "FML" it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension.
MinecraftForge/FML@37cf0174fc OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file!
MinecraftForge/FML@0475b15eb1 Change the mods and modListFile argument handling a bit. Other tweakers will get a chance at looking at them now - they're only removed right before launch.
MinecraftForge/FML@abeac06a2e Two new features. ModLists can have a "parent" mod list. Circularity will result in a crash, so be careful. Mods specified in a child will override ones from a parent (using the maven group:name:classifier triple to identify - ignoring the version component)
MinecraftForge/FML@7fcfedcfef Canonicalized file paths in modListFile handling with the minecraftDirectory.
MinecraftForge/FML@633fce19d4 Make Keyevent also fire for key releases
MinecraftForge/FML@57ba2339b6 Merge branch 'keyup-event' of github.com:diesieben07/FML
MinecraftForge/FML@1ff048062c Merge branch 'simple-netw-improve' of github.com:diesieben07/FML
2014-08-31 21:59:47 -04:00
cpw 1419a02d13 Merge branch 'simple-netw-improve' of github.com:diesieben07/FML 2014-08-31 21:50:25 -04:00
cpw 88a0805e93 Merge branch 'keyup-event' of github.com:diesieben07/FML 2014-08-31 21:42:10 -04:00
diesieben07 2dc1911f54 Make Keyevent also fire for key releases 2014-09-01 01:10:29 +02:00
cpw a04c3e12fe Canonicalized file paths in modListFile handling with the minecraftDirectory. 2014-08-31 14:14:15 -04:00
cpw f5cf87304b Two new features. ModLists can have a "parent" mod list. Circularity will
result in a crash, so be careful. Mods specified in a child will override
ones from a parent (using the maven group:name:classifier triple to identify -
ignoring the version component)

Finally, ModSide is now doable in MANIFEST.MF. If you have this, it can tell
a mod to only load on a client, or on a dedicated server (though I'd watch out
before using the dediserver one, you'll never load in integrated servers then).
The default value is BOTH, which means you'll load both sides, other values are
CLIENT and SERVER, obviously. Perhaps, also, CAULDRON might be possible?
2014-08-31 14:00:28 -04:00
cpw c604a5e048 Change the mods and modListFile argument handling a bit. Other tweakers will get a chance at looking
at them now - they're only removed right before launch.
2014-08-31 13:35:38 -04:00
cpw 981ffe362d OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file! 2014-08-30 17:45:35 -04:00
cpw 0c50d7b92d Add in ModType to the jar manifest. If it's present, and doesn't have value "FML"
it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension.
2014-08-30 17:39:43 -04: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
cpw 0e13403457 Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489 2014-08-29 21:54:20 -04:00
cpw f0d8b887b4 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.

Fixes #499, but probably a bunch of others.
2014-08-29 21:43:17 -04:00
cpw 67ebda9ace Merge branch 'bungeecord' of github.com:bloodmc/FML 2014-08-29 21:37:48 -04:00
Adubbz 0d93bec5e7 Fixed biome weights not working with non multiples of 10 2014-08-30 10:35:05 +10:00
bloodshot 08ac6d548f Allow client handshake to be reset by server to support BungeeCord. 2014-08-26 20:49:20 -04:00
cpw 70c115588c Fix java 8u20. Closes #501 and a bunch of other bugs too. 2014-08-25 17:09:50 -04:00
cpw bd8bd65ca1 Update for launchwrapper 1.11. Fixes java 6 compatibility. 2014-08-20 23:02:27 -04:00
cpw c87a11e165 Mark the promise a success in the outbound handler. 2014-08-20 22:49:11 -04:00
cpw ceae256c56 Fix ups from feedback. 2014-08-20 22:46:39 -04:00
LexManos fa7ff7c6e7 Merge pull request #1300 from zlyfire/patch-1
Update README.txt
2014-08-20 13:01:53 -07:00
cpw e07bd74e34 Fix NPE from a boolean 2014-08-20 10:28:50 -04:00
cpw dddbbd3bac ItemStack swapping 2014-08-20 10:28:39 -04:00
Clashsoft 3119f700f3 Fix Stained Glass pane rendering issues 2014-08-18 20:28:15 +02:00
cpw 2ca75b3fa4 Update to legacylauncher 1.10 and asm 5.0.3 2014-08-16 13:21:07 -04:00
cpw 19b62a9fb8 Cleanup override warnings 2014-08-16 11:30:01 -04:00
cpw 13d81e05db More cleanup of exit handling, also add a couple more noise classes to the list of things ignored. 2014-08-16 10:32:22 -04:00
cpw 7c5eb19645 Some more tidying up of the exit handling 2014-08-16 10:32:00 -04:00
LexManos 1dadcb12be Merge pull request #1330 from bonii-xx/master
Write the correct default value for StringList comments in the config
2014-08-15 13:56:15 -07:00
cpw 4692e66389 Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496 2014-08-15 16:16:07 -04:00
cpw 1d336e0aa7 Fix almost invisible NPE in TerminalTransformer when loading a non-existant class 2014-08-15 16:03:45 -04: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
cpw c8c6190566 Extend timeout for client to 5 seconds. Should fix Forge #1322 2014-08-13 10:23:01 -04:00
cpw 6fafbf3b09 Attempt to properly resolve this daft metadata and TE nonsense. This might be mod impacting, if you maintain a reference to a TE via neighbour update calls - you
might see two TEs for a single setblock where previously you saw one. This is a phantom TE being created by badly written neighbour triggers - I'm looking at you
redstone.

Anyway, with luck, this'll close a slew of bugs across Forge, IC2, MFR, TE, RC. Yeah, fun times. Thanks to LexManos, skyboy and KingLemming for helping figure this
issue out. Quite frankly, from now on, issues with phantom TEs will be mods behaving badly. Modders will need to adapt.
2014-08-13 00:00:29 -04:00
cpw 18c71e5f2f Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming. 2014-08-12 21:57:19 -04:00
LexManos 016e303379 Fix invalid math in GuiContainerCreative. 2014-08-12 17:32:53 -07:00
LexManos cb62a70d66 Merge pull request #494 from AntonBoch1244/patch-1
Build.Gradle Patch
2014-08-12 11:55:15 -07:00
LexManos 5d01fa55b1 Merge pull request #1316 from GUIpsp/master
Add ItemStack sensitive version of getItemEnchantability
2014-08-12 11:43:59 -07:00
SackCastellon 2519822b25 Add ItemStack sensitive version of getItemEnchantability 2014-08-12 16:48:01 +01:00
cpw 5527b9f01e Clear button list on FML fatal error screens. The hidden cancel button should not be
there.
Closes #497
2014-08-12 09:16:15 -04:00
Lex Manos 6f693206de Add ability for creative tabs that have search bars to customize the text box's width, and prevent the default set of enchanted books from being displayed in those tabs. Closes #1303 Closes #1301 2014-08-11 19:18:38 -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
LexManos 12d4047459 Merge pull request #484 from bspkrs/master
Added support for \n in GuiConfig tooltip strings + a slider fix
2014-08-07 14:41:51 -07:00
zlyfire ce8882e89c Update README.txt
Add in reference to running setupDecompWorkspace to get decompiled classes
2014-08-06 16:29:34 -04:00
LexManos 98285e4df6 Merge pull request #1297 from ShetiPhian/patch-1
Legacy Liquid Load Fix
2014-08-05 19:47:58 -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
Lex Manos 5131aed7bd Fix metadata for every permutation -.- Closes #1294 2014-08-05 15:18:02 -07:00
Lex Manos d2682ab969 Fix patch screwup in Skyboy's Fishing PR -.- 2014-08-05 15:17:10 -07:00
LexManos 4600b015d9 Merge pull request #1296 from Vazkii/patch-3
Fixed items with more than 2 render passes rendering wrong in first person
2014-08-05 13:15:59 -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
AntonBoch1244 e5fe05a1cd Build.Gradle Patch
Changing assetDir to runDir and set runDir to "eclipse"
2014-08-05 22:08:58 +04:00
LexManos ec0691538f Merge pull request #1292 from DemoXinMC/master
New PlayerRepairEvent and AnvilUpdateEvent
2014-08-04 14:34:10 -07: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
KingLemming 7cd820d855 Merge pull request #1288 from skyboy/master
Add EntityFishHook AT
2014-08-03 22:06:26 -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
LexManos dae471e7d7 Merge pull request #1272 from rwtema/master
Fixed ItemFluidContainer always draining the maximum amount, regardless ...
2014-08-03 15:47:58 -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
Christian 269080fee5 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.
2014-08-01 22:18:50 -02:30
Christian d21f8f6dbd Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs. 2014-08-01 21:43:53 -02:30
Christian 07466ab036 First draft of add alias. It is probably not properly persistent atm. 2014-08-01 21:07:03 -02:30
Christian 7ee877a567 Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within. 2014-08-01 21:07:02 -02:30
rwtema eeb701cb16 Fixed ItemFluidContainer always draining the maximum amount, regardless of the amount remaining. 2014-07-31 20:52:52 +01:00
cpw 2c804c9b44 Update README.txt 2014-07-31 11:00:53 -02:30
Christian 8622b3fde9 Add a constructor to CustomModLoadingDisplayException. Closes #387 2014-07-31 10:46:33 -02:30
Christian 2d37b14555 AllowPlayerLogins only after the server has completed the core init tasks. Closes #372 2014-07-31 10:17:11 -02:30
Christian 0607bffb92 Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313 2014-07-31 10:02:47 -02:30
Christian f649eccc51 Default collections, so that we don't crash if useDependencyInfo is true. Closes #485 2014-07-31 09:53:27 -02:30
Christian fe29a98c62 Fix nested directory for language resources. Closes MinecraftForge#1264 2014-07-31 09:48:03 -02:30
Christian 0c088a4299 Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync. 2014-07-31 09:47:35 -02:30
Christian f5bcb6f0ca 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* 2014-07-30 21:18:31 -02:30
LexManos bc8374d71c Merge pull request #1263 from Zarathul/master
Added drainFluidContainer() and getContainerCapacity() helper methods to FluidContainerRegistry.
2014-07-30 13:11:58 -07:00
Christian 7ac077ed36 Add a custom version range factory method. Should hush skyboy's complaints. Closes #486 2014-07-30 16:46:16 -02:30
Christian 14f7bb44d9 Make more noise when people screw up mod downloading and put .jar.zip in their mod folders. 2014-07-30 12:38:55 -02:30
zarathul 7a1de8c13d - Added drainFluidContainer() and getContainerCapacity() helper methods. 2014-07-30 13:23:52 +02:00
Christian f8b5ae45f1 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.
2014-07-29 21:48:14 -02:30
Christian 655d902195 And fix the read side too, incase someone is trying to bitbang and failing. 2014-07-29 21:36:44 -02:30
Christian 03174602f6 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.
2014-07-29 21:33:19 -02:30
Christian 522b648185 Merge branch 'std-redir' of github.com:Emberwalker/FML 2014-07-29 14:49:42 -02:30
Christian 6819f5d45d Update realms to 1.3.2 2014-07-29 14:24:41 -02:30
Christian 0de92f4db7 Clean up a bunch of compiler warnings. 2014-07-29 14:11:41 -02:30
LexManos 7170a8c4c6 Merge pull request #1254 from Adubbz/master
Added a RenderFogEvent
2014-07-28 13:29:49 -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 a22bcf7e72 MinecraftForge/FML@3231db9376 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets into the map, rather than force overwriting. Fixes skyboy's comment. 2014-07-24 21:41:59 -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
bspkrs 09d68fb7bd 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
2014-07-24 16:51:15 -04:00
skyboy 906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
cpw 5643237fb9 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets
into the map, rather than force overwriting. Fixes skyboy's comment.
2014-07-20 10:46:22 -04:00
Lex Manos 9febf999c0 Updated FML:
MinecraftForge/FML@53887ac59c Hacky interm solution to #1207 to buy me time to re-write FML's network protocol.
2014-07-18 12:29:03 -07:00
Lex Manos 4ba024ca2e Hacky interm solution to #475 to buy me time to re-write FML's network protocol. 2014-07-18 12:25:02 -07: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
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
Lex Manos 5f20829165 Updated FML:
MinecraftForge/FML@9d40b76197 Don't scan ObjectHolders if there was an error already, derpitude will ensure.
MinecraftForge/FML@76538c1781 Add a terminal transformer and tweaker.
MinecraftForge/FML@aec9228845 Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit.
MinecraftForge/FML@908491d5e7 Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.
MinecraftForge/FML@d13295e281 Fix FMLAT manifest AccessTransformers, class loader fun!
2014-07-16 16:52:18 -07:00
LexManos 20cac56bfb Merge pull request #1235 from darkhax/master
Changed exception message for duplicate enchantment ids
2014-07-16 10:10:28 -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
Lex Manos 4ed75fd963 Fix FMLAT manifest AccessTransformers, class loader fun! Closes #477 2014-07-16 00:24:03 -07:00
LexManos 06701348d6 Merge pull request #1232 from bspkrs/patch-3
Fixed missing assignment of constructor arg (thanks @Lunatrius)
2014-07-15 12:26:00 -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
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
Lex Manos 59c628f777 Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems. 2014-07-14 13:53:37 -07:00
LexManos 79cda09594 Merge pull request #1225 from williewillus/master
Fix chat opacity
2014-07-14 13:11:09 -07: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 b1ec7b420c Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit. 2014-07-12 17:20:01 -07:00
cpw 87dde51b8d Add a terminal transformer and tweaker. 2014-07-12 17:37:41 -04:00
cpw e8c251808b Don't scan ObjectHolders if there was an error already, derpitude will ensure. 2014-07-12 12:03:34 -04: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
Lex Manos e6e019896f Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working. 2014-07-11 17:56:07 -07:00
Lex Manos 7cd70b3f26 Update tweaker login to use authlib. 2014-07-11 17:52:43 -07: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
LexManos 01d0e6a481 Merge pull request #1213 from TheCountryGamer/master
RenderBlockOverlayEvent patch
2014-07-08 13:17:30 -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
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 d4d562c1ca Merge pull request #468 from bspkrs/master
Added slider controls for numerics. Default control is textbox, but slider can be used as a custom list entry class.
2014-07-07 20:15:10 -07:00
bspkrs e57223a676 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
2014-07-07 23:01:56 -04: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 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
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
Lex Manos 2d56512ab2 Update authlib and realms to latest json data. 2014-07-07 17:25:37 -07:00
Lex Manos a8aac402eb 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. 2014-07-07 17:25:09 -07:00
Lex Manos d969137b19 Force preferIPv4Stack to true early in the load chain to combat netty loopback issues. 2014-07-07 09:29:34 -07:00
LexManos 81a791bac7 STENCIL buffer and DEPTH buffer, attempt a fix for GL errors. 2014-07-06 22:19:13 -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 5d82316059 MinecraftForge/FML@ac994e178a Scala people test your shit. 2014-07-06 17:14:25 -07:00
Lex Manos e7087fcc48 Scala people test your shit. 2014-07-06 17:12:58 -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
cpw 0705670f1d MinecraftForge/FML@3ee86d0f3e updated gradle wrapper to gradle 2.0
MinecraftForge/FML@627ae73ea6 Merge pull request #464 from AbrarSyed/upgradle
MinecraftForge/FML@ee38c1b3f4 Fix unneeded cast causing crash in new Config GUI system.
MinecraftForge/FML@eb92c35a2f updated run configs for GradleStart/Server classes
MinecraftForge/FML@70dcf80410 Merge pull request #465 from AbrarSyed/upgradle
MinecraftForge/FML@0ebdbe77a2 Updated Scala to latest stable
MinecraftForge/FML@ddba18e6e3 Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate
MinecraftForge/FML@220a37660b Update realms to 1.2.9
MinecraftForge/FML@abd7d0969b Merge branch 'scalaupdate'
2014-07-06 15:18:59 -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
cpw 920fd866b4 Merge branch 'scalaupdate' 2014-07-06 10:05:51 -04:00
cpw efdbdea99f Update realms to 1.2.9 2014-07-06 10:05:34 -04:00
cpw 2994a2c8ad Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate 2014-07-05 16:26:48 -04:00
Soaryn 79e6167d8d Updated Scala to latest stable
Updates the -dev portion of the json files for 1.7.10 for scala 2.11.1
Updates the -rel portion of the json files for 1.7.10 for scala 2.11.1
2014-07-05 22:54:58 +03:00
LexManos 7fa5ff071d Merge pull request #465 from AbrarSyed/upgradle
fix run configs to use new GradleStart class
2014-07-05 03:14:27 -07:00
AbrarSyed 56f9373a17 updated run configs for GradleStart/Server classes 2014-07-04 22:02:29 -05:00
Lex Manos 3164dd95bf Fix unneeded cast causing crash in new Config GUI system. 2014-07-03 11:13:11 -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 fa512ed2d7 Merge pull request #464 from AbrarSyed/upgradle
updated gradle wrapper to gradle 2.0
2014-07-02 14:54:13 -07:00
AbrarSyed fd060bcce6 updated gradle wrapper to gradle 2.0 2014-07-02 15:54:55 -05: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
LexManos 7525d209b6 Merge pull request #1195 from iChun/patch-1
Fixed inverted params in FogDensity use
2014-06-29 22:47:53 -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
Lex Manos 219f5adf61 Add config option to disable attempting to creat screen with Stencil Bits. 2014-06-29 18:42:48 -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
diesieben07 1182bc4bd6 Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the MessageHandler instance directly, allowing to specify the same handler for multiple messages. 2014-06-30 00:00:06 +02:00
LexManos 8586de3222 Merge pull request #1191 from bloodmc/chunkasync
Fixed wrong method call in ChunkIOProvider.
2014-06-29 14:56:03 -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
cpw 5217f6f8bb MinecraftForge/FML@db219fb287 API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them. To go along with this, you can now require an API, with a version, in your mod dependency string 2014-06-26 22:18:41 -04:00
cpw 71a9586fbb API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them.
To go along with this, you can now require an API, with a version, in your mod dependency string
2014-06-26 22:09:50 -04:00
cpw 3b648d826f Merge pull request #1183 from bspkrs/master
fixed dupe quotes issue with category names that require quotes when save is called more than once
2014-06-26 16:34:12 -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 f1c7a2c134 Merge branch 'prerelease' 2014-06-26 14:57:33 -04:00
cpw be45501749 Merge branch 'mc179' 2014-06-26 14:54:41 -04:00
cpw 8afc9c465c Update for release 1.7.10 2014-06-26 14:48:46 -04:00
cpw 32e577d5bf Fix API incompatibilities. Should mean mods will work with new config changes. 2014-06-26 14:45:43 -04:00
LexManos b7b9ddc9cd Merge pull request #455 from rumickon/feature
Fix Eclipse launching attribute
2014-06-26 10:21:19 -07:00
LexManos 2d7f22ade8 Merge pull request #1180 from luacs1998/patch-2
Update mc version string
2014-06-25 18:49:10 -07:00
luacs1998 23c6d0ef55 Update mc version string
Or was I not supposed to?
2014-06-26 09:03:22 +08:00
cpw 6998e76d3f Fix API incompatibilities. Should mean mods will work with new config changes. 2014-06-25 20:47:33 -04:00
cpw af23e296f2 Fix mcp release number 2014-06-25 20:19:38 -04:00
cpw fcd13f5e71 Merge branch 'master' into prerelease 2014-06-25 20:18:42 -04:00
cpw bcda92e941 Merge branch 'bspkrsgui' 2014-06-25 20:16:20 -04:00
cpw 013c0b0feb MinecraftForge/FML@701d98eafa Added config GUI system
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
2014-06-25 20:15:08 -04:00
cpw 24c05a73ce Merge branch 'master' of github.com:bspkrs/MinecraftForge into bspkrsgui
Conflicts:
	src/main/resources/assets/forge/lang/en_US.lang
2014-06-25 20:13:36 -04: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
cpw cbc873bc8b MinecraftForge/FML@701d98eafa Added config GUI system
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
MinecraftForge/FML@96a7e14a45 Merge branch 'master' into mc179
MinecraftForge/FML@f45f18b1d7 Fix accessing guava from transformers
MinecraftForge/FML@8f7adced47 Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are available at mojang, so we can update the json.
2014-06-25 18:31:02 -04:00
cpw 7cafaed696 Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the
mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are
available at mojang, so we can update the json.
2014-06-25 18:28:50 -04:00
cpw b9db002614 Fix accessing guava from transformers 2014-06-25 17:49:00 -04:00
cpw bb7aa340dc Merge branch 'master' into mc179 2014-06-25 17:03:05 -04:00
cpw 98d6d97c3e Merge branch 'bspkrsgui' 2014-06-25 17:02:40 -04:00
rumickon 0a00d40ba2 Fix Eclipse launching attribute 2014-06-25 23:49:17 +04:00
cpw 25e44a8b32 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui 2014-06-25 13:09:10 -04:00
cpw c8b3719810 MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits.
MinecraftForge/FML@8a240ec3c7 Merge branch 'master' into mc179
MinecraftForge/FML@0cd5ef6bb7 Fix NPE when no FMLAT is defined
2014-06-25 09:15:37 -04:00
cpw f5d8e85fc5 Fix NPE when no FMLAT is defined 2014-06-25 09:11:07 -04:00
cpw 380027daf0 Merge branch 'master' into mc179
Conflicts:
	src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
2014-06-24 22:18:03 -04:00
cpw 4c26057a4e MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits. 2014-06-24 22:16:39 -04:00
cpw 3dbe6ccded Fix up other exit points. Should stop process hangs for clean exits. 2014-06-24 22:15:11 -04:00
cpw 0bbee11b3c MinecraftForge/FML@e152984538 Add support for mod access transformers without a coremod requirement. Use the "FMLAT" manifest attribute, with a space separate list of files that live in the 'META-INF' directory. They should conform to standard AT formatting. 2014-06-24 22:05:38 -04:00
cpw 88a411550a Add support for mod access transformers without a coremod requirement.
Use the "FMLAT" manifest attribute, with a space separate list of files
that live in the 'META-INF' directory. They should conform to standard AT
formatting.
2014-06-24 21:34:07 -04:00
cpw 729d8fb721 MinecraftForge/FML@06ab104c9a Force the descriptors to the right type for the field they're referencing. Fixes the sand issue 2014-06-24 18:35:48 -04:00
cpw 237c28b6cb Force the descriptors to the right type for the field they're referencing. Fixes
the sand issue
2014-06-24 18:34:34 -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 1275aa732e Null check the Item in the supplied stack as well as the stack itself. 2014-06-22 14:47:24 -04:00
Christian 4778c33902 And fix firing for single player loading. 2014-06-22 14:39:23 -04:00
Christian 127605ec3e Fix derpity derp. 2014-06-22 10:11:32 -04:00
Christian 6aae913919 Harden the security manager and make it less spammy. Clean up a bunch of deprecation warnings from guava. 2014-06-21 23:03:41 -04:00
Christian 94f6fffc80 remove the deprecation patches. The methods are gone now 2014-06-21 22:48:15 -04:00
Christian 06f91d8936 Merge branch 'master' into mc179 2014-06-21 22:44:38 -04:00
Christian 9b976b7afe Fix server side to write properly 2014-06-21 22:44:25 -04:00
Christian ea89e1a3f7 Pre4 update 2014-06-21 21:13:22 -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
Christian c1ea6639d4 Fix up some patching bugs. Fully functional @ pre3 2014-06-21 15:55:32 -04:00
LexManos 755dd9b954 Merge pull request #1164 from lumien231/Fix-DimensionCrash
Fixes a server crash caused by a player joining that is in a non existen...
2014-06-20 17:31:45 -07: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
LexManos 9701e944c2 Merge pull request #1162 from Thog92/1.7-biome
Add missing 1.7 biomes to BiomeDictionary
2014-06-19 11:26:38 -07:00
Thog92 a905fe578b Add missing 1.7 biomes to BiomeDictionary 2014-06-19 19:06:27 +02:00
ganymedes01 85497cbf6e Added FluidStack sensitive version for Fluid's localised name
Would be helpful for determining names for more complex FluidStacks (with tag compounds for example)
2014-06-18 15:26:14 +01:00
LexManos 5ac6f2289b Merge pull request #1155 from Zarathul/master
Added soft return for modders passing invalid negative ids to OreDictionary.getOreName. Warning: WILL Error in 1.8+
2014-06-16 19:49:13 -07:00
Zarathul e68cfa9f72 Fixed ArrayIndexOutOfBoundsException in getOreName
Added sanity check to prevent ArrayIndexOutOfBoundsException in getOreName for negative ids.
2014-06-16 23:00:40 +02:00
Christian 90ad27d985 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-15 16:37:42 -04:00
Lex Manos bb15efd037 Fixed vines generation for hanging off of trees. 2014-06-15 11:59:11 -07:00
Christian 1c78a09cfd Also patch in warnings for Vec3Pool - similarly removed. 2014-06-13 08:51:07 -04:00
LexManos 7d700c9ad2 Merge pull request #1147 from bloodmc/chunkasync
Don't call ChunkDataEvent.Load async
2014-06-12 23:10:30 -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
Christian be7cf8c01e Checking in pre3 work 2014-06-12 21:13:26 -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
Lex Manos 1b7190c50b Pop version for new Recomended build. 2014-06-12 15:16:56 -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
Arkan Emberwalker 23c6b9d245 Implement STDOUT/STDERR redirection.
These streams now redirect to log4j2, with form '[class:method:line]: Original message'.
2014-06-12 20:28:56 +01:00
Christian b12e0bff2a MinecraftForge/FML@1a99ec7db6 Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead. 2014-06-12 14:45:25 -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
LexManos c45ed6f6d8 Changed dustLapis to gemLapis to make OM SHUT THE HELL UP. 2014-06-11 22:43:15 -07:00
Lex Manos dd5b51aac1 Fixed missed metadata offset, and now cache return values of getOres for speed. 2014-06-11 10:27:28 -07: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
Lex Manos 7a43d2f96a Rework OreDictionary's internals to be a bit more speedy to help combat modders using it inapropriatly. Closes #1022 Closes #1131 2014-06-10 18:05:09 -07:00
Christian fada1ad7bb Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead. 2014-06-08 21:30:47 -04:00
Christian 3084368af3 Tweak bad packet warning some. Makes it a bit more log friendly. 2014-06-08 14:35:16 -04:00
diesieben07 b0195f31e4 Fix not being able to change target & attackDamage for EnderTeleportEvent. 2014-06-07 13:45:29 +02:00
Christian 58e69af1b3 MinecraftForge/FML@e3ce211cc7 Nullcheck the dispatchers on players. Should stop some crashes when spamming connectivity.
MinecraftForge/FML@480bf2c1d0 Fix REPLY handling in SimpleNetworkWrapper. Closes  #440
2014-06-05 15:31:11 -04:00
Christian 8e64a82423 Fix REPLY handling in SimpleNetworkWrapper. Closes #440 2014-06-05 14:31:44 -04:00
Lex Manos 03ae909762 Fix inverted parameters in OreDictionary.getOreID Closes #1123
-.- Closes #1120
2014-06-04 23:09:13 -07:00
bspkrs 04c2ed554d Added support for new FML config GUI classes
refactored lots of stuff based on comments

added Configuration.load() exception handling and logging
2014-06-04 17:39:47 -04:00
bspkrs b861e95b17 Added config GUI system 2014-06-04 17:36:47 -04:00
Christian c27f4b34f8 Merge branch 'master' into mc179 2014-06-03 13:04:49 -04:00
Christian 8883803260 Nullcheck the dispatchers on players. Should stop some crashes when spamming connectivity. 2014-06-02 22:12:13 -04: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 f2a33ea9f6 Add comment to RotationHelper telling modders where to actually look, closes #1115 2014-06-02 12:20:28 -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
Christian 2e152c52c4 MinecraftForge/FML@585d3a91e1 If a packet is not handled by the channel, log it, and clear it. Could be spammy, but this is a serious bug and could cause a memory leak otherwise.
MinecraftForge/FML@cd715efca1 Log the queue as well
2014-05-31 09:53:36 -04:00
LexManos 7f018dad0f Merge pull request #1112 from diesieben07/entity-tracking
Add PlayerEvent.StartTracking and .StopTracking
2014-05-29 17:19:58 -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 4a6a49e073 Merge pull request #1109 from Open-Code-Developers/finite-patch
Make finite fluid blocks drainable
2014-05-29 15:18:34 -07:00
Lex Manos 0737601dbf Fix enum helpers for EnumRarity {moved to Commn and changed paramter} and EnumCreatureType {new parameter} and added junit test for them. Closes #1009 2014-05-28 15:28:40 -07:00
Christian 014acf6f1d Log the queue as well 2014-05-27 18:56:02 -04:00
Christian 72fbc45a19 If a packet is not handled by the channel, log it, and clear it.
Could be spammy, but this is a serious bug and could cause a memory leak
otherwise.
2014-05-27 17:59:53 -04:00
Christian 0a56e19d47 MinecraftForge/FML@1d41aa978d Fix the side for the compatibility check. Should result in green ticks finally! 2014-05-26 15:30:22 -04:00
Christian c56fc3b490 Fix the side for the compatibility check. Should result in green ticks finally! 2014-05-26 14:57:14 -04:00
Lex Manos 5f90e0788b Change IShearable JavaDoc by one line so Anti would shut up. Closes #1054 2014-05-26 11:26:53 -07:00
Christian 36ab17474b MinecraftForge/FML@4512f8e5e3 Warn when the objectholder finds nothing in the registry. Helps debug mismatched names. Also, actually make the scoping thing work with objectholder 2014-05-26 11:29:15 -04:00
Christian d932a23751 Warn when the objectholder finds nothing in the registry. Helps debug mismatched names.
Also, actually make the scoping thing work with objectholder

Also handle Blocks.air as a special case. It should never be a valid block in the block registry.

Nothing can ever replace the default block registry block. It is disabled for replacement.

Air is properly skipped
2014-05-26 11:25:25 -04: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
LexManos 5eb99791b0 Merge pull request #1103 from ganymedes01/patch-1
Fix getOreIDs not using the wildcard value correctly
2014-05-25 15:35:15 -07:00
ganymedes01 6924fef324 Fix getOreIDs not using the wildcard value correctly
You can see it's not working by requesting the ore IDs from lapis, and you'll see the name "dye" is missing (and that's the one registered using the wildcard).

Fixed it by inverting the order of the item stack parameters.
2014-05-25 19:15:26 -03:00
Lex Manos 25ef7e3469 Prevent duplciates in registered Ores in the OreDictionary and clean up some of the code, add new function to return all ores the specified ItemStack satisfies. Closes #1102 2014-05-25 14:20:02 -07:00
LexManos 507f184144 Merge pull request #1101 from Open-Code-Developers/master
Fix fluid blocks
2014-05-25 13:41:13 -07:00
Vilim bc1434ff04 Make finite fluid blocks drainable 2014-05-25 19:59:59 +02:00
Vilim bab2de72bc Fix fluid blocks
For https://github.com/BuildCraft/BuildCraft/issues/1843 .
2014-05-25 18:42:17 +02:00
Lex Manos fcc43e0aaa Updated FML:
MinecraftForge/FML@3aba56440a lastIndexOf, Note Don't code while sick.
2014-05-24 21:49:22 -07:00
Lex Manos bcec606b12 lastIndexOf, Note Don't code while sick. 2014-05-24 21:48:55 -07:00
Lex Manos fc70334343 Updated FML:
MinecraftForge/FML@3a687f48b9 -.- Save File First. My Bad.
2014-05-24 21:11:35 -07:00
Lex Manos cad049caa1 -.- Save File First. My Bad. 2014-05-24 21:11:08 -07:00
Lex Manos db52113a7e Updated FML:
MinecraftForge/FML@c828bb63c5 Make AccessTransformer change INVOKESPECIAL to INVOKEVIRTUAL when making methods visible
MinecraftForge/FML@a9aa468457 Merge pull request #431 from diesieben07/at-invokevirtual
MinecraftForge/FML@31d726abad Fix the null networkHandler in the MessageContext
MinecraftForge/FML@725d988e36 Add in the objectholder, autopopulated by FML based on simple rules. Allows for reference driven substitution of mod blocks and items based on their server running state.
MinecraftForge/FML@f07bf5cb30 Fixed deobfusication of nested inner classes. And removed legacy ModLoader remaps.
2014-05-24 20:46:04 -07:00
Lex Manos e69fd72d42 Fixed deobfusication of nested inner classes. And removed legacy ModLoader remaps. 2014-05-24 20:44:25 -07:00
Christian 05cde0c92f Add in the objectholder, autopopulated by FML based on simple rules. Allows
for reference driven substitution of mod blocks and items based on their
server running state.
2014-05-24 22:32:24 -04:00
Christian 2c5fcc6129 Fix the null networkHandler in the MessageContext 2014-05-24 16:54:48 -04:00
Lex Manos 243aa60bf9 Add Glass, Colored glass, ore storage blocks, alines, and a few others to ore dicitonary. Closes #1011 2014-05-24 13:01:35 -07: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
LexManos c3cf12f3b2 Merge pull request #431 from diesieben07/at-invokevirtual
Make ATs replace INVOKESPECIAL when needed
2014-05-22 10:13:09 -07:00
LexManos 8145de123e Merge pull request #1091 from Clashsoft/master
Don't render ItemStack tooltip twice
2014-05-22 09:57:36 -07:00
Clashsoft e530089639 Update GuiScreen.java.patch 2014-05-22 16:12:52 +02:00
diesieben07 7ede64fbf2 Make AccessTransformer change INVOKESPECIAL to INVOKEVIRTUAL when making methods visible 2014-05-22 14:25:23 +02:00
LexManos d63a9b1b10 Merge pull request #1086 from WaDelma/master
Added amount that is being filled/drained to the FluidEvent
2014-05-21 18:44:38 -07:00
WaDelma a3e8f0cbe4 Fluid events now know how much fluid is moved
Added amount that is being filled/drained to the FluidEvent

Added constructors without amount to ensure backwards compability

Added deprecation to amountless constructors
2014-05-20 01:39:51 +03: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
LexManos 83e7130216 Merge pull request #1081 from XCompWiz/master
Bug Fixes to Biome Decoration and Chunk
2014-05-18 15:48:10 -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
Christian 3885f9bf84 First draft 1.7.9 support.
This is not modding minecraft. It's performing an update. Go away!
2014-05-17 16:30:13 -04: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
Christian 3d9b5b1472 MinecraftForge/FML@43e3ee1af1 Swap Listenerlist constructor around. Should fix parent resizing issue? 2014-05-14 14:24:16 -04:00
Christian ca674c2ae5 Swap Listenerlist constructor around. Should fix parent resizing issue? 2014-05-14 14:22:51 -04:00
Christian 7578f0813b MinecraftForge/FML@70570a863f Fix up possible CME 2014-05-14 10:13:00 -04:00
Christian e05d6340d7 Fix up possible CME 2014-05-13 15:11:50 -04:00
Christian 71b3ba2041 MinecraftForge/FML@503da3a257 Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues. 2014-05-13 08:16:22 -04:00
Christian 8a69b17bd6 Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues.
Nothing to see here. No modding being done.
2014-05-13 08:14:21 -04: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
Lex Manos 711e92a59f Fully clear DimensionManager's DimensionID bitset when world is loaded. Closes #1074 2014-05-12 11:46:03 -07:00
Christian 26c55d89ef Fix forge validating strict versions on remote connections. 2014-05-12 13:49:46 -04:00
Christian 51b55eaf25 MinecraftForge/FML@a8cbef2321 Finally hopefully fully kills the race condition causing a classcast on slow machines.
MinecraftForge/FML@8dbd1ae0a1 Fix ObjectIntIdentityMap sporadically matching non-identical objects.
MinecraftForge/FML@42713c66e5 Merge pull request #426 from sfPlayer1/master
2014-05-12 10:51:00 -04:00
cpw 3f86cd32a7 Merge pull request #426 from sfPlayer1/master
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 10:50:20 -04:00
Player ee671c3eab Fix ObjectIntIdentityMap sporadically matching non-identical objects. 2014-05-12 16:29:37 +02:00
Christian 39340e46aa Finally hopefully fully kills the race condition causing a classcast
on slow machines.

This is me bugfixing. NOT MODDING! No! Stop it! I'm not!
2014-05-11 22:15:29 -04:00
Adubbz 4454d3f341 Greatly simplified the addition of new biomes to the default world 2014-05-11 15:06:14 +10:00
Christian bb52a6b062 MinecraftForge/FML@d8b6adb259 Add a helper for casting some common collection types into generic form
MinecraftForge/FML@5275cea844 Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know!
2014-05-10 14:54:23 -04:00
Christian a66e8462d8 Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know! 2014-05-10 14:53:08 -04:00
Christian 0a9099c8dd Add a helper for casting some common collection types into generic form 2014-05-10 13:36:24 -04:00
Lex Manos 80511409ff Updated FML:
MinecraftForge/FML@a70308ef41 Update mcmod.info
MinecraftForge/FML@8555344eb3 updated wrapper to gradle 1.12
MinecraftForge/FML@1d5fc60f82 Merge pull request #411 from matthewprenger/master
MinecraftForge/FML@3612ad0c25 Attempt to fix another race condition related to reading NetClientHandler.
MinecraftForge/FML@c73a2076e3 Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only.
MinecraftForge/FML@1436ac2f14 Fine use FMLCommonHandler.
MinecraftForge/FML@542e9acec1 documented dependencies
MinecraftForge/FML@ddc2cfbe86 Merge pull request #402 from AbrarSyed/patch-1
MinecraftForge/FML@362ec8dee7 Merge pull request #419 from Thog92/master
MinecraftForge/FML@b9de9ebc96 Revert "Fix refreshResources not happening if an error occurs."
MinecraftForge/FML@738ce1d7cd Re-add removed genericiterable to clean a warning
MinecraftForge/FML@b0eb1ef7c6 Split loadmods into loadmods and preinitmods, to allow resource loading to occur *always* between the two phases. This should fix mods not being able to access resources during preinit.
MinecraftForge/FML@de546bdf6c Clean up some missing generic info
MinecraftForge/FML@cd43eacbb2 Ensure that the loadcontroller is ready to preinit.
MinecraftForge/FML@f2fe80dc36 Fixed default network mod checking to allow client side mods without the server side. Mods wishing to REQUIRE server side components must specify a custom check handler using @NetworkCheckHandler
MinecraftForge/FML@0c36868f92 Fix network disconnect with message on the client side in NetworkDispatcher.
2014-05-09 13:34:08 -07:00
Lex Manos 123f5919ba Fix network disconnect with message on the client side in NetworkDispatcher. 2014-05-09 13:23:24 -07:00
Lex Manos 6b82a4fed8 Fixed default network mod checking to allow client side mods without the server side. Mods wishing to REQUIRE server side components must specify a custom check handler using @NetworkCheckHandler 2014-05-09 13:22:54 -07:00
LexManos 51628825e5 Merge pull request #1064 from bspkrs/patch-2
Fixed unforeseen NPE
2014-05-08 08:40:25 -07:00
Christian 3a77c79f8a Ensure that the loadcontroller is ready to preinit. 2014-05-08 10:40:52 -04:00
Christian f866aeaacb Clean up some missing generic info
PS: NOPE: still not modding.
2014-05-08 10:36:01 -04:00
Christian b286cb6a57 Split loadmods into loadmods and preinitmods, to allow resource loading to occur *always* between the two phases. This should fix
mods not being able to access resources during preinit.

PS: I'm still not modding.
2014-05-08 10:23:05 -04:00
bspkrs e625622b6e Fixed unforeseen NPE 2014-05-08 10:22:48 -04:00
Christian 0b795b8bab Re-add removed genericiterable to clean a warning 2014-05-08 09:58:03 -04:00
Christian f628bde87b Revert "Fix refreshResources not happening if an error occurs."
This reverts commit fff86ee9d3.
2014-05-08 09:56:43 -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
LexManos 7229ba5c83 Merge pull request #419 from Thog92/master
updated wrapper to gradle 1.12
2014-05-07 15:41:05 -07:00
LexManos 51fc256111 Merge pull request #402 from AbrarSyed/patch-1
Added dependency examples to the shipped example mod's build.gradle.
2014-05-07 15:40:50 -07:00
AbrarSyed 437e479446 documented dependencies 2014-05-07 17:34:44 -05: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
Lex Manos e33224054b Fine use FMLCommonHandler. 2014-05-07 14:36:00 -07:00
LexManos 3b79370be1 Merge pull request #1062 from bspkrs/master
New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent
2014-05-07 13:58:18 -07:00
Lex Manos 3cb3988491 Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only. 2014-05-07 13:54:22 -07:00
bspkrs eb2549c773 New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent 2014-05-07 16:52:10 -04:00
Lex Manos 18aed8bf1b Attempt to fix another race condition related to reading NetClientHandler. 2014-05-07 13:31:16 -07: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
LexManos e69004b50e Merge pull request #411 from matthewprenger/master
Update ExampleMod mcmod.info
2014-05-07 12:39:12 -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
LexManos 5fc3e7e913 Merge pull request #1060 from Azanor/master
Fix for Block.getExplosionResistance getting passed the wrong parameters
2014-05-07 09:41:43 -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
Thog92 366fc5c76c updated wrapper to gradle 1.12 2014-05-06 22:03:44 +02:00
Lex Manos 5a2b6a604b Fixed memory leak on the client caused by Netty holding references to the World. Closes #415 #417 2014-05-05 22:14:13 -07:00
Christian ad3b232604 Fix display of mod status at the server 2014-04-30 22:47:10 -04:00
Christian af73743eb7 Fix mod version checking 2014-04-30 22:26:16 -04:00
Christian 0be4719fd5 Fix refreshResources not happening if an error occurs. 2014-04-30 21:55:55 -04:00
Christian 66ad8ea41a Clean some generic warnings up. Make a generic list handler. Helpful for others I think too. 2014-04-30 21:55:55 -04:00
LexManos ff5eb87e27 Merge pull request #413 from sfPlayer1/master
backup+default block use fix
2014-04-30 10:12:21 -07:00
Player 74c89da967 Fix saving backups with the raw name.
Fix air block not being assigned as the default.
2014-04-30 09:44:09 +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
LexManos d01758e90d Merge pull request #1050 from CovertJaguar/master
Flexible Rail return value was inverted between 1.6 and 1.7
2014-04-29 14:12:33 -07: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
Matthew Prenger e8b3603ee8 Update mcmod.info 2014-04-28 22:27:52 -05:00
Christian 63a205c043 No, this is not me modding either. I'm doing this as a favour for Lex, who's a bit computerless at the minute.
MinecraftForge/FML@77c254a6d9 I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated..
MinecraftForge/FML@7f01cf549b I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit.
MinecraftForge/FML@2b8d0f6680 Fix SimpleNetworkWrapper - this is not me modding, I didn't realize it was broken until Pahimar told me.
MinecraftForge/FML@ddee7eb117 Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash
MinecraftForge/FML@59a5adfdb3 Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation
MinecraftForge/FML@d88b2aa0c5 prevent the world from getting saved twice at shutdown
MinecraftForge/FML@9b1cbab03b Registry: Crash earlier with conflicting name/object registrations.
MinecraftForge/FML@7ba167c500 Registry: Misc tweaks
MinecraftForge/FML@78248da399 Registry: Treat all 1.6 entries as items.
2014-04-28 15:59:30 -04:00
Player 2d3cd66680 Registry: Treat all 1.6 entries as items. 2014-04-26 21:56:25 +02:00
Player dfa9f2d1a2 Registry: Misc tweaks 2014-04-26 21:56:25 +02:00
Player 7175165d15 Registry: Crash earlier with conflicting name/object registrations. 2014-04-26 21:56:25 +02:00
Player 9d00580d7e prevent the world from getting saved twice at shutdown 2014-04-26 21:56:25 +02:00
Player 624e68e18e Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation 2014-04-26 21:56:25 +02:00
Player 09ff49fe58 Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash 2014-04-26 21:56:25 +02:00
Christian c7d887f078 Fix SimpleNetworkWrapper - this is not me modding,
I didn't realize it was broken until Pahimar told me.

Put an example in the docs.
2014-04-26 09:33:09 -04:00
LexManos 022cefc72a Merge pull request #1044 from bspkrs/patch-1
Fixed typo in update checker
2014-04-20 03:52:55 -07:00
Christian 840c96a212 I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit. 2014-04-19 11:38:46 -04:00
Christian a7c15e30aa I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated.. 2014-04-19 10:46:04 -04:00
bspkrs 3fa0c70f2b get a spelling checker :P 2014-04-18 11:21:40 -04:00
Lex Manos a008339c6e Bump Forge version in prep for release. 2014-04-16 17:30:50 -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
LexManos cc08cb46c8 Merge pull request #1038 from planetguy32/master
Fix infinite loop in RecipeSorter
2014-04-15 14:47:36 -04:00
planetguy32 fd59ab261f Fix infinite loop in RecipeSorter
If recipe is multiple levels of inheritance from Object and not categorized, cls=cls.getSuperclass(); needs to be repeated more than once. It must therefore be moved to inside the while loop.
2014-04-12 20:04:02 -07:00
LexManos 2cef9c5cb2 Merge pull request #1029 from iChun/patch-1
Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher.
2014-04-07 10:43:02 -07:00
iChun cc54645bf3 Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher. 2014-04-08 01:09:17 +08:00
Lex Manos 2b40a5e3ce Small wording change in license to allow for specifc differnet licnense contributions.
Updated FML:
MinecraftForge/FML@e58562d3ed Fix remaining issue with autoassigned Block and Item IDs overlapping.
MinecraftForge/FML@a82195772e Registry: Block IDs after failing to find a mapping for them
MinecraftForge/FML@fd9389015f Fix FMLMissingMappingsEvent.get
MinecraftForge/FML@5eebd4df71 Registry: Implement support for remapping blocks/items to a new name.
MinecraftForge/FML@7325aa5033 Registry: cleanup, fix missing id error GUI formatting
MinecraftForge/FML@eb29d651eb Fix old 1.7 worlds with broken ID mappings
MinecraftForge/FML@6fd3c12a4a Registry: allow handling missing blocks/items regardless of the mod id
MinecraftForge/FML@038fa17ad3 Merge branch 'master' of https://github.com/MinecraftForge/FML
MinecraftForge/FML@49c623f59c initial attempt at a better way to ask the user in case of startup issues
MinecraftForge/FML@9be92dcfcb Registry: Complain about bogus registrations
MinecraftForge/FML@fd6d55afcc Registry: Allow ignoring missing mods from the GUI, with confirm+backup
  Registry: Add confirm+backup for automated corrupted id table fixup Require the user to confirm loading from a backup level.dat
MinecraftForge/FML@c47fc3b382 Enable custom gui rendering only as required
MinecraftForge/FML@f77632df35 Remove unneeded entity spawn debug logging.
MinecraftForge/FML@c7adb42199 Registry: Repair mismatched ItemBlocks as well Fix a few misc issues
MinecraftForge/FML@c8a245a985 Registry: Fix debug info
MinecraftForge/FML@c8a0b72eba Registry: Complain about missing mods when repairing broken worlds Registry: Reduce console spam
MinecraftForge/FML@8e44006f43 Registry: Protect against putObject misuse, handle duplicate registrations better
MinecraftForge/FML@294c93212c Registry: Add support for registering ItemBlocks before their Blocks
MinecraftForge/FML@3b42b33b6e Merge pull request #400 from sfPlayer1/master
2014-04-07 10:01:56 -07:00
LexManos ede8bb6e61 Merge pull request #400 from sfPlayer1/master
Fix various registry issues
2014-04-07 09:57:13 -07:00
Player ea2972725a Registry: Add support for registering ItemBlocks before their Blocks 2014-04-07 17:30:38 +02:00
LexManos ae81ad58ea Merge pull request #1028 from alexbegt/patch-1
Small Fix: Held Items & Multiple Render Passes
2014-04-06 16:34:58 -07: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
Player 07d5d5c7af Registry: Protect against putObject misuse, handle duplicate registrations better 2014-04-06 17:11:23 +02:00
Player 6ffbcc5903 Registry: Complain about missing mods when repairing broken worlds
Registry: Reduce console spam
2014-04-06 14:49:59 +02:00
Player b5cc021754 Registry: Fix debug info 2014-04-05 01:54:07 +02:00
Player 7284104472 Registry: Repair mismatched ItemBlocks as well
Fix a few misc issues
2014-04-05 01:47:19 +02: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
LexManos 094d80fe66 Merge pull request #1024 from ShetiPhian/patch-1
Add a variable for SoundCategory in PlaySoundEvent17
2014-04-03 19:59:56 -07:00
ShetiPhian bba42d4230 Update PlaySoundEvent17.java 2014-04-03 22:25:49 -04:00
Player 2e6b7e2eb5 Remove unneeded entity spawn debug logging. 2014-04-03 21:00:42 +02:00
Player 37a81d04d9 Enable custom gui rendering only as required 2014-04-03 17:58:53 +02: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 12e8d95e9f Fix potential threading issue if FluidRegistry.loopupFluidForBlock is called from two threads at the same time before being setup. Closes #936 2014-04-02 23:53:05 -07:00
Lex Manos 14b9d639a2 Use BiomeGenBase's array size instead of hardcoding it in BiomeDictionary. Closes #871 2014-04-02 23:46:52 -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
Lex Manos b0bfea4e03 New hook to truely seperate the display of the 'durability' bar from the current / max durability. Allowing modders to control that display easier. 2014-04-02 17:08:22 -07:00
Lex Manos aa0c902d22 Advanced Model Loader available server-side for data driven models. To be cleanuped and re-evaluated in 1.8. Closes #773 2014-04-01 15:02:06 -07:00
Lex Manos d9a1c718bf Add position to BreakSpeed event. Closes #621 2014-04-01 15:00:25 -07:00
Player 407f6f79af Registry: Allow ignoring missing mods from the GUI, with confirm+backup
Registry: Add confirm+backup for automated corrupted id table fixup
Require the user to confirm loading from a backup level.dat
2014-04-01 21:56:53 +02:00
Player 3eaa002091 Registry: Complain about bogus registrations 2014-04-01 14:40:24 +02:00
Player 11ab034638 initial attempt at a better way to ask the user in case of startup issues 2014-04-01 14:30:47 +02:00
Player e013f1514d Merge branch 'master' of https://github.com/MinecraftForge/FML
Conflicts:
	src/main/java/cpw/mods/fml/client/FMLClientHandler.java
	src/main/java/cpw/mods/fml/client/GuiModItemsMissing.java
	src/main/java/cpw/mods/fml/common/FMLContainer.java
	src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
	src/main/java/cpw/mods/fml/common/registry/GameData.java
2014-04-01 07:00:20 +02:00
Lex Manos f436b3e62d Update patches for new Fixed FernFlower used in FG 1.2. 2014-03-31 16:48:21 -07:00
LexManos 8576fe6dbe Merge pull request #1012 from AbrarSyed/master
Updated for ForgeGradle 1.2
2014-03-31 16:05:09 -07:00
Lex Manos 0586c2b1aa Update patches for Fixed FF in FG 1.2. 2014-03-31 16:02:54 -07:00
Player 56f31def7b Registry: allow handling missing blocks/items regardless of the mod id 2014-03-31 04:09:59 +02:00
Player d392ddf3be Fix old 1.7 worlds with broken ID mappings 2014-03-30 17:17:54 +02:00
AbrarSyed 1d2d0ea5cd fixed remaining noop patches and exc derp 2014-03-29 01:52:11 -05:00
AbrarSyed 5d43695710 updated FML to latest master 2014-03-29 01:14:24 -05:00
AbrarSyed 0e1a1202d8 added .exe file.. fixed a bunch of patches 2014-03-29 01:12:45 -05:00
Player 939a095896 Registry: cleanup, fix missing id error GUI formatting 2014-03-27 08:30:55 +01:00
LexManos e35a3538a6 Merge pull request #392 from AbrarSyed/master
Updated to ForgeGradle 1.2
2014-03-26 16:04:30 -07:00
AbrarSyed ed79732705 updated wrapper to gradle 1.11 2014-03-26 13:34:25 -05:00
AbrarSyed 4db8573645 updated example a little 2014-03-26 13:34:01 -05:00
AbrarSyed 9d3a274cb6 updated for ForgeGradle 1.2 2014-03-25 10:15:42 -05:00
AbrarSyed 2a2e201f4a COnverted patches to SRG names 2014-03-25 10:13:57 -05:00
Player ac44af863b Registry: Implement support for remapping blocks/items to a new name. 2014-03-25 00:36:37 +01:00
Player 180c605570 Fix FMLMissingMappingsEvent.get 2014-03-24 21:47:25 +01:00
Player e9ca678ab3 Registry: Block IDs after failing to find a mapping for them 2014-03-24 21:16:36 +01:00
Player ff6083e77b Fix remaining issue with autoassigned Block and Item IDs overlapping. 2014-03-20 23:41:01 +01:00
luacs1998 7f1b938cae Update CONTRIBUTING.md
Add link to wiki page on contributing
2014-03-19 23:33:36 +08:00
luacs1998 132d53583d Create CONTRIBUTING.md
Simple file (which github will show for those making PRs) containing guidelines for making PRs.
Feel free to comment if you want/need anything added. I can pull the same thing to FML too if you'd like, Lex.
2014-03-19 23:26:02 +08:00
AbrarSyed ff6143dc85 updated for ForgeGradle 1.2 2014-03-19 02:15:53 -05:00
LexManos 0cd40e70b6 Update README.txt 2014-03-18 01:54:32 -05:00
Lex Manos f632ea0c36 Fix network close events never getting called. Closes #381 #382 2014-03-15 18:16:27 -07:00
LexManos 0620a64813 Merge pull request #998 from Eurymachus/master
This correctly uses the world height less one block for placement of a door
2014-03-15 16:31:57 -05:00
Eurymachus 05afb0c347 This correctly uses the world height less one block for placement of a
Door.

Required for placing doors inside a littleblocks area.
2014-03-12 13:26:48 +00:00
Lex Manos 244e39df0c Fix long standing deobf issue that caused announce-player-achievements property to have no effect on dedicated servers. 2014-03-11 01:57:44 -07:00
Lex Manos 185b9f8368 MinecraftForge/FML@ef07de4f65 Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting. 2014-03-11 00:55:57 -07:00
Lex Manos 9b615893d9 Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting. 2014-03-11 00:50:55 -07:00
Lex Manos ea2c07c727 -.- Both null combinations. 2014-03-10 23:41:37 -07:00
Lex Manos 1a9e13f880 properly implement equals, sod off Player. 2014-03-10 23:27:30 -07:00
Lex Manos d97ec2763c Implement simple hash based equals in Fluid ContainerKey. 2014-03-10 22:51:31 -07:00
Lex Manos 534b241e9f Make StructureVillagePieces.Village public. 2014-03-10 22:12:46 -07:00
LexManos 0513182e3c Merge pull request #995 from iChun/master
Fixes stencil bits not existing in Minecraft's framebuffer causing stencil test to not work.
2014-03-10 17:42:55 -05:00
iChun 741a90c6bd Fixes stencil bits not existing in Minecraft's framebuffer causing stencil test to not work. 2014-03-11 06:40:37 +08:00
Lex Manos 68eb0d15dc Updated FML:
MinecraftForge/FML@e8b60441cc Reload game settings after mod loading is finished to capture mod keybindings. Closes #378
MinecraftForge/FML@399770e572 Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any futureevents added.
MinecraftForge/FML@b7ad532ab5 Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase.
2014-03-09 13:44:36 -07:00
Lex Manos d3d244f4a2 Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase. 2014-03-03 23:23:55 -08:00
LexManos 8660d0471f Merge pull request #983 from DemoXinMC/master
Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone
2014-03-01 12:06:08 -08:00
LexManos 0a6dc66749 Merge pull request #984 from ShetiPhian/item-renderer-fix
Small Fix: Held Items & Multiple Render Passes
2014-02-28 05:03:41 -08:00
DemoXin 488eb30272 * Fixed Items.glowstone to Items.glowstone_dust 2014-02-28 02:54:50 -05:00
Timothy Tomkins d2d2032f93 Small Fix: Held Items & Multiple Render Passes
Passes beyond 1 now have the correct icon.
2014-02-27 23:57:44 -05:00
DemoXin 58fde290f8 * Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone 2014-02-27 22:48:33 -05:00
Lex Manos 55199c25d8 Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any future events added. 2014-02-25 12:30:29 -08:00
Lex Manos 246152d3c4 Fixed hashcode in FluidContainerRegistry, still needs a redesign. Closes #967 2014-02-23 16:56:29 -08:00
Lex Manos e7e85ad07b Reload game settings after mod loading is finished to capture mod keybindings. Closes #378 2014-02-22 20:59:25 -08:00
LexManos ee7aa93416 Merge pull request #978 from iChun/master
Add cancelable RenderHandEvent.
2014-02-21 10:28:37 -08:00
iChun bad0639e90 Add cancelable RenderHandEvent. 2014-02-22 01:13:40 +08:00
Lex Manos 6f49bba302 Fix a typo in our tile entity fix causing it to be ineffective. 2014-02-20 12:04:27 -08:00
Lex Manos b01d87f0c6 Fix items with color rendering incorrectly. 2014-02-19 12:34:21 -08:00
Christian 08a636c34f Update Forge for patch changes
MinecraftForge/FML@064b66af3d Prevent players from logging in until server has finished starting.
MinecraftForge/FML@2aa73afa15 Fix ExampleMod.java for build #1024+
MinecraftForge/FML@c890206268 Try and handle removal of mods a bit better. Currently no way to allow a world which has missing blocks to load - but i have the code in place to allow it i think.
MinecraftForge/FML@995c204338 Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load when stuff is missing, but for right now, it will fail as this is "world safe".
MinecraftForge/FML@fa5f4c8842 Some argumentation
MinecraftForge/FML@45409bfa0c Prevent player dat files getting reset during disconnects.
MinecraftForge/FML@33100d6bab Merge pull request #371 from bl4ckscor3/patch-1
MinecraftForge/FML@572d32358a Merge pull request #373 from bloodmc/master
MinecraftForge/FML@d0dd05a15c FML expands S3F to support payloads up to 2 megs in size. Should be transparent
2014-02-18 21:03:44 -05:00
Christian 322e691d04 FML expands S3F to support payloads up to 2 megs in size. Should be transparent 2014-02-16 18:30:27 -05:00
cpw 9910256063 Merge pull request #373 from bloodmc/master
Prevent player data getting reset during disconnects.
2014-02-14 10:57:50 -07:00
cpw bd8ffc99d4 Merge pull request #371 from bl4ckscor3/patch-1
Fix ExampleMod.java for build #1024+
2014-02-14 10:57:32 -07:00
bloodshot f1db5dd5af Prevent player dat files getting reset during disconnects.
Since FML nulls out the player's playerNetServerHandler during login, we need to
make sure that writePlayerData does not attempt to overwrite the player's dat file
if the player disconnects during the "Logging In" process.
2014-02-13 02:44:18 -05:00
Lex Manos 3322996885 Fixeed a missed -1 in SpawnerAnimals patch. Thanks Blood. 2014-02-12 23:06:11 -08:00
Lex Manos b43d63a7ad Cull FakePlayers when worlds are unloaded. 2014-02-11 18:25:33 -08:00
Lex Manos c8e0b4a193 Use correct tag types when reading Forced Chunk data. Fixes ticket loading. Closes #964 2014-02-10 16:16:03 -08:00
Lex Manos c4972b7658 Fixed FluidContainerRegisry.contansFluid closes #845 2014-02-10 15:29:36 -08:00
Christian 2bf052ad91 Some argumentation 2014-02-08 22:41:02 -05:00
Christian 64aa12b7e6 Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load
when stuff is missing, but for right now, it will fail as this is "world safe".
2014-02-08 22:37:40 -05:00
Christian 2d1f9f2811 Try and handle removal of mods a bit better. Currently no way to allow a world which has missing
blocks to load - but i have the code in place to allow it i think.
2014-02-08 12:18:34 -05:00
bl4ckscor3 a5fb93271c Fix ExampleMod.java for build #1024+ 2014-02-08 12:34:01 +01:00
Lex Manos 8462f3b17c Fix AIOOB error with Endermen and blocks >256. Also better support for ID remapping. More to come later. 2014-02-07 19:15:05 -08:00
Dan Roque 982f5c7e1b Prevent players from logging in until server has finished starting.
This improves server security as it guarantees no players will be
allowed to connect until the server has fully initialized.
2014-02-05 20:49:10 -05:00
Lex Manos 1e2c63f486 Add the beginnings of a Constants class, to document/clean some of the magic numbers that are in the MC code base. 2014-02-05 01:14:57 -08:00
Lex Manos e68577ffd3 Updated FML:
MinecraftForge/FML@03fb1879d7 Fix obf error when right clicking a Empty Map.
MinecraftForge/FML@6bb9b8b953 Clean up FMLEventChannel. Closes #367.
MinecraftForge/FML@b7b3450dcd Update MCP mapping snapshot to latest crowdsourced names.
MinecraftForge/FML@8c9e8b5270 Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it.
2014-02-05 01:14:24 -08:00
Lex Manos dbf2c416c7 Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it. 2014-02-04 23:40:50 -08:00
Lex Manos 284c1eb06b Update MCP mapping snapshot to latest crowdsourced names. 2014-02-04 22:56:27 -08:00
Christian f8532711cb Clean up FMLEventChannel. Closes #367. 2014-02-04 20:01:44 -05:00
Lex Manos 45efe4edfd Fix obf error when right clicking a Empty Map. 2014-02-04 12:49:18 -08:00
Christian 9d919f8ac9 Fix up the event handler so it knows it's owned by forge 2014-02-02 12:34:34 -05:00
Christian 67d9dac16d Add a discriminator for fluididspacket. remove extraneous channel handler. 2014-02-02 12:19:37 -05:00
Christian 978bfd6eb1 MinecraftForge/FML@d87822ad85 Bump gradle wrapper to 1.10
MinecraftForge/FML@359ac3ca2a Ensure we check both item and block registries when finding valid IDs. Should fix #365
MinecraftForge/FML@cee0f0b811 Tweak so that writing to the context will automatically send a message back to the originator in handshakeestablished.
2014-02-02 12:18:32 -05:00
Christian 5d811025a7 Tweak so that writing to the context will automatically send a message back to
the originator in handshakeestablished.
2014-02-02 12:11:57 -05:00
Christian be8d33070e Ensure we check both item and block registries when finding valid IDs. Should fix #365 2014-02-01 11:05:33 +00:00
Lex Manos 539ee0ea88 Fixed missed parens causing trapdoors to fall off incorrectly. 2014-01-31 15:12:19 -08:00
Lex Manos f85ab543ee Fixed issue where enchantment effects caused slight rendeirng issue. 2014-01-31 14:32:32 -08:00
Lex Manos 498ab360e8 Bump gradle wrapper to 1.10 2014-01-29 21:04:55 -08:00
Lex Manos 51414375e4 Uncomment aa few FluidRegistry entries. 2014-01-29 21:04:34 -08:00
Lex Manos 2b9a2b5c1a Inital Fluid system update, untested. Still in progress. 2014-01-29 18:34:23 -08:00
Lex Manos 51b008c391 Attempt a AIOOB error fix in tesselator when there are alot of transparent blocks in the rendering range. 2014-01-29 16:17:31 -08:00
Lex Manos 0d84da021f Fix NPE when breaking ice. 2014-01-29 15:43:13 -08:00
Christian 3059e517c5 MinecraftForge/FML@544320b8d2 Beginning of a saveinspectionhandler.
MinecraftForge/FML@ab199c5811 Try harder to find a mod container.
MinecraftForge/FML@8633d780c9 And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen for coremods not properly registering their code. Closes #363
2014-01-25 06:30:12 -05:00
Christian 92f5351cf9 And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen
for coremods not properly registering their code. Closes #363
2014-01-25 06:20:09 -05:00
Christian e7ba3fd525 Try harder to find a mod container. 2014-01-25 06:17:14 -05:00
Lex Manos f8f1b4211b Fix imporerly efficient tools breaking blocks to fast. 2014-01-24 21:43:47 -08:00
Lex Manos 30a390d4bf Adds a WeatherRender in the style of SkyRender, Closes #844 2014-01-24 19:38:33 -08:00
Lex Manos 790030ab05 Fixed potential NPE in SlotCrafting, and added ItemStack sensitive version fo hasContainerItem. Closes #854 2014-01-24 19:30:17 -08:00
Lex Manos d73f4fb7b3 Move change of metadata to immediatly after change of Block, should prevent any 'invalid' tile entities from breaking created. Reference: #897 2014-01-24 19:21:59 -08:00
Lex Manos 6f7ac27c96 New PlayerUseItemEvents, Start, Stop, Tick and Finish. See PlayerUseItemEvent.java for more details. Closes #924 2014-01-24 19:10:51 -08:00
Lex Manos 6ae2353f41 Don't short circuit item icons for multiple render passes while being used. Closes #929 2014-01-24 17:23:49 -08:00
Lex Manos c62061728b Add the ability for custom records to have finer control over there sound resource location. Closes #933 2014-01-24 17:16:35 -08:00
Lex Manos 796b53f549 Exclude cobblestone slab recipe from ore dictification, closes #940 2014-01-24 16:44:23 -08:00
Lex Manos 6c6f664c30 Implement PlayerPickupXpEvent, fired when a player aquires XP from a EntityXPOrb. Closes #942 2014-01-24 16:31:38 -08:00
Lex Manos 2e47771860 Missing EntityAITasks.tasks and MapgGenStructreIO register ATs, Closes #949 2014-01-24 16:04:41 -08:00
Lex Manos 75a80f2f75 Make ItemBlock.field_150939_a public, closes #945 2014-01-24 16:02:39 -08:00
Lex Manos aaf6dd2b2e Fix Furnace stopping on 63rd Item, Closes #947 2014-01-22 15:35:55 -08:00
Christian bd8e9657d8 Beginning of a saveinspectionhandler. 2014-01-20 22:27:03 -05:00
Christian af011d1a57 MinecraftForge/FML@b6d95d704b Name the log files properly. fml-junk is an early startup annoyance I can't kill because log4j2.
MinecraftForge/FML@8692ca17d1 Log4j2 logging context for things. This should help add context when things go wrong in mods.
MinecraftForge/FML@a7ca131a33 And don't spam NONE everywhere
MinecraftForge/FML@741e172ffe Log4j2 doesn't need debug level logging for itself anymore
2014-01-20 22:04:52 -05:00
Christian acda9b5dd7 Log4j2 doesn't need debug level logging for itself anymore 2014-01-20 22:01:20 -05:00
Christian 294c825cc1 And don't spam NONE everywhere 2014-01-20 22:00:24 -05:00
Christian 5898d2a1f8 Log4j2 logging context for things. This should help add context when things go wrong in mods. 2014-01-20 21:58:39 -05:00
Christian 60abcb6341 Name the log files properly. fml-junk is an early startup annoyance I can't kill because log4j2. 2014-01-20 21:31:20 -05:00
Christian e653204638 MinecraftForge/FML@458b0620b4 Log the bad packet in a prettier way. Also, don't show the authlib debug data in the log file. 2014-01-20 17:30:16 -05:00
Christian d92176fe8c Log the bad packet in a prettier way. Also, don't show the authlib debug data in the log file. 2014-01-20 17:29:17 -05:00
Lex Manos adf0e3ab7d Add BookCloning to the recipe sorter. 2014-01-20 14:04:34 -08:00
Christian eeef1137a8 MinecraftForge/FML@9a8d16b66e Fix log4j2 config. Fix server gui to *show* logging. Fix log spamminess in the console. Fix bug in servergui that can cause deadlock.
MinecraftForge/FML@a355eecb2c Add in error logging for outbound messages. Fix bug with indexedcodec NPE
MinecraftForge/FML@1c793abe0e Fix derp with networkcheck
MinecraftForge/FML@675b5a0778 And turn down some more logging, now we have useful logging back again..
2014-01-20 16:15:57 -05:00
Christian cb47b4ac46 And turn down some more logging, now we have useful logging back again.. 2014-01-20 16:09:34 -05:00
Christian d22c79abd7 Fix derp with networkcheck 2014-01-20 16:06:50 -05:00
Christian 9fb9942498 Add in error logging for outbound messages. Fix bug with indexedcodec NPE 2014-01-20 16:02:26 -05:00
Christian 87a45d83fb Fix log4j2 config. Fix server gui to *show* logging. Fix log spamminess in the console. Fix bug in servergui that can cause deadlock. 2014-01-20 15:09:24 -05:00
Christian 49886aa633 MinecraftForge/FML@4aa2416ce5 Propagate Optional method removal to trait implementation classes
MinecraftForge/FML@fc025a7b73 Logging Changes
MinecraftForge/FML@f0132a6f3b changed fml log level to all
MinecraftForge/FML@f23eba4352 put max number of FML log files to 3
MinecraftForge/FML@449ac98b77 SSP Worlds updating from 1.6 will now pop a warning message before loading, and will capture a timestamped zip file in the minecraft dir before starting to load. Allows for people to test updates.
MinecraftForge/FML@3557fe31c9 Throw an exception when discriminator is not found
MinecraftForge/FML@2524045728 Make NetworkEventFiringHandler sharable
MinecraftForge/FML@dfc0899ec6 Merge pull request #357 from jk-5/sharable
MinecraftForge/FML@79d42fca8d Merge pull request #355 from jk-5/errorhandling
MinecraftForge/FML@7907e16e96 Add a type adapter for artifact version. Should fix #354
MinecraftForge/FML@7ac5bddbc3 Allow indexed messages to validate themselves. Also, catch exceptions from an embedded channel, and cause them to close the connection. It's ugly, but it means that the client doesn't crash if it connects to a screwy bungycord that's trying a 1.6 handshake for some reason.
MinecraftForge/FML@5adacc3b33 Check the mod, not it's container, in the check handler. Closes #358
MinecraftForge/FML@3d26f28bcf Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359
MinecraftForge/FML@a62374d4ac findBlock should now return null, not the default block, if the thing being looked for is not found. Closes #352
MinecraftForge/FML@6a695c4348 Try and stop the epic channel closed spam at close time. Closes #353
MinecraftForge/FML@35a38d7840 Make sidedproxy support non-public fields. Closes #344
MinecraftForge/FML@9d2e089df6 Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked
MinecraftForge/FML@79b04898d4 And restore suppressions. ABRAR, DON'T TIDY CODE!!!!
MinecraftForge/FML@3dfb54e066 Merge branch 'trait-optional' of github.com:RainWarrior/FML
MinecraftForge/FML@32bb7315cc Add in example assets dir. Closes #308
MinecraftForge/FML@16d33d2989 Clean up and document outbound handler a bit better. Add in dispatcher target. Closes #361
MinecraftForge/FML@5719b9ec53 Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network event firing.
2014-01-20 12:03:07 -05:00
Christian 7a3fd048d2 Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network
event firing.
2014-01-20 11:58:14 -05:00
Christian 62629d4140 Clean up and document outbound handler a bit better. Add in dispatcher target. Closes #361 2014-01-20 11:26:54 -05:00
Christian e21e2d8168 Add in example assets dir. Closes #308 2014-01-20 08:15:55 -05:00
Christian 0189a7c97e Merge branch 'trait-optional' of github.com:RainWarrior/FML 2014-01-20 08:14:27 -05:00
Christian 887392cf1b And restore suppressions. ABRAR, DON'T TIDY CODE!!!! 2014-01-20 08:09:02 -05:00
Christian 932734170d Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked 2014-01-20 08:06:45 -05:00
Christian 188488abc3 Make sidedproxy support non-public fields. Closes #344 2014-01-20 07:55:26 -05:00
Christian ad15c01cd8 Try and stop the epic channel closed spam at close time. Closes #353 2014-01-20 07:53:09 -05:00
Christian 8121f3fcae findBlock should now return null, not the default block, if the thing being looked for is not found. Closes #352 2014-01-20 07:49:44 -05:00
Christian 48ff8b895a Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359 2014-01-20 07:46:17 -05:00
Christian 9c9e04c2e1 Check the mod, not it's container, in the check handler. Closes #358 2014-01-20 07:42:35 -05:00
Christian 1ef1507299 Allow indexed messages to validate themselves. Also, catch exceptions from
an embedded channel, and cause them to close the connection. It's ugly, but
it means that the client doesn't crash if it connects to a screwy bungycord that's trying a 1.6 handshake for some reason.
2014-01-19 22:08:19 -05:00
Christian 755726bb7c Add a type adapter for artifact version. Should fix #354 2014-01-19 10:49:28 -05:00
cpw 608d401b75 Merge pull request #355 from jk-5/errorhandling
Throw an exception when discriminator is not found
2014-01-19 07:38:41 -08:00
cpw 48403ce488 Merge pull request #357 from jk-5/sharable
Make NetworkEventFiringHandler sharable
2014-01-19 07:37:52 -08:00
jk-5 f080c5d2e8 Make NetworkEventFiringHandler sharable
Fixes #356
2014-01-19 12:27:31 +01:00
jk-5 1a548b5bb5 Throw an exception when discriminator is not found 2014-01-19 11:21:24 +01:00
Christian 44a093e74b SSP Worlds updating from 1.6 will now pop a warning message before loading, and will capture a timestamped
zip file in the minecraft dir before starting to load. Allows for people to test updates.
2014-01-18 22:25:35 -05:00
Abrar Syed a0f021d985 put max number of FML log files to 3 2014-01-19 00:53:58 +00:00
Abrar Syed 41dcef50f7 changed fml log level to all 2014-01-19 00:49:47 +00:00
Lex Manos 28f7f523ee Add support in Techne models for the TextureSize tag. Closes #856 2014-01-18 13:53:54 -08:00
Lex Manos b917d48cff Fixed RenderWorldLastEvent never being called, was missed in 1.7 update. Closes #932 2014-01-18 13:22:09 -08:00
Lex Manos 79ebdfa145 Updated FML: MinecraftForge/FML@444a7d7fa1 Move placement of single player world load hook to fix NPEs. 2014-01-18 13:19:51 -08:00
Lex Manos 189dc35060 Move placement of single player world load hook to fix NPEs. 2014-01-18 13:05:18 -08:00
Lex Manos 612a8a71b0 Fix flexible rails, Closes #944 2014-01-18 04:45:25 -08:00
Lex Manos b93217397c Updated FML:
MinecraftForge/FML@7c5d62704a Make UniqueIdentifier final and add a hashCode. Closes #348
MinecraftForge/FML@ff7b5845e7 Clean up some warnings about @Override
MinecraftForge/FML@275ccac6f1 Fix NPE at startup
MinecraftForge/FML@2a5a8d0cd0 Fix memory leak?!
2014-01-17 21:55:54 -08:00
Lex Manos baf95e747a Fix warnings in Forge codebase. 2014-01-17 21:55:48 -08:00
Christian 3b367fcb8e Fix memory leak?! 2014-01-17 23:36:03 -05:00
Christian d7ed255e17 Fix NPE at startup 2014-01-17 23:35:53 -05:00
Christian b21975b8f0 Clean up some warnings about @Override 2014-01-17 23:19:22 -05:00
Christian b4a6418d1c Make UniqueIdentifier final and add a hashCode. Closes #348
Clean up language registry. It can be used to access all translations of mods on client or server.
Auto loads from assets files.
2014-01-17 17:47:30 -05:00
Christian eeeb4d37e8 Add exception logging to forge channel handlers as well
MinecraftForge/FML@53557dcd05 Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350
2014-01-17 17:05:11 -05:00
Christian f9bc1f0847 Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350 2014-01-17 17:00:55 -05:00
Christian b3d8e4ea68 MinecraftForge/FML@9c96ca4402 Fire a custom packet channel registration/deregistration event, for any mods that care about that kind of thing 2014-01-16 19:47:03 -05:00
Christian 135633b2ad Fire a custom packet channel registration/deregistration event, for any mods that care about that
kind of thing
2014-01-16 19:45:42 -05:00
Christian b463476815 MinecraftForge/FML@e14efe786f Some fixes and tweaks
MinecraftForge/FML@c013870b1d Merge branch 'simplenet'
MinecraftForge/FML@30882b0c1d Clean up some warnings. Add in simple network impl
MinecraftForge/FML@9cab2ab36e Add in some tests and examples for the "simple" network stuff
MinecraftForge/FML@a429e106dd Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things
2014-01-16 18:19:28 -05:00
Christian b70742e72d Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things 2014-01-16 18:15:45 -05:00
Christian 971289194c Add in some tests and examples for the "simple" network stuff 2014-01-16 18:07:25 -05:00
Christian 42c04dab2e Clean up some warnings. Add in simple network impl 2014-01-16 18:06:36 -05:00
Christian c71b7554e0 MinecraftForge/FML@b362e8a273 At the request of AbrarSyed.
MinecraftForge/FML@e344303ec7 Merge pull request #346 from Jezzadabomb338/master
MinecraftForge/FML@a4686b1261 Added basic Mojang account authentication support for development time login.
MinecraftForge/FML@dd17979a2f Fix bukkit connectivity issue.
2014-01-16 15:07:48 -05:00
Christian cb33a05824 Merge branch 'simplenet' 2014-01-16 14:59:13 -05:00
Christian ef1ee38b55 Fix bukkit connectivity issue. 2014-01-16 14:58:28 -05:00
Christian c3974f2e81 Some fixes and tweaks 2014-01-16 09:14:39 -05:00
Christian 3c8bd6346f Updated FML:
MinecraftForge/FML@1db3daa0e8 added override toString method for getting full name.
MinecraftForge/FML@acf74a3403 changed the readme to reflect new setup task.
MinecraftForge/FML@96c19b3580 undid readme change
MinecraftForge/FML@a89939e57e Merge pull request #336 from jadar/master
MinecraftForge/FML@717a8d6945 Fix csv string vs list of strings. Thanks immibis. Closes #334
MinecraftForge/FML@584c0f368b Fix potential ordering issue, clean up some imports
MinecraftForge/FML@28293b29ea Add in a simple(ish) event driven network handling system. Register using newEventDrivenChannel and you'll get a simple network handler that will fire events at the subscriber(s) of your choice, whenever a packet is received. You'll also get some convenience methods for sending to things.
MinecraftForge/FML@80b00dc796 Fix openGui. Closes #342
MinecraftForge/FML@fc69bcf280 Fix up privacy derp in TickEvent. Closes #343
MinecraftForge/FML@10d056a494 Fix possible NPE derp
MinecraftForge/FML@5da6dcc7e3 Divert connection through FML, so we can deny connections to servers that don't want us
2014-01-14 22:02:57 -05:00
Lex Manos f125c0ddd3 Added basic Mojang account authentication support for development time login. 2014-01-14 16:49:03 -08:00
LexManos d75a934838 Merge pull request #346 from Jezzadabomb338/master
At the request of AbrarSyed.
2014-01-13 23:11:42 -08:00
Jezzadabomb 14272e4932 At the request of AbrarSyed. 2014-01-14 15:39:24 +11:00
Christian 725aba9d41 Divert connection through FML, so we can deny connections to servers that don't want us 2014-01-13 13:47:18 -05:00
Christian 1a41990745 Fix possible NPE derp 2014-01-13 13:46:22 -05:00
Christian 2e76283ccd Fix up privacy derp in TickEvent. Closes #343 2014-01-13 08:43:33 -05:00
Christian 9017256609 Fix openGui. Closes #342 2014-01-13 08:40:56 -05:00
Christian 670f76accd Add in a simple(ish) event driven network handling system. Register using newEventDrivenChannel
and you'll get a simple network handler that will fire events at the subscriber(s) of your
choice, whenever a packet is received. You'll also get some convenience methods for sending
to things.
2014-01-12 13:20:41 -05:00
Christian 7a8eda46c4 Fix potential ordering issue, clean up some imports 2014-01-11 22:01:01 -05:00
LexManos 0296803fe3 Merge pull request #926 from iChun/master
Fix erroneous position when getting player position with changed eye height.
2014-01-11 17:32:27 -08:00
iChun b1f8af7f55 Squash commits so Lex would stop whining. Fix erroneous position when getting player position with changed eye height. 2014-01-12 07:59:39 +08:00
AbrarSyed 5176bc8841 Logging Changes 2014-01-11 16:43:14 +00:00
RainWarrior 8639a76726 Propagate Optional method removal to trait implementation classes 2014-01-10 00:56:00 +04:00
Christian f6476c1970 Fix csv string vs list of strings. Thanks immibis. Closes #334 2014-01-09 14:55:52 -05:00
cpw 6cdc949de7 Merge pull request #336 from jadar/master
added override toString method for getting full name.
2014-01-09 11:54:54 -08:00
Christian 3c0ef2cce8 Updated FML:
MinecraftForge/FML@d5bfd69e35 Fix problem with connecting to vanilla. SHOW what's modded and what's vanilla in the list. Hooks that make the blocking work to come
MinecraftForge/FML@dd098854b0 Fix the keybinding array to the right one
MinecraftForge/FML@43068eb986 Fix TargetPoint to be static
2014-01-09 08:44:52 -05:00
Christian ad305ef997 Fix TargetPoint to be static 2014-01-09 08:41:52 -05:00
Christian abf452f889 Fix the keybinding array to the right one 2014-01-09 08:40:42 -05:00
Christian f7d932d418 Fix problem with connecting to vanilla.
SHOW what's modded and what's vanilla in the list. Hooks that make the blocking work to come
2014-01-06 23:48:53 -05:00
Lex Manos aab5b04a6d Attempt to prevent a NPE when MC renders a lot of things at once. 2014-01-06 20:25:34 -08:00
Jadar 13c998ae5e undid readme change 2014-01-06 15:58:42 -06:00
Jadar 37b0797e3e changed the readme to reflect new setup task. 2014-01-06 11:09:34 -06:00
Jadar 183c317b83 added override toString method for getting full name. 2014-01-06 10:25:13 -06:00
LexManos 4e45156eaf Merge pull request #928 from Minalien/master
Fixed issue with forward-slashes in texture names when registering icons, fixed custom item renderer retrieval.
2014-01-05 21:08:06 -08:00
Ken 'Minalien' Murray 9e91b0ca81 Fixed MinecraftForgeClient for custom Item Renderer implementations. Removed check for forward-slashes (/) in texture asset locations (but left check for backslash in place). 2014-01-05 21:55:04 -07:00
Lex Manos 08eb897996 MinecraftForge/FML@0d810c01fa Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:08:00 -08:00
Lex Manos 5e4ddab6ba Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:02:47 -08:00
Lex Manos 0da954cc10 Fix DoublePlant placement, closes #921 2014-01-04 13:07:05 -08:00
Lex Manos a1b68d938d Deprecate BlockFire.func_149842_a, and throw exception if someone tries to set the burn properties for air. Should prevent 'The Air is on fire!' reports. 2014-01-04 13:06:31 -08:00
LexManos 325423ab02 Merge pull request #919 from VeryBigBro/patch-2
Create ru_RU.lang
2014-01-04 00:08:43 -08:00
Anton 9523059d85 Create ru_RU.lang 2014-01-04 09:28:29 +03:00
Christian 95c12b6c20 Updated FML:
MinecraftForge/FML@5317672631 Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses.
MinecraftForge/FML@9de9a15530 Fix stupid hardcoding derp
2014-01-03 23:07:55 -05:00
Christian 7f05ffa511 Fix stupid hardcoding derp 2014-01-03 23:04:24 -05:00
Christian d102e694c8 Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses. 2014-01-03 22:57:36 -05:00
Lex Manos b6199c202e Fixed pipeline naming issue in the ForgeNetworkHandler. 2014-01-03 18:54:52 -08:00
LexManos 367c5d1ede Merge pull request #882 from Vexatos/patch-2
Create de_DE.lang
2014-01-03 18:29:55 -08:00
Lex Manos ef5d66ebd2 Fixed the run config for dev time server, Cloases #913 2014-01-03 17:29:40 -08:00
Lex Manos 3953eb3f6c Fix panes/iron bars not connecting correctly. Closes #904 2014-01-03 17:26:40 -08:00
Lex Manos b149ccbc17 Models now load from resource packs
Models must now be loaded from resource packs using the standard resource pack reference. For example, to load a model named "assets/mymod/models/mymodel.obj", you would call AdvancedModelLoader.loadModel("mymod:models/mymodel.obj");
Closes #670
2014-01-03 17:10:15 -08:00
Lex Manos df0b1751e6 Fixing an infinite recursion case, Closes #916 2014-01-03 16:50:02 -08:00
LexManos bb756115fa Merge pull request #915 from Adubbz/master
Made canBeReplacedByLeaves default to whether a block isn't opaque rathe...
2014-01-03 16:14:37 -08:00
Adubbz 48a9e24630 Made canBeReplacedByLeaves default to whether a block isn't opaque rather than if it is, also uninverted the checks for canBeReplacedByLeaves in WorldGenBigMushroom, WorldGenSwamp, WorldGenTaiga1 and WorldGenTaiga2 2014-01-03 18:00:11 +11:00
Christian 3896a63016 Fix inversion 2014-01-02 22:52:04 -05:00
Christian 50144d178a Updated FML:
MinecraftForge/FML@6f1da6550e Fix up mcpname derp in GuiScrollingList.
2014-01-02 22:46:42 -05:00
Christian ec0d44b8c9 Fix up mcpname derp in GuiScrollingList. 2014-01-02 22:44:26 -05:00
Christian e0840e392c Updated FML:
MinecraftForge/FML@21b13d6351 Lots of network cleanup. Gui packets now work too!
MinecraftForge/FML@b3f98d1ee0 Fix derpiness with Mods button when Realms is available
MinecraftForge/FML@cdd9d92a4f Starting work on the actual GUI. Still work to do. Needs an API.
MinecraftForge/FML@ab5eb3ccff Fix button size for GuiModList
MinecraftForge/FML@3113138bd1 Tweak button positions.
MinecraftForge/FML@c5e29b574a Avoiding redundant calls to LogManager
MinecraftForge/FML@fbc1f8f6f9 Config GUIs in the modlist now work.
MinecraftForge/FML@fa4f3015a0 Added transparent background for GuiIngameModOptions as per cpw's request. May not compile due to manual de-mcp-fication.
MinecraftForge/FML@7bf119e1e5 Fix up readmes and credits. We no longer support modloader.
MinecraftForge/FML@779cd05aa1 Tweaks
MinecraftForge/FML@b51fb91355 Merge branch 'patch-1' of github.com:airbreather/FML
2014-01-02 22:27:42 -05:00
Christian c67e3d3abe Merge branch 'patch-1' of github.com:airbreather/FML 2014-01-02 22:21:25 -05:00
Christian 62dde437ca Tweaks 2014-01-02 22:18:02 -05:00
Christian 43dd8a8ee7 Fix up readmes and credits. We no longer support modloader. 2014-01-02 22:18:02 -05:00
iChun 5eaedffe3b Added transparent background for GuiIngameModOptions as per cpw's request. May not compile due to manual de-mcp-fication. 2014-01-02 22:18:02 -05:00
Christian aa963c5df6 Config GUIs in the modlist now work. 2014-01-02 11:51:16 -05:00
airbreather 37686f33af Avoiding redundant calls to LogManager 2014-01-01 11:40:32 -05:00
Vexatos e6bfb6b7b3 Update de_DE.lang 2014-01-01 09:06:40 +01:00
LexManos 165cbd1c48 Merge pull request #912 from Adubbz/master
Fixed sky colour transitions on a render distance of 16, fixed the World...
2013-12-31 23:53:45 -08:00
Adubbz bd5e7f8118 Fixed sky colour transitions on a render distance of 16, fixed the WorldGen of various things 2014-01-01 18:50:52 +11:00
Christian 7a62801209 Tweak button positions. 2014-01-01 02:09:40 -05:00
iChun 29d84cc6af Fix button size for GuiModList 2014-01-01 14:16:23 +08:00
Christian 584ad55ce6 Starting work on the actual GUI. Still work to do. Needs an API. 2014-01-01 00:57:24 -05:00
Christian a9ae906546 Fix derpiness with Mods button when Realms is available 2013-12-31 20:21:28 -05:00
Christian 3e0285e508 Lots of network cleanup. Gui packets now work too! 2013-12-31 19:55:41 -05:00
LexManos ccee30b15e Merge pull request #908 from jk-5/patch-1
Add constructors to DimensionRegisterMessage
2013-12-31 13:08:56 -08:00
Lex Manos 32f26561b1 Fix inverted login in BlockPistonBase causing blocks to break incorrectly. Closes #910 #909 2013-12-31 13:07:44 -08:00
Lex Manos ea0be720a1 Update patches for AT changes. 2013-12-31 13:03:45 -08:00
Lex Manos b31fbe528a Update for the FMLEmbeddedChannel change. 2013-12-31 12:48:59 -08:00
Christian 2f13622d37 Updated FML:
MinecraftForge/FML@22ba6fda5e Expose the nethandler in a few places, and pull out FMLEmbeddedChannel, exposing a utility method on it. More to come.
2013-12-31 09:46:50 -05:00
Christian e4d2f73fe2 Expose the nethandler in a few places, and pull out FMLEmbeddedChannel, exposing a utility method on it.
More to come.
2013-12-31 09:45:26 -05:00
jk-5 03c4282ebf Added default constructor for reflection 2013-12-31 08:21:05 +01:00
jk-5 5ff5f1b0d5 Added a constructor and made the fields package-private 2013-12-30 21:58:53 +01:00
jk-5 07fa6615f8 Update ForgeMessage.java 2013-12-30 20:12:15 +01:00
Christian 941c2b1d14 Fix build.gradle for tweakClass property
Updated FML:
MinecraftForge/FML@f36152398d Add in the tweakclass, fix the json for lzma @ the server.
2013-12-30 13:27:15 -05:00
Christian a80409c59a Add in the tweakclass, fix the json for lzma @ the server. 2013-12-30 13:06:59 -05:00
Christian aa67bc5da6 Updated FML:
MinecraftForge/FML@5d069629cf Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor.
2013-12-28 18:06:18 -05:00
Christian 9caa3842cf Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor. 2013-12-28 18:04:30 -05:00
Christian 946166f13e Updated FML:
MinecraftForge/FML@061288909d Fire simple network connect/disconnect gameevents.
2013-12-28 17:53:29 -05:00
Christian e27b438f7d Fire simple network connect/disconnect gameevents. 2013-12-28 17:51:40 -05:00
Christian 6ab5ef1315 Merge branch 'master' of github.com:Adubbz/MinecraftForge 2013-12-28 17:02:41 -05:00
Christian 5c647d4515 Fix the network handler for forge 2013-12-28 17:01:58 -05:00
Christian 906ced3c32 Updated FML:
MinecraftForge/FML@34819c9303 Make gradlew executable on linux
MinecraftForge/FML@53a1f98414 Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP!
MinecraftForge/FML@6a5f9e135f Fix example mod code for 1.7
2013-12-28 13:49:18 -05:00
Christian 7b7b8245db Fix example mod code for 1.7 2013-12-28 13:44:37 -05:00
Adubbz 164fa8f646 Made BlockCrops.getDrops call its super method 2013-12-28 23:15:09 +11:00
Christian f075264d6f Allow tools to override their material harvest levels. 2013-12-27 23:48:10 -05:00
Christian cf3447feea Tidier implementation of previous commit. Should fix for subclasses of individual tools too 2013-12-27 21:48:42 -05:00
Christian 78b1b54e2b Add in harvesting abilities of the items, should fix effectiveness 2013-12-27 21:26:42 -05:00
Christian c68f3119a4 Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP! 2013-12-27 11:48:55 -05:00
Christian fa0bce3efb Make gradlew executable on linux 2013-12-27 11:26:46 -05:00
Christian b7eac150cc Updated FML:
MinecraftForge/FML@f8d6213829 Update render registry
MinecraftForge/FML@ec316f113f AT for renderblocks
2013-12-27 00:09:22 -05:00
Christian 3030324b99 AT for renderblocks 2013-12-27 00:08:49 -05:00
Christian 59405fc7ee Update render registry 2013-12-27 00:07:48 -05:00
Christian a9876475c1 Updated FML:
MinecraftForge/FML@268bbabee6 Fix handling world reloads when new stuffs are added
2013-12-26 12:43:34 -05:00
Christian 2362fdb9d5 Fix handling world reloads when new stuffs are added 2013-12-26 12:42:40 -05:00
LexManos 46296328ff Merge pull request #893 from iChun/master
Add render offset to event.
2013-12-25 01:05:45 -08:00
iChun 5f3ece629c Add render offset to event. 2013-12-25 17:03:19 +08:00
Lex Manos a6827f9820 Fix dig speed on redstone ore and obsidian. 2013-12-25 00:41:21 -08:00
Lex Manos 40d02fe6c3 Add a version check mechanic to startup, it is done in a seperate thread and has a config option to compleetly disable it. This allows us to notify users of new recomended builds. Hopefully stemming the flow of outdated help request. Also adds a warning to the main screen if you are running a 'Beta' Forge. Which means a Forge for a new version of Minecraft that we have not promoted a recomended build for yet. 2013-12-25 00:35:59 -08:00
Lex Manos 572bc48a25 Resize pending tile updates when it goes over the curent length. Fixed AIOOB error. 2013-12-24 19:59:34 -08:00
Lex Manos 1959e414e2 Forgot to regen patches... 2013-12-23 22:45:45 -08:00
Lex Manos 08a875c39a Added constructor to WorldType, and delegated the BiomeLayer management to it. Also updated the access transformer for Item/Block classes. 2013-12-23 22:40:54 -08:00
Lex Manos 90be589ffa MinecraftForge/FML@c180d9b157 Add 1.7.2 base json, Gradle will automatically download updated versions of this. Keeping it in the repo allows us to se
e what base json we have built our jsons off of. And if it changes update accordingly.
2013-12-23 22:40:54 -08:00
Christian 780865cfed Updated FML:
MinecraftForge/FML@156a9ae03a Fix build script
MinecraftForge/FML@7d3b1250e8 Fix handshaking properly. Also, fix ID syncup. It now will completely freeze the idmap after preinit. This frozen map is used to inject "new" stuff into existing serverside worlds. Interesting sideeffect: remote servers lacking things will change the client, to also LACK ids for those things. watch for -1 ids in your remap events. Note: idmaps should be considered temporary per server instance. SERVERSTOPPED will restore "startup" state, as will client logout.
2013-12-24 01:37:25 -05:00
Lex Manos f4fc6377b3 Add 1.7.2 base json, Gradle will automatically download updated versions of this. Keeping it in the repo allows us to see what base json we have built our jsons off of. And if it changes update accordingly. 2013-12-23 22:36:47 -08:00
Christian 41e930a4b9 Fix handshaking properly. Also, fix ID syncup. It now will completely freeze the idmap after preinit.
This frozen map is used to inject "new" stuff into existing serverside worlds. Interesting sideeffect: remote
servers lacking things will change the client, to also LACK ids for those things. watch for -1 ids in your remap
events. Note: idmaps should be considered temporary per server instance. SERVERSTOPPED will restore "startup" state,
as will client logout.
2013-12-24 00:47:10 -05:00
Lex Manos d795f1b898 Fix items rendering on the GUI with invalid state due to glint rendering changing it. Thanks iChun. 2013-12-23 20:58:48 -08:00
Lex Manos ecf8d29724 Fixed accedential inverted logic that caused Potions to render incorrectly. Thanks iChun. 2013-12-23 20:47:07 -08:00
Lex Manos 8ca1179e04 Move Grass {Flower} registry to BiomeGenBase as 1.7 made flowers Biome specifc, this means modders who wish to add global base flowers need to add them to all the biomes indavidually. 2013-12-23 20:34:39 -08:00
Lex Manos 96e23516f6 Temporary fix for items rendering with effects on one layer. Restores default vanilla rendering, which is considered a bug in modded community. 2013-12-23 20:33:32 -08:00
Lex Manos 2102965fac Fix debug HUD rendering semi-transparently. 2013-12-23 20:32:37 -08:00
Christian 54731a2acc Fix build script 2013-12-23 20:24:54 -05:00
Lex Manos 436f7fc550 Bump version to 10.12.0 to mark 1.7. 2013-12-22 18:48:22 -08:00
Lex Manos 2b10a2b874 Updated FML:
MinecraftForge/FML@58132ccda3 Add new required --accessToken to launch specs.
2013-12-22 18:37:53 -08:00
Lex Manos 20e0f821b3 Add new required --accessToken to launch specs. 2013-12-22 18:35:50 -08:00
Lex Manos 9ee5053b71 Fix:
Block placement/interaction
  Tesselator crash due to wrong mapping
  Missing isreplaceable check in world.canPlaceAt
  Small foratting/logging cleanup
  Temporarly commented out efficancy changes till I implement it.
2013-12-22 18:25:26 -08:00
Lex Manos 30494f8ddb Fix MethodNotFound crash when shutting down internal server. 2013-12-22 18:22:57 -08:00
Lex Manos 21e505c334 Forge uses the FORGE channel for packets. 2013-12-22 18:21:56 -08:00
Lex Manos 7e668ca9ac Get object based on identity not name. 2013-12-22 18:21:43 -08:00
LexManos 1d556a5668 Merge pull request #890 from bloodmc/master
Refactored BiomeManager stronghold add/remove methods to support new MapGenStronghold dynamic biome changes.
2013-12-22 15:52:37 -08:00
bloodshot 8654623271 Refactored BiomeManager stronghold add/remove methods to support new
MapGenStronghold dynamic biome changes.
Changed InitNoiseGensEvent to pass a NoiseGenerator array instead of
NoiseGeneratorOctaves due to new NoiseGeneratorPerlin in
ChunkProviderGenerate.
Fixed worldgen crash caused by wrong metadata in Chunk patch.
2013-12-22 18:47:51 -05:00
Lex Manos e1c0cad8e1 Updated FML:
MinecraftForge/FML@a17489172c Code to disable mods at runtime, or other times.
MinecraftForge/FML@85516d9588 ICraftingHandler, IPickupHandler are now both events.
MinecraftForge/FML@e4b63a1801 IWorldGenerator now has an ordering at registration time. This means the order of worldgen should be much more stable.
MinecraftForge/FML@ef3856f9a3 Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2
MinecraftForge/FML@31ea100b29 Working on id missing handling
MinecraftForge/FML@3e76dfba34 More tweaking on id stuffs at worldload
MinecraftForge/FML@f860c8ad3b bump to legacy launcher 1.9 with logging unification stuffs.
2013-12-22 03:07:48 -08:00
Lex Manos a6c45a7ade Inital patch update for 1.7.2, Doesn't compile, not done yet. 2013-12-22 03:06:10 -08:00
Christian 61c6980105 bump to legacy launcher 1.9 with logging unification stuffs. 2013-12-18 11:15:53 -05:00
Christian 8b621292e3 More tweaking on id stuffs at worldload 2013-12-18 11:15:03 -05:00
Christian f6f746ceca Working on id missing handling 2013-12-18 08:34:44 -05:00
Lex Manos 78f822e51c Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2 2013-12-18 04:01:37 -08:00
Christian 58fc22e6b4 IWorldGenerator now has an ordering at registration time. This means the order of worldgen should be much more stable. 2013-12-17 11:42:54 -05:00
Christian 5aa0054f23 ICraftingHandler, IPickupHandler are now both events. 2013-12-17 11:24:57 -05:00
Christian 751c5e39a4 Code to disable mods at runtime, or other times. 2013-12-17 10:51:00 -05:00
Christian cd34090eb8 Updated FML:
MinecraftForge/FML@32561265fc Ticks, Player events, keybindings, all migrated to the new event driven system.
2013-12-16 23:20:06 -05:00
Christian 95f0447881 Ticks, Player events, keybindings, all migrated to the new event driven system. 2013-12-16 23:18:00 -05:00
Christian ae478c92a2 Moved the core event handler parts to FML. Implemented the Forge network handler based on the new
netty strategy.

Updated FML:
MinecraftForge/FML@3b2994a3de Some patching touchups
MinecraftForge/FML@557357fe17 Update for log4j2
MinecraftForge/FML@a2b324beb2 Copy eventhandler from Forge into FML. It is going to replace a lot of the runtime event systems.
MinecraftForge/FML@4071ff38af Patch some GUIs. We're gonna add some basic mod gui config support.
MinecraftForge/FML@0b419ac79c Fire a user event down the channels when a handshake has occured.
2013-12-16 20:19:03 -05:00
Christian 041054ea8b Fire a user event down the channels when a handshake has occured. 2013-12-16 20:00:01 -05:00
Christian 69ce79e1d7 Patch some GUIs. We're gonna add some basic mod gui config support. 2013-12-16 11:48:39 -05:00
Christian 26056619a9 Copy eventhandler from Forge into FML. It is going to replace a lot of the runtime event systems. 2013-12-16 11:48:09 -05:00
Christian a0fcbdccb5 Update for log4j2 2013-12-16 11:47:48 -05:00
Lex Manos 439dbd8bb3 Killed a few hundred compile errors. 2013-12-12 23:32:36 -08:00
Lex Manos 9cf0a5b68b Comment out fluids until King gets his hands on it 2013-12-12 23:32:18 -08:00
Lex Manos 6eb9915690 Updated FML:
MinecraftForge/FML@1d71c017f4 ID syncing.
MinecraftForge/FML@fd36f50d82 Cleanups
MinecraftForge/FML@89e4e483c2 Add in a remapping event for mods to consume.
MinecraftForge/FML@cd417c6786 Fixed remote and local connections work with mods now.
MinecraftForge/FML@ef492407ef Entity spawning works.
MinecraftForge/FML@d0d31d9575 SpawnAdjustment packet. Clean up stuffs. No more compile errors.
MinecraftForge/FML@3e278acb71 Fix stupid possible compiler error.
MinecraftForge/FML@009d4dee23 Fix the exc file. Fix the deobfremapper for handling inner classes.
MinecraftForge/FML@49cb893d12 Fix exc this time *sigh*
MinecraftForge/FML@31efcfc3b2 Clean up patches for latest exc.
MinecraftForge/FML@7a4ceebf5e Kill old patches and add rejects to ignore file.
MinecraftForge/FML@7ea571f593 Fix AT, Fix exc. Almost works now!
MinecraftForge/FML@b852e30285 First functional release under reobfuscation.
MinecraftForge/FML@df870c1a33 Update shiped ForgeGradle for 1.7
MinecraftForge/FML@55aa337f95 Rename synthetic bridge methods, these methods are not decompiled, but need to reobf correctly cross the recompile boundary.
MinecraftForge/FML@0098c57f94 Merge pull request #316 from AbrarSyed/patch-4
2013-12-12 22:59:35 -08:00
Christian d188a5ad82 Some patching touchups 2013-12-13 00:18:05 -05:00
LexManos ed62082e1e Merge pull request #316 from AbrarSyed/patch-4
Update shiped ForgeGradle for 1.7
2013-12-12 17:23:04 -08:00
Lex Manos 5e6ff7e729 Rename synthetic bridge methods, these methods are not decompiled, but need to reobf correctly cross the recompile boundary. 2013-12-12 17:18:04 -08:00
Abrar Syed e4fe6ab949 Update shiped ForgeGradle for 1.7 2013-12-12 17:11:37 -06:00
Christian e4479b81cb First functional release under reobfuscation. 2013-12-12 18:01:09 -05:00
Christian 7956c2f659 Fix AT, Fix exc. Almost works now! 2013-12-12 01:39:30 -05:00
Lex Manos 1322e3407b Kill old patches and add rejects to ignore file. 2013-12-11 20:39:15 -08:00
Christian b3e35e381f Clean up patches for latest exc. 2013-12-11 23:03:30 -05:00
Christian 7b93e40d7c Fix exc this time *sigh* 2013-12-11 22:58:46 -05:00
Christian 1533d88ef8 Fix the exc file. Fix the deobfremapper for handling inner classes. 2013-12-11 22:54:51 -05:00
Christian fb7913f583 Fix stupid possible compiler error. 2013-12-11 20:17:08 -05:00
Christian 5e57ce519e SpawnAdjustment packet. Clean up stuffs. No more compile errors. 2013-12-11 19:29:52 -05:00
Christian 5086f22370 Entity spawning works. 2013-12-11 18:46:25 -05:00
Christian 5eb2aec84e Fixed remote and local connections work with mods now. 2013-12-11 12:35:08 -05:00
Vexatos ca7a404fc8 Create de_DE.lang 2013-12-11 15:17:20 +01:00
Christian 4f6aabda09 Add in a remapping event for mods to consume. 2013-12-10 19:25:49 -05:00
Christian 985e4ceb4a Cleanups 2013-12-10 17:29:26 -05:00
Christian 531334b122 ID syncing. 2013-12-10 14:32:06 -05:00
Lex Manos 4a1a0be51d Updated FML:
MinecraftForge/FML@a30f173627 Add sonatype snapshots repo for SpecialSource snapshots.
MinecraftForge/FML@b2550b8a69 Add mappings for Items/Blocks fields.
MinecraftForge/FML@57f7f1d7ab Update for fixed Enum cleaning and names.
MinecraftForge/FML@99c681ad87 Did it manually, forgot it needed the end comma
2013-12-09 22:03:39 -08:00
Lex Manos 521b8a16c4 Some work on 1.7, waiting for Abrar to fix a few things. 2013-12-09 21:59:12 -08:00
Lex Manos 9f76245783 Did it manually, forgot it needed the end comma 2013-12-09 20:49:37 -08:00
Lex Manos cf6b9e7c1a Update for fixed Enum cleaning and names. 2013-12-09 20:44:17 -08:00
Lex Manos d92633d368 Add mappings for Items/Blocks fields. 2013-12-09 20:43:57 -08:00
Lex Manos cda439fe9d Add sonatype snapshots repo for SpecialSource snapshots. 2013-12-09 20:43:27 -08:00
Lex Manos d4e7a5c68e Bump data for 1.7 start. 2013-12-09 18:47:55 -08:00
Lex Manos b474c2ca7a Kill liquids finally. 2013-12-09 18:47:15 -08:00
Lex Manos 4142f7c728 MinecraftForge/FML@3714426e19 fix derp in example builscript
MinecraftForge/FML@01fb451b69 Merge pull request #311 from AbrarSyed/patch-3
MinecraftForge/FML@30d532f4fc Pass 1: Most patches are restored.
MinecraftForge/FML@53127eec30 Merge branch 'master' of github.com:MinecraftForge/FML
MinecraftForge/FML@7ab3c3a37c Update gitignore
MinecraftForge/FML@38cec7a11f The basic network handshaking for FML is done. All scenarios seem to work.
MinecraftForge/FML@9f928963f2 A network design I like. It uses the netty embedded channel to allow mods to build channel pipelines on top of custom payload packets.
MinecraftForge/FML@58f7487cfa Check in patches. Add in some network timeout tweaking values so you can debug the network.
MinecraftForge/FML@e544adba5c More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now.
MinecraftForge/FML@f5c38e2359 OK, network channels appear to be working well for both dedi and integrated servers. The beginnings of the new mod structure too.
MinecraftForge/FML@9c96a0a10a More network stuff, partially done id syncing.
MinecraftForge/FML@2aaaeba15e ID loading from the server save now works.
2013-12-09 18:45:17 -08:00
Christian 4fc600010e ID loading from the server save now works. 2013-12-09 21:36:49 -05:00
Christian eff9a3cedc More network stuff, partially done id syncing. 2013-12-09 01:22:24 -05:00
Christian bead2dab97 OK, network channels appear to be working well for both dedi and integrated servers.
The beginnings of the new mod structure too.
2013-12-06 14:52:33 -05:00
Christian 89c7a02146 More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now. 2013-12-06 11:17:40 -05:00
Christian add83f145a Check in patches. Add in some network timeout tweaking values so you can debug the network. 2013-12-06 08:07:09 -05:00
Christian 1c44a6c181 A network design I like. It uses the netty embedded channel to allow mods to build channel pipelines on top of
custom payload packets.
2013-12-06 03:11:03 -05:00
Christian fadff73489 The basic network handshaking for FML is done. All scenarios seem to work. 2013-12-04 00:11:08 -05:00
Christian 37a00f0158 Update gitignore 2013-12-02 23:54:15 -05:00
Christian e5ffbd7fdf Merge branch 'master' of github.com:MinecraftForge/FML
Conflicts:
	install/build.gradle
	patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
	patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
2013-12-02 23:52:27 -05:00
Christian f10969e3aa Pass 1: Most patches are restored.
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
2013-12-02 23:48:26 -05:00
cpw b501f21624 Merge pull request #311 from AbrarSyed/patch-3
fix derp in example builscript
2013-11-27 02:13:42 -08:00
Abrar Syed 75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
Lex Manos 54c440d75c Bump build for gradle fixes:
Now Builds for java 1.6
  Include version,json in universal
  Fixed classpath issues in eclipse task.
2013-11-20 23:44:54 -08:00
LexManos 954d46e587 Merge pull request #868 from luacs1998/patch-1
Update readme for ForgeGradle
2013-11-20 21:47:08 -08:00
Lex Manos 198539479f Updated FML: MinecraftForge/FML@c2b919d339 Don't validate signatures in dev env. 2013-11-20 20:41:20 -08:00
Lex Manos 45aa1485b3 Don't validate signatures in dev env. 2013-11-20 13:18:26 -08:00
luacs1998 30680d0268 Update README.txt 2013-11-20 22:49:20 +08:00
luacs1998 c1c88644ae Another update for eclipse users 2013-11-20 16:16:48 +08:00
luacs1998 36ce23073c Updated 2013-11-20 16:09:34 +08:00
luacs1998 45e2d12d06 Update readme for ForgeGradle
Let me know if there's anything else to add or change.
2013-11-20 15:49:08 +08:00
Lex Manos e18a7569f8 Fix build file pom closures. 2013-11-19 16:47:50 -08:00
Lex Manos 3470b44e9a Proper configuratuion name for jenkins. 2013-11-19 15:35:06 -08:00
LexManos 23cfb03a3b Merge pull request #867 from GUIpsp/master
Fix gradle wrapper.
2013-11-19 15:15:09 -08:00
Guilherme Espada 918f91bc44 Make the gradle wrapper executable. 2013-11-19 22:37:52 +00:00
LexManos 6ff7584f96 Merge pull request #859 from AbrarSyed/master
Gradlization
2013-11-19 14:13:56 -08:00
Lex Manos b15289113b update build.gradle 2013-11-19 16:00:07 -06:00
Lex Manos 99faaae9f6 Regenerate all patches, No functional change as added this is a formatting change only. 2013-11-18 17:17:45 -08:00
Lex Manos 0999017fda Updated FML:
MinecraftForge/FML@e9a7660cb8 updated samples
MinecraftForge/FML@30894f7afa Merge pull request #307 from AbrarSyed/master
MinecraftForge/FML@c4b8a393f9 Make the working directory the root of the eclipse workspace.
2013-11-18 17:17:22 -08:00
Lex Manos 34f4b58f69 Update run configs. 2013-11-18 16:19:31 -08:00
Lex Manos 7b737de2c1 Make the working directory the root of the eclipse workspace. 2013-11-17 19:26:21 -08:00
LexManos c45c99d07c Merge pull request #307 from AbrarSyed/master
updated samples
2013-11-17 17:58:01 -08:00
AbrarSyed af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
Lex Manos e9af710cf4 Fix for new FML, and publish to maven local 2013-11-17 12:01:31 -08:00
AbrarSyed 74104fe5d0 Update forge 2013-11-17 12:07:22 -06:00
LexManos a5efa91e6a Merge pull request #306 from MinecraftForge/1.6.4
Actually do it correctly. Should be more forge friendly now.
2013-11-17 10:04:27 -08:00
Lex Manos 45cc0bd87c Fix NPE in FakePlayers when they are created in a purely client side environment. To remove in 1.7 as FakePlayers should be used for server side interaction with the world on a player's behalf, not for client rendering. 2013-11-16 15:26:52 -08:00
Lex Manos 77c5caffd5 Fix NPE on specific tile entities when the block break event is canceled. Closes #863 2013-11-16 15:26:00 -08:00
AbrarSyed f5335d59cc added buildSrc to the gitIgnore 2013-11-14 20:22:31 -06:00
Christian 28abe2cc3c Updated FML:
MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
2013-11-13 19:16:24 -05:00
Christian b7b97efe81 Actually do it correctly. Should be more forge friendly now. 2013-11-13 19:10:11 -05:00
Christian 90e3b49ea5 Merge branch '1.6.4' 2013-11-13 07:55:12 -05:00
Christian 745d601831 Updated FML:
MinecraftForge/FML@da72640c7e Way to go, missing import. *sigh*
2013-11-13 07:46:04 -05:00
Christian 56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian 9fd39ebe79 Updated FML:
MinecraftForge/FML@b7f34629c3 Don't try and open GUIs on the server.
2013-11-12 18:05:04 -05:00
Christian c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian 4f05808b8e Don't send openGui commands from the fakeplayer. Fixes thaumcraft and probably others. 2013-11-12 17:33:24 -05:00
Christian c8e249f919 Updated FML:
MinecraftForge/FML@6af42bc656 Add in null protection for client/server sides of handleChat
2013-11-12 17:22:20 -05:00
Christian b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
LexManos 7adccac8ec Merge pull request #855 from CovertJaguar/patch-4
Fix Water/Lava Fluid Localization
2013-11-12 10:00:37 -08:00
CovertJaguar 0a12840e68 Fix Water/Lava Fluid Localization 2013-11-12 01:05:13 -08:00
Lex Manos 1bd3e96e6e Noop out FakePlayer.addStat. 2013-11-11 13:15:06 -08:00
pahimar 95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00
Christian 82004fe703 Kill more references to modloader. 2013-11-10 13:15:26 -05:00
Christian 2867dfdfa5 Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die. 2013-11-10 12:01:26 -05:00
Christian 5cec48da72 Deprecation cleanup. Bye bye more modloader stuffs 2013-11-10 11:58:34 -05:00
Christian a8e44dad47 First pass : kill modloader, clean up warnings 2013-11-10 11:49:06 -05:00
AbrarSyed cdbdd0d6fb fixed versioning and stuff 2013-11-10 00:54:57 -06:00
AbrarSyed 743d10d50e Step 3: The Rebirth 2013-11-09 21:48:53 -06:00
Lex Manos 394cfa940e Join the developers list in the pom and fix the client run configs in the workspace. 2013-11-09 19:22:17 -08:00
LexManos 0ad83d84c5 Merge pull request #302 from AbrarSyed/patch-1
Update 1.6.4-rel.json
2013-11-09 19:15:34 -08:00
Abrar Syed 43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Christian 4cefffa1c9 Change the build to capture an MCP version, also, tweak the sources so mavenLocal can be used for ForgeGradle 2013-11-09 20:00:05 -05:00
AbrarSyed 797399ff7f Step 2: The Reformation 2013-11-09 15:57:08 -06:00
AbrarSyed 9332673944 update FML for gradle changes 2013-11-09 15:53:05 -06:00
AbrarSyed f9563e5a34 Step 1: The Purge 2013-11-09 15:44:50 -06:00
Christian 84fd2a147e Updated FML:
MinecraftForge/FML@3d25b4e793 Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate. Closes #300
2013-11-09 14:36:42 -05:00
Christian e378a24759 Fix license and naming 2013-11-09 14:28:54 -05:00
AbrarSyed 923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00
Lex Manos b4a5c25d36 Move to install to not clutter root directory with the .bat and .sh files I know are coming. 2013-11-09 14:28:54 -05:00
Lex Manos e034f74311 Include eclipse template workspace, for packaging in src distro. 2013-11-09 14:28:54 -05:00
Lex Manos 8364a4e522 Add gradle wrapper 2013-11-09 14:28:53 -05:00
Lex Manos d0bae88b04 Publish to repo folder for local testing. 2013-11-09 14:28:53 -05:00
AbrarSyed c272eceac8 Step 3: The Rebirth 2013-11-09 14:28:53 -05:00
Lex Manos d41794a9b6 Step 2: The Reformation 2013-11-09 14:28:53 -05:00
AbrarSyed d2d36880b0 Step 1: The Purge 2013-11-09 14:28:53 -05:00
Christian 7831555a7f Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for
scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300
2013-11-09 14:27:15 -05:00
LexManos cfd368e18f Merge pull request #852 from MinecraftForge/breakevent
Merge BreakEvent branch, as nobody has told me that it breaks everything. And in prep from 1.7.
2013-11-09 00:43:58 -08:00
Christian a9c795b54c Updated FML:
MinecraftForge/FML@f4532410ec Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.
2013-11-06 16:19:40 -05:00
Christian 3b42a14dba Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration. 2013-11-06 16:18:41 -05:00
Christian 8fb4546437 Updated FML:
MinecraftForge/FML@8f87021b0f Fix derp with custom properties. They work now!
2013-11-05 22:24:36 -05:00
Christian 83d8713bea Fix derp with custom properties. They work now! 2013-11-05 22:23:24 -05:00
Christian d316d74933 Updated FML:
MinecraftForge/FML@bc57ff9e83 Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's
2013-10-31 09:40:18 -04:00
Christian 289678252b Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's 2013-10-31 09:39:34 -04:00
Christian ebfaf83bd9 Updated FML:
MinecraftForge/FML@de8ab934d8 Fix up duplicate entries
2013-10-30 22:46:40 -04:00
Christian cfeebf7810 Fix up duplicate entries 2013-10-30 22:46:19 -04:00
Christian a103fbc0e6 Updated FML:
MinecraftForge/FML@81fe1c9682 Add in an API marker for API type packages. This does several things: 1. Packages marked as API will generate a new "modid" (the provides) that can be depended on. 2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker) will get an implicit dependency on the API package. 3. The API package itself will get a soft dependency on the "owner" package.
2013-10-30 22:30:02 -04:00
Christian ee8630bc55 Add in an API marker for API type packages.
This does several things:
1. Packages marked as API will generate a new "modid" (the provides) that can be depended on.
2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker)
will get an implicit dependency on the API package.
3. The API package itself will get a soft dependency on the "owner" package.

@Optional elements can refer to the API packages instead of a concrete mod as well.
2013-10-30 22:20:28 -04:00
Lex Manos a4fa417114 Add new recipe sorter that is called after all mods are initalized. This is disabled by default in 1.6 to not break current worlds as it may change machine's recipy outputs. Will enable by default in 1.7. Players may enable it in the forge config. 2013-10-30 14:08:03 -07:00
LexManos a47cca7e42 Merge pull request #841 from XCompWiz/biomecheck
Adds a Check to prevent Biome Replacement
2013-10-27 22:14:54 -07:00
XCompWiz 80ac3017bd Adds a Check to prevent Biome Replacement
Splits the BiomeGenBase constructor to create one which takes a flag
that indicates whether to insert the biome object into the biomeList
array.  The standard constructor calls the new one with the default of
true.  This allows biome wrapper-objects to exist.
2013-10-28 07:11:17 +02:00
Lex Manos ec517d5f28 Format strings properly in MC's internal logger. Fixes resource pack case warnings. 2013-10-27 11:00:10 -07:00
Christian 899b28bffe Updated FML:
MinecraftForge/FML@dac7f590ea Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due to NPE.
MinecraftForge/FML@f0dc530b28 Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class
MinecraftForge/FML@243a21a353 Wrapping coremods as tweakers. Part 1.
MinecraftForge/FML@58a299aabc Attempt to inject coremods as tweakers, so both can share a dependency ordering
2013-10-27 13:53:05 -04:00
Christian 9efeaa8caa Attempt to inject coremods as tweakers, so both can share a dependency ordering 2013-10-27 13:28:50 -04:00
Christian f7a6bb7eb7 Wrapping coremods as tweakers. Part 1. 2013-10-20 11:53:07 +02:00
Christian cfb78d482a Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class 2013-10-20 11:45:00 +02:00
Christian 09c7df2bb3 Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due
to NPE.
2013-10-20 11:41:28 +02:00
Lex Manos 217d5562ff Fix null pointer exception in BiomeDictionary causing the ChunkManager's config to not load/save. 2013-10-19 18:31:32 -07:00
Lex Manos b0f8d495bb Updated FML: MinecraftForge/FML@bf54d4d667 Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:30:19 -07:00
Lex Manos 0b0b94978c Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:24:24 -07:00
Lex Manos 295542c357 Add wildcard versions of OreDict replacements, Closes #827 2013-10-18 18:58:31 -07:00
Christian 4db6c4cfc4 Updated FML:
MinecraftForge/FML@da4337efbf Fix up handling the new method signature data for NetworkCheckHandlers
2013-10-14 21:30:43 -04:00
Christian fa97bebf34 Fix up handling the new method signature data for NetworkCheckHandlers 2013-10-14 21:28:15 -04:00
Christian efc6b9abbb Merge branch 'master' of github.com:OniBait/MinecraftForge into breakevent 2013-10-13 23:02:20 -04:00
Christian 430d94de95 Updated FML:
MinecraftForge/FML@f92962bbbb Use null to empty, so missing values work. *sigh*
2013-10-13 22:44:15 -04:00
Christian c56f2e3b37 Use null to empty, so missing values work. *sigh* 2013-10-13 22:36:47 -04:00
Christian e0cb56381f And remember to make the event class static *sigh* 2013-10-13 12:23:08 -04:00
Christian f9c283a2e5 Add in an event for zombie summoning. Allows for mods to control summoning behaviour, as well as custom summoned mob. 2013-10-13 12:21:57 -04:00
Christian 6c45b43eee And set the RIGHT variable *sigh* 2013-10-13 11:55:15 -04:00
Christian de69b7dfd0 And allow for tweaking baby chance as well. 2013-10-13 11:53:48 -04:00
Christian 5f5b509c7a Allow configuration of the zombie additional summoning mechanic. The vanilla mechanic is a little borked at times. 2013-10-13 11:39:23 -04:00
Christian 29606e2c39 Updated FML:
MinecraftForge/FML@58577775d2 Very minor style fixes
MinecraftForge/FML@96be82343c Merge pull request #280 from mc10/patch-1
MinecraftForge/FML@2714da1022 Primitive capability for tweakers to order. Add a "TweakOrder" integer property to your manifest, or accept the default of zero.
2013-10-13 11:33:41 -04:00
Lex Manos 412952be5b Prevent session from being printed to the console, also make sure the username is not empty. Causes a lot of bugs further down the line. 2013-10-12 23:10:23 -07:00
Christian 5e03f2e85b Primitive capability for tweakers to order. Add a "TweakOrder" integer
property to your manifest, or accept the default of zero.
2013-10-12 10:28:11 -04:00
OniBait 79e0165362 Cleaned up patches to BlockOre and BlockRedstoneOre
Fixed trailing whitespace (it bugs me too)
2013-10-10 17:15:38 -05:00
OniBait e47a6402e1 Fixed formatting 2013-10-10 12:45:56 -05:00
LexManos efead4d200 Merge pull request #280 from mc10/patch-1
Very minor style fixes
2013-10-09 20:56:05 -07:00
Kevin Ji cfcdb92c8e Very minor style fixes
Replacing tabs with spaces consistently, making brace styles consistent, etc.
2013-10-09 19:53:50 -07:00
Christian 465525119c Updated FML:
MinecraftForge/FML@fc3e7647d2 Support, and fix up, interface lists for Optional
2013-10-09 21:00:07 -04:00
Christian daf454af62 Support, and fix up, interface lists for Optional 2013-10-09 13:58:14 -04:00
Lex Manos 43a16d5389 Added some missing air checks to world gen features. 2013-10-09 02:47:05 -07:00
OniBait 303288e8b1 Merge branch 'upstream/master' 2013-10-08 19:04:54 -05:00
OniBait eb5940664c Add block break events based on @bloodmc's initial 1.5.2 Pull Request 2013-10-08 19:00:02 -05:00
Lex Manos 1a6743331b Fix repeated argument in CleintCommands. 2013-10-07 14:16:04 -07:00
Lex Manos c8df5b832e MinecraftForge/FML@a381874bb9 Delay sound system backend initalization to speed up startup and prevent race condition on some computers. 2013-10-06 11:23:36 -07:00
Lex Manos 1754a5820a Delay sound system backend initalization to speed up startup and prevent race condition on some computers. 2013-10-06 11:13:07 -07:00
LexManos fc1089713f Merge pull request #792 from Eurymachus/opencontainer
Added PlayerOpenContainerEvent and added ForgeHooks.canInteractWith
2013-10-06 09:12:25 -07:00
Christian 0866d88126 Updated FML:
MinecraftForge/FML@bc64ceabef Optional shouldn't be constructable itself. It's purely a wrapper thing.
MinecraftForge/FML@55525f6d2e ModLoader is officially deprecated. It will all cease to be with 1.7.
2013-10-06 11:17:58 -04:00
Christian b542f13c5c ModLoader is officially deprecated. It will all cease to be with 1.7. 2013-10-06 11:06:31 -04:00
Christian 955d532264 Optional shouldn't be constructable itself. It's purely a wrapper thing. 2013-10-06 10:56:47 -04:00
Eurymachus 8d0b58ee6f Added PlayerOpenContainerEvent and added ForgeHooks.canInteractWith
- Used to override the canInteractWith during player tick
- setResult to ALLOW/DENY as required
- Defaults to Vanilla behaviour in any other instance.

Required for LittleBlocks Mod and to Assist Gullivers Mod
2013-10-06 03:58:13 +01:00
Christian fa41058ba1 Updated FML:
MinecraftForge/FML@63ba3aa009 Add in support for Optional interfaces and methods. Be gone coremods!
2013-10-04 17:21:14 -04:00
Christian 19173a7b97 Add in support for Optional interfaces and methods. Be gone coremods! 2013-10-04 17:20:05 -04:00
OniBait 296a484f4b Add block break events based on @bloodmc's initial 1.5.2 Pull Request 2013-10-04 00:15:19 -05:00
Lex Manos 7d5d191fc2 Fix missing patch which caused per-world storage to not be saved. 2013-10-01 09:59:13 -07:00
LexManos d55ddfcebc Merge pull request #808 from rhilenova/player_list
Added pre/post to player list rendering in GuiIngameForge.
2013-09-30 22:52:59 -07:00
rhilenova 7147cdb1c1 Merging in master. 2013-09-30 20:30:08 -04:00
Lex Manos cba1de122a Bump version number for todays changes. 2013-09-30 17:17:35 -07:00
Lex Manos 68669e2679 Make isItemStackDamageable() pass the stack to getMaxDamage() to use the Forge version of getMaxDamage().
Fixes display issues with mods using getMaxDamage(ItemStack) instead of the vanilla one. Closes #805
2013-09-30 17:15:18 -07:00
LexManos 4374f67759 Merge pull request #803 from benblank/block-power
Allow blocks to choose how they handle indirect power
2013-09-30 17:12:34 -07:00
rhilenova 5e998776cb Moved PLAYER_LIST event inside display check. 2013-09-30 20:06:04 -04:00
LexManos b09e72a2fc Merge pull request #793 from jrtc27/install-args
Pass arguments to install.sh and install.cmd to install.py
2013-09-30 16:59:51 -07:00
Lex Manos 2e3d1a3c09 Add cancelable EntityStructByLightningEvent, Closes #789 2013-09-30 16:56:34 -07:00
Lex Manos 96b4fd1da1 Stack sensitive version of Item.getItemStackLimit. Closes #771 2013-09-30 16:21:40 -07:00
LexManos d3c80c326a Merge pull request #772 from Lomeli12/master
Villager Trading GUI will now not open if Player is sneaking. Allowing for bypassing of the GUI.
2013-09-30 16:01:51 -07:00
Lex Manos b74d977225 Added all the vanilla records to the ore dictionary. Closes #731 2013-09-30 14:58:03 -07:00
Lex Manos 73202259fa Direct canApplyAtEnchantingTable through canApply Closes #740 2013-09-30 14:51:39 -07:00
Lex Manos 01cf29a202 Add pre and post event to rendering Chat, allowing for placement of the chat box. Closes #733 2013-09-30 14:32:12 -07:00
Lex Manos 71ececdbb4 Set densityDir in BlockFluidBase's constructor, closes #737 2013-09-30 14:02:23 -07:00
Lex Manos 81efd38fee Fix placement of snow cover over metadata 6. Closes #724 2013-09-30 13:52:17 -07:00
Lex Manos b3c715c312 Add the ability to register chat commands that only execute on the client. Works with autocomplete.
Client commands are gray when shown in the autocomplete list (when you press tab)
Closes #640
2013-09-30 13:08:57 -07:00
Ben Blank 8c54873afd move shouldCheckWeakPower to Forge section 2013-09-30 11:54:03 -07:00
Lex Manos 50b9abc13f Vanilla hopper should obey the IInventory contract, TileEntityHopper now takes into account IInventory.getInventoryStackLimit() when inserting items Closes #597. 2013-09-30 11:37:37 -07:00
Lex Manos ca351b527d Update workspace to point at launchwrapper 1.8 2013-09-30 11:36:28 -07:00
LexManos e4714bc4c5 Merge pull request #796 from HoBoS-TaCo/master
Added ItemTooltipEvent
2013-09-29 19:55:14 -07:00
HoBoS_TaCo 06e2f914c1 Added ItemTooltipEvent
This event is fired at the end of ItemStack.getTooltip(EntityPlayer, boolean), which in turn is called from it's respective GUIContainer. It allows an itemstack's tooltip to be changed depending on the player, itemstack or whether the advanced information on item tooltips is being shown, toggled by F3+H.
2013-09-30 12:41:52 +10:00
Christian 3805eddd34 Updated FML:
MinecraftForge/FML@5265e34a35 Fix null killing the server
2013-09-29 16:15:03 -04:00
Christian ea25a3ffd0 Fix null killing the server 2013-09-29 15:51:38 -04:00
rhilenova e842fd95b4 Added pre/post to player list rendering in GuiIngameForge. 2013-09-29 11:43:29 -04:00
Lex Manos 5f752fc967 MinecraftForge/FML@35ab9f52b0 Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:48:50 -07:00
Lex Manos 7e53a294fe Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:47:32 -07:00
Ben Blank f40bdeca97 allow blocks to choose how they handle indirect power 2013-09-28 17:56:19 -07:00
Christian 24017d6810 Updated FML:
MinecraftForge/FML@e356f4d713 Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader
MinecraftForge/FML@9b55f1f48f Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display"
2013-09-27 10:49:28 -04:00
Christian 05c66728e7 Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display" 2013-09-27 10:45:20 -04:00
Christian dc72bfe56a Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader 2013-09-27 10:01:39 -04:00
Christian 5a24b2d73c Updated FML:
MinecraftForge/FML@bfc25bc5da Add to both the classloader and the parent
2013-09-26 13:01:44 -04:00
Christian ef70a1d29e Add to both the classloader and the parent 2013-09-26 13:01:00 -04:00
Christian 4c38edf532 Updated FML:
MinecraftForge/FML@9f0f9e7288 Fix deobf tweaker
2013-09-26 10:11:46 -04:00
Christian 9bcf633e8c Fix deobf tweaker 2013-09-26 10:11:29 -04:00
Christian af24dc6096 Updated FML:
MinecraftForge/FML@ce6404fd5b TYPOS!!!
2013-09-26 09:34:05 -04:00
Christian 036cda37b0 TYPOS!!! 2013-09-26 09:33:48 -04:00
Christian 865e4e2b45 Updated FML:
MinecraftForge/FML@8f18a3de9a Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers expecting an obf environment.
2013-09-26 09:24:04 -04:00
Christian cbf22b0ab5 Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers
expecting an obf environment.
2013-09-26 09:23:25 -04:00
Christian 41617a0227 Updated FML:
MinecraftForge/FML@8e26c99de3 Add debugging for deobfuscation
MinecraftForge/FML@1d902df581 Use the negative cache in latest legacylauncher.
MinecraftForge/FML@9815d8c379 Update for launchwrapper 1.8
2013-09-26 07:59:15 -04:00
Lex Manos ab2d8fa01b Add wrapper exception to the new Structure ID system to point to the correct Structure. 2013-09-25 16:58:36 -07:00
Christian 952d602f49 Update for launchwrapper 1.8 2013-09-25 16:40:59 -04:00
Christian 61ae96f03a Use the negative cache in latest legacylauncher. 2013-09-25 11:46:11 -04:00
Christian 96d9c3b8bc Add debugging for deobfuscation
Add negative caching for field and method maps. Should shortcut some work

Fix handling the case where a class doesn't exist, but still needs deobf

Ask the patch manager for the bytes for the class, not the classLoader

Fix up some more places where we should look for a patched class

Fix problem with empty source classes and runtime deobfuscation
2013-09-25 07:37:25 -04:00
Lex Manos 80dfdbf749 Updated FML:
MinecraftForge/FML@fc8c3bef03 Update to new installer that uses xz compression and better support for non-standard jvms
2013-09-24 23:22:27 -07:00
Lex Manos c1623cb8e3 Update to new installer that uses xz compression and better support for non-standard jvms 2013-09-24 23:21:17 -07:00
Lex Manos dbd19b0cad Fixed typo in bounding box based ladder checks that caused potential infinite loops with entities in certian positions. Thanks Overmind for reporting it. 2013-09-24 22:46:18 -07:00
Lex Manos 70671858c2 Remove some side onlys on BiomeEvents that don't need them. 2013-09-24 21:43:56 -07:00
Lex Manos 0c064485b1 Update dev workspace for 1.6.4 .. 2013-09-24 21:43:25 -07:00
Christian 0d090070a9 Updated FML:
MinecraftForge/FML@a4de22c1ad And use the parent that's actually going to be valid. *sigh*
2013-09-24 08:42:37 -04:00
Christian 8f17d1c694 And use the parent that's actually going to be valid. *sigh* 2013-09-24 08:42:13 -04:00
Christian 9029d380a3 Updated FML:
MinecraftForge/FML@70cffe6982 Herpaderp. Make addURL accessible. *sigh*
2013-09-24 07:34:44 -04:00
Christian 8929267b20 Herpaderp. Make addURL accessible. *sigh* 2013-09-24 07:33:11 -04:00
CovertJaguar 71c14b815e Fluid Rarity should have a default
Oops.
2013-09-23 22:54:46 -07:00
Christian 64d7c4eaa5 Updated FML:
MinecraftForge/FML@4a94c2c71b Fix NPE when loading second single-player world
MinecraftForge/FML@0e80fcb8f7 Merge pull request #284 from smcv/uninit
MinecraftForge/FML@39620f1e41 Fix injection of tweaker into system
2013-09-23 13:34:22 -04:00
Christian 48c92084da Fix injection of tweaker into system 2013-09-23 13:33:16 -04:00
cpw cc3f0b0eea Merge pull request #284 from smcv/uninit
Fix NPE when loading second single-player world
2013-09-22 18:24:56 -07:00
Simon McVittie 5bf7d3cb4b Fix NPE when loading second single-player world
After leaving a single-player world, getServer() can return null, resulting
in the stack trace below, "Fatal errors were detected during the
transition from SERVER_STOPPING to SERVER_ABOUT_TO_START",
"The ForgeModLoader state engine has become corrupted" and the client
getting stuck forever.

Exception in thread "Server thread" java.lang.NullPointerException
at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620)
at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468)
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471)
at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)
2013-09-22 16:56:24 +01:00
Christian 62079e3549 Updated FML:
MinecraftForge/FML@79c39f8b7c Fix classpath for launchwrapper 1.7
2013-09-21 16:16:10 -04:00
Christian 85811a013d Fix classpath for launchwrapper 1.7 2013-09-21 16:15:05 -04:00
cpw a632ec6ce6 Merge pull request #794 from alexbegt/master
Correcting SoundManager Transformer
2013-09-21 12:39:00 -07:00
Alexander Behrhof be8bccc72e Correcting SoundManager Transformer 2013-09-21 14:30:22 -04:00
Christian a7fde237bb Clean patch fuzz 2013-09-20 21:17:38 -04:00
James Clarke f68bdb0493 Pass arguments to install.sh and install.cmd to install.py 2013-09-21 01:43:22 +01:00
Christian e03a4db2b9 Updated FML:
MinecraftForge/FML@f6190e8752 Update workspaces for 1.6.4
2013-09-20 17:23:39 -04:00
Christian 0c365eb893 Update workspaces for 1.6.4 2013-09-20 17:23:18 -04:00
Christian 54594ee1de Updated FML:
MinecraftForge/FML@25981706ef Update for MC 1.6.4
MinecraftForge/FML@0950b9fc84 Fix up a deep crash in the early server init hanging the client
2013-09-20 17:17:53 -04:00
Christian da0972980b Fix up a deep crash in the early server init hanging the client 2013-09-20 17:12:01 -04:00
Christian 74b7cba492 Update for MC 1.6.4 2013-09-20 16:25:12 -04:00
Lex Manos 98aecd7f6b Move have handler creation up, to prevent NPE. 2013-09-19 16:47:46 -07:00
Lex Manos f58df75bea Remove duplicate access transformer 2013-09-19 16:46:30 -07:00
Lex Manos 43a6d0da62 Updated FML:
MinecraftForge/FML@e7dd728f95 Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer.
MinecraftForge/FML@82d896a35e Make final transformers actually work on methods as well.
2013-09-19 13:05:15 -07:00
Lex Manos 1928c177ac Make final transformers actually work on methods as well. 2013-09-19 12:59:12 -07:00
Christian d2712dafdb Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282 2013-09-19 08:23:56 -04:00
Lex Manos a525cab5ff Move the Structure data save files to per-world data folders. Vanilla saves them to the global folder which will potentially cause conflicts if two worlds generate 'Villages'. Which in the modded world is highly likely. Refer back to the long standing vanilla issue where nether 'villages' would override the overworlds villages, it's the same situation. 2013-09-18 23:37:23 -07:00
Lex Manos d39c279203 Make MapGenStructureIO name registration functions public, Any mod that has anything extending StructureStart or StructureComponent must register there classes and create a default (no parameter) constructor. 2013-09-18 20:52:52 -07:00
Lex Manos 0a7095afa9 Unfinalized Item.getIconIndex(ItemStack) 2013-09-18 19:33:28 -07:00
Lex Manos 36672fef83 Actually push the submodule update -.- 2013-09-18 16:18:19 -07:00
Lex Manos 57ea20d083 Bump version for new MC version. 2013-09-18 16:10:55 -07:00
Lex Manos 6c5ef9347c Updated FML:
MinecraftForge/FML@da70cdd35a Update tweaker for new Launcher API
MinecraftForge/FML@352117fd78 Update for new installer and thank you.
MinecraftForge/FML@40a34af431 Merge branch 'master' into newtweak
MinecraftForge/FML@e77d2547ad Update for pre-ninja 1.6.3 update
MinecraftForge/FML@34493b0d99 Update for real 1.6.3 update
MinecraftForge/FML@95afc95b24 Update mcp mod info
MinecraftForge/FML@ff75416a32 Update mc_versions data and commands patch and eclipse workspace
MinecraftForge/FML@8f2e675581 Update the src distro's eclipse workspace.
2013-09-18 16:10:38 -07:00
Lex Manos fcf2af484d Update the src distro's eclipse workspace. 2013-09-18 15:21:56 -07:00
Christian b721a51bc4 Update mc_versions data and commands patch and eclipse workspace 2013-09-18 18:01:04 -04:00
Christian 3768ca1713 Update mcp mod info 2013-09-18 17:02:41 -04:00
Christian 2ea5f04228 Update for real 1.6.3 update 2013-09-18 16:59:28 -04:00
Christian 12c556bc36 Update for pre-ninja 1.6.3 update 2013-09-18 16:33:11 -04:00
Christian 88f1dce658 Merge branch 'master' into newtweak 2013-09-18 14:49:53 -04:00
Christian 56bf94b441 Update for new installer and thank you. 2013-09-17 21:56:25 -04:00
Christian 60da9094ef Updated FML:
MinecraftForge/FML@81328b6684 Add in support for using a mirror list and provide checksums for packed download of libs
2013-09-15 23:00:07 -04:00
Christian 466902654e Add in support for using a mirror list and provide checksums for packed download of libs 2013-09-15 22:58:39 -04:00
Christian f9087cb291 Revert "Added a RenderType that allows Map-style rendering w/o inheriting from"
This reverts commit eb4688bf5e.

Conflicts:
	patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
2013-09-14 18:43:18 -04:00
Christian 635f13f825 Fix broken PR from vilml. TEST! 2013-09-14 18:13:58 -04:00
cpw 55830256d3 Merge pull request #784 from viliml/patch-1
Prevent NPE in fluid lookup for block
2013-09-14 11:28:06 -07:00
viliml ac58bb2f5a Prevent NPE in fluid lookup for block 2013-09-14 20:16:46 +02:00
cpw a066018c9f Merge pull request #782 from CovertJaguar/patch-1
Allow Fluids to have Rarities
2013-09-14 05:17:34 -07:00
Christian 0bc9138aa4 Fix the divider 2013-09-13 22:57:29 -05:00
CovertJaguar b626c888b0 Allow Fluids to have Rarities
Used for tool tips.
2013-09-13 20:17:12 -07:00
Christian 492cbc3628 Move stuff around a bit- also tie range and enabled to options. 2013-09-13 22:11:59 -05:00
Christian 32353f0db1 Merge branch 'master' of github.com:Adubbz/MinecraftForge into Adubbz-master 2013-09-13 21:04:54 -05:00
Adubbz 7aa43a4217 Sky colours now smoothly transition
Made transitions even smoother

Sky colours now smoothly transition
2013-09-14 12:00:06 +10:00
Christian 09580515a0 Tweak patch comment 2013-09-13 20:45:30 -05:00
Christian 65165cd41c Merge branch 'mapStyle' of github.com:Matchlighter/MinecraftForge into Matchlighter-mapStyle 2013-09-13 20:11:13 -05:00
Christian 391668114d Merge branch 'master' of github.com:micdoodle8/MinecraftForge into micdoodle8-master 2013-09-13 20:06:50 -05:00
iChun ae80a7b322 Allows proper raytracing from actual player eye position rather than hardcoded eye heights. 2013-09-13 19:56:28 -05:00
Christian 9093263d8c Merge branch 'fovhook' of github.com:MachineMuse/MinecraftForge into MachineMuse-fovhook 2013-09-13 19:40:19 -05:00
Christian e008ae3ef1 Updated FML:
MinecraftForge/FML@b5af446d71 Fix sidedness derp in LanguageRegistry.
2013-09-13 19:05:28 -05:00
Christian 4fc4accb6e Fix sidedness derp in LanguageRegistry. 2013-09-13 19:04:25 -05:00
Lomeli12 c0164f29cd Villager Trading GUI will not open if Player is sneaking. 2013-09-10 14:08:29 -07:00
micdoodle8 9ddb57297f Check if block is air instead of just ID zero when growing from stem block. 2013-09-09 17:53:19 -04:00
Matchlighter eb4688bf5e Added a RenderType that allows Map-style rendering w/o inheriting from
ItemMap.
2013-09-07 22:50:18 -06:00
Christian 519da32391 The partial tick should be available for all render player events. Weird it wasn't. 2013-09-07 16:25:30 -04:00
Christian f9728e8f3f Redo harvest event. This time with simpler logic, that should be less liable to weird "missing" stuff. 2013-09-07 00:10:08 -04:00
Christian 25bfc1407b Reverting HarvestEvent, for new implementation 2013-09-06 23:39:48 -04:00
Lex Manos 303bd03533 Fix bug where guis were not closed properly, resulting in signs not having there text set. 2013-09-06 15:27:02 -07:00
Christian 6b54b52ec4 Change trigger calculation so entities get some time to age before refiring the event. 2013-09-06 16:46:44 -04:00
Lex Manos 89becaca02 Create helper apply_patches script and add paramter to change patch output folder. 2013-09-06 13:32:26 -07:00
Christian d9ca67e162 Change from Cancelable to using a Result. This means you can force despawn mobs you
don't want around anymore. Also, deferred check to once every 20 ticks. May tune it
down further or make it a config if this event is a lag issue.
2013-09-06 16:05:29 -04:00
Daniel García ff655de27e Create es_ES.lang 2013-09-06 13:28:48 -04:00
MachineMuse ee0cb12810 Added fov hook
Small formatting changes (opening braces on new line)
2013-09-06 13:25:47 -04:00
Christian 6da6e9da07 Add a cancellable despawn event- allows mods to decide to prevent the despawning
of certain otherwise normally despawnable mobs.
2013-09-06 13:19:51 -04:00
MachineMuse ad41dfaeaf Small formatting changes (opening braces on new line) 2013-09-05 18:46:05 -06:00
MachineMuse 7a0a7bf8e0 fixed merge 2013-09-05 18:43:27 -06:00
MachineMuse 65551ce233 Added fov hook 2013-09-05 18:39:27 -06:00
Christian c63efa917d Add some javadoc to the HarvestBlock event. 2013-09-05 16:24:50 -04:00
Christian 7544055fa4 Clean up some formatting. 2013-09-05 13:16:01 -04:00
Christian cb5b5cde1f Use the dropchance from the event. 2013-09-05 13:01:25 -04:00
Christian a58a7fd365 Merge branch 'sometweaks' 2013-09-05 12:22:31 -04:00
Christian 99c6662f9d Add in a block reverse lookup for fluids. Closes #749 2013-09-05 12:08:16 -04:00
Christian ca0e32cfd2 Add a harvestblock event, to allow mods to intercept and change the drops for blocks. Don't abuse this, or we'll have to take safety measures.
Fires for both silktouch and non-silktouch harvesting, and provides the player. Note, you may need to
change your break overrides to pass on the player for best results.
2013-09-05 11:57:27 -04:00
Christian c84d99aa22 Defer firing CreateDecorator until it's likely mods have had a chance to register their listener. Should close #759 2013-09-05 10:08:02 -04:00
Christian 0443ef5a9e MachineMuse, remember, there's TWO model formats supported! 2013-09-05 09:14:10 -04:00
Christian e962c2a94d Merge branch 'master' of github.com:jk-5/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-09-05 08:39:15 -04:00
Christian 8c2e171a16 Merge branch 'master' of github.com:mhahn1976/MinecraftForge into sometweaks 2013-09-05 08:26:11 -04:00
Christian 4fb8eb96d0 Merge branch 'french' of github.com:robin4002/MinecraftForge into sometweaks 2013-09-05 08:23:29 -04:00
Christian 7549eb90a7 Add a bit of javadoc 2013-09-05 08:22:28 -04:00
Christian df132a0296 Merge branch 'displayname' of github.com:MachineMuse/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
2013-09-05 08:20:49 -04:00
Christian e499a6d375 Merge branch 'objTessellation' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:58:56 -04:00
Christian fe5f5e690e Fix patch for new MCP naming. 2013-09-05 07:57:21 -04:00
Christian 21cd975ae3 Merge branch 'mouseevent2' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:47:52 -04:00
Christian 32073a5bc1 Reduce patch size significantly 2013-09-05 07:45:29 -04:00
iChun 6cf8408752 Fix player push out of blocks clientside being hardcoded and not based on entity size.
Added player eyeHeight field to allow changeable eye heights of players rather than being hardcoded per player class as well as add a getDefaultEyeHeight function.
2013-09-05 14:57:34 +08:00
MachineMuse 7a77b61ddd fixed logic error 2013-09-04 15:27:45 -06:00
MachineMuse ad09526bee inserted hook into Minecraft.java 2013-09-04 15:05:29 -06:00
MachineMuse e3e3ea54f9 Added mouse event 2013-09-04 15:01:37 -06:00
MachineMuse cb9c26d49c Memoization of display name result 2013-09-04 14:22:22 -06:00
Christian cf88896ad7 Update version to 9.10.1 for mcp naming changes. 2013-09-03 18:09:07 -04:00
Christian 0d44234239 Update forge for MCP naming updates
Updated FML:
MinecraftForge/FML@d0c6e92900 Update MCP data
2013-09-03 18:04:12 -04:00
Christian 9387bae26b Update MCP data 2013-09-03 17:56:09 -04:00
MachineMuse 96c045137d Merge remote-tracking branch 'forge/master' into objTessellation 2013-09-03 15:45:45 -06:00
MachineMuse 0e3037e85d Added display name hook 2013-09-03 14:55:11 -06:00
Christian 5c334d7627 Fix possible NPE in searching code. 2013-09-02 15:44:27 -04:00
Christian 7246914605 Updated FML:
MinecraftForge/FML@2a9c485edc Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server.
2013-09-02 12:24:57 -04:00
Christian b41a7e1dab Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server. 2013-09-02 12:24:17 -04:00
Christian d9b72a2282 Updated FML:
MinecraftForge/FML@a13598b17e Use java 1.6 compatible method of closing the zip file. Stops stupid compile error.
2013-09-02 00:13:23 -04:00
Christian b9ac2ac13c Use java 1.6 compatible method of closing the zip file. Stops stupid compile error. 2013-09-02 00:12:36 -04:00
Christian 4eb05ed571 Small fix to container registry. emptyContainer is not null, it's "NULL_EMPTYCONTAINER" now and won't match any valid container. 2013-08-28 22:16:59 -04:00
Christian 5a8def7d00 Tweak the release to add in assets to the distributable. *sigh* 2013-08-28 07:59:45 -04:00
robin 90be31ddc8 create french localization 2013-08-28 13:14:30 +02:00
Christian dddb9b3189 Add some starting work for a forge tps command. Also update coremod for new FML behaviour 2013-08-27 23:07:30 -04:00
Christian 0c06d3b47a Updated FML:
MinecraftForge/FML@1c9a853868 Allow coremods to properly inject asset readers.
MinecraftForge/FML@40b54013b4 Allow server side lang file injection, hopefully
2013-08-27 23:04:48 -04:00
Christian 4f9b778d14 Allow server side lang file injection, hopefully 2013-08-27 22:45:10 -04:00
Christian 5925fa7c79 Allow coremods to properly inject asset readers. 2013-08-27 12:31:37 -04:00
Michael Hahn cc96840aa8 capacity was not respected
Updated to properly calculate the amount of free space in the tank
before checking that against the amount of the resource.
2013-08-26 12:21:31 -05:00
jk-5 f78eba09fd Added GuiOpenEvent
You can use this for a clean way to override guis, without needing an
TickHandler to check if the gui you want to override is open and show
your own gui

Proper close check
2013-08-24 09:32:34 +02:00
Christian ded1a92dfd Update tweaker for new Launcher API 2013-08-23 10:42:26 -04:00
Christian b2c1eae652 Updated FML:
MinecraftForge/FML@b993cf4a98 More exception handling for less derpiness.
2013-08-20 21:01:02 -04:00
Christian 3b4f1983ce More exception handling for less derpiness. 2013-08-20 20:46:18 -04:00
Christian 8fed427251 In the time honoured tradition of trying to fix vanilla, we today attempt to patch the pathfinding AI so that it doesn't lag when
there's a lot of entities. Basically, if the zombie can't reach the villager, backoff subsequent pathfinding attempts. Hopefully
should really help with lag caused by zombie swarms.
2013-08-20 11:55:57 -04:00
Christian b2d309b17e Allow multipass RenderItem rendering for terrain icons too. Should fix sengir's saplings. 2013-08-19 16:32:47 -04:00
Christian 8d6f893083 Updated FML:
MinecraftForge/FML@913f6f6d36 Try and use the relaunch log, which should be classloaded..
MinecraftForge/FML@ac065ff5f7 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent and not dependent on mod ordering, or mod sideeffects.
2013-08-19 15:28:50 -04:00
Christian 94462565a5 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent
and not dependent on mod ordering, or mod sideeffects.
2013-08-19 14:56:01 -04:00
Christian 6818c0f4da Try and use the relaunch log, which should be classloaded.. 2013-08-19 14:55:37 -04:00
LexManos faba7e2a07 Skipp toss event for null entity items. Closes #732 2013-08-19 10:45:57 -07:00
LexManos baf1e771e9 Cache world on all render passes in case some mod disables the first pass. 2013-08-19 10:45:29 -07:00
LexManos 461a30812b Fix bug with custom Fluids. You can now drown in them! 2013-08-18 23:16:36 -07:00
Christian 4b64c15ae8 Updated FML:
MinecraftForge/FML@9468e41bbf Fix up scala refs, for better results
2013-08-18 19:02:20 -04:00
Christian 4eb97daac3 Fix up scala refs, for better results 2013-08-18 18:58:36 -04:00
cpw 3625a409a5 Merge pull request #730 from Soaryn/patch-1
Adds Temperature to Lava
2013-08-17 11:17:34 -07:00
Christian 8533f974e8 Updated FML:
MinecraftForge/FML@ffdd056a18 Check keys, not values *sigh*
2013-08-17 13:28:06 -04:00
Christian ed258920a0 Check keys, not values *sigh* 2013-08-17 13:27:43 -04:00
Christian 667db45b1d Updated FML:
MinecraftForge/FML@f157e7a6ec And more coremod logging
2013-08-17 13:15:18 -04:00
Christian 877dc77b75 And more coremod logging 2013-08-17 13:14:55 -04:00
Christian bafbac3d51 Updated FML:
MinecraftForge/FML@4a9d0f9bd5 Add in some log information
2013-08-17 13:10:43 -04:00
Christian dcba47209f Add in some log information 2013-08-17 13:10:28 -04:00
Christian 92c095412d Updated FML:
MinecraftForge/FML@0398916666 And actually instantiate the collection *sigh*
2013-08-17 12:57:37 -04:00
Christian 904e2df1f9 And actually instantiate the collection *sigh* 2013-08-17 12:57:15 -04:00
Christian ea31a51285 Updated FML:
MinecraftForge/FML@dec9a3924d Add in "FMLCorePluginContainsMod" in the manifest. If this value is present, FML will attempt to parse your mod jar file as a normal mod file as well, instantiating mod containers there.
2013-08-17 12:49:37 -04:00
Christian 643e3d441a Add in "FMLCorePluginContainsMod" in the manifest. If this value is
present, FML will attempt to parse your mod jar file as a normal mod
file as well, instantiating mod containers there.
2013-08-17 12:48:38 -04:00
Christian 8f66346aeb Updated FML:
MinecraftForge/FML@2470120680 Clean up a couple of resources. Also, don't parse jars just because they're in the mods dir
2013-08-17 11:44:06 -04:00
Christian 8f9b54a97a Clean up a couple of resources. Also, don't parse jars just because
they're in the mods dir
2013-08-17 11:40:15 -04:00
Christian 9741d6348f Updated FML:
MinecraftForge/FML@9a5e24e338 Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing
MinecraftForge/FML@ba90b61607 Make sure we only add args to the argument list if a tweaker hasn't already. Should fix LiteLoader compatibility issue.
2013-08-17 11:13:02 -04:00
Christian 7c7cafbae1 Make sure we only add args to the argument list if a tweaker hasn't already.
Should fix LiteLoader compatibility issue.
2013-08-16 16:28:55 -04:00
Christian 779139b3ca Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing 2013-08-16 16:18:50 -04:00
Soaryn 8c762223a4 Adds Temperature to Lava
Missing lava temperature. Feel free to change it to any value. 
1300K is the typical max for Magma so wasn't sure what was desired. Regardless, better than the same temp as water at 295K 😄
2013-08-15 19:55:15 -04:00
LexManos ffd2fbcc84 Fix NPE in enchangint books. 2013-08-13 15:25:09 -07:00
LexManos b0f4497bbe Fix inverted case, search works now. 2013-08-11 16:01:27 -07:00
LexManos 97f6138cf8 Merge pull request #606 from Shukaro/master
Add stone and cobblestone to ore dictionary
2013-08-10 23:29:01 -07:00
LexManos f65f042910 Addition: Added isAllowedOnBooks hook to Enchantments Closes #589 2013-08-10 23:23:41 -07:00
LexManos 7ad79b42bc Deprecate Block.addCreativeItems, Kill in 1.6.3+ Closes #655 2013-08-10 23:07:49 -07:00
LexManos 4f172ae9a5 Merge pull request #679 from Chicken-Bones/invchanged
Add onNeighborTileChange callback to block by generalizing func_96440_m ...
2013-08-10 22:53:43 -07:00
LexManos 5fadba7ddc Merge pull request #702 from MrMasochism/master
Added new function for control over dismount underwater
2013-08-10 22:07:02 -07:00
LexManos ffd4d4afc3 Allow creative tabs to have a search box if they want to Closes #592 2013-08-10 22:04:58 -07:00
LexManos d304f40295 Merge pull request #717 from tommy1019/patch-3
Fixed Fluid Non-Solid Block Duplication
2013-08-10 19:47:21 -07:00
LexManos ffd4b38801 Add optional feature to check entire bounding box for ladders. Closes #709 2013-08-10 19:39:06 -07:00
tommy1019 efb27ed1ea Fixed Classic Checking 2013-08-09 12:25:56 -05:00
tommy1019 aab3385c2d Fixed Double Item Drop 2013-08-09 12:23:05 -05:00
tommy1019 9e732ee935 Fixed Fluid Non-Solid Block Duplication 2013-08-08 18:38:46 -05:00
LexManos 571e441502 Only refresh vanilla tile entities when IDs change. 2013-08-07 18:24:50 -07:00
LexManos 18c8ac0b31 Updated FML:
MinecraftForge/FML@f275a24b43 Add in some reverse lookup methods for game registry data
MinecraftForge/FML@cb05c8c4aa Add missing SideOnly in BaseMod
MinecraftForge/FML@1857064afa Merge pull request #266 from grompe/patch-1
MinecraftForge/FML@182aa9c0cb Fixed install.sh not passing arguments to install.py
MinecraftForge/FML@f46a538b41 Merge pull request #268 from Bo98/sh-args-fix
MinecraftForge/FML@29ef3d5ab4 Update installer.
2013-08-06 11:49:39 -07:00
LexManos 4406d1e171 Update installer. 2013-08-06 11:42:38 -07:00
Christian 7d700916d9 Merge branch 'miscchanges' 2013-08-04 22:27:55 -04:00
LexManos b0f5f88482 Merge pull request #610 from purpleposeidon/patch-1
Add an InputStream constructor to WavefrontObject
2013-08-04 16:56:26 -07:00
LexManos c6030b9125 Merge pull request #704 from StormTiberius/master
Adds cloud height to WorldType
2013-08-04 16:54:44 -07:00
LexManos 3787e5d701 Merge pull request #268 from Bo98/sh-args-fix
Fixed install.sh not passing arguments to install.py
2013-08-04 15:32:06 -07:00
cpw 81e4ae2af9 Merge pull request #706 from heldplayer/fluidRendering
Fix small derp
2013-08-03 17:29:04 -07:00
cpw 543535e1a0 Merge pull request #705 from heldplayer/fluids
Fix render colour on bottom of fluids
2013-08-03 17:28:53 -07:00
Heldplayer 647f6fdf34 Fix small derp 2013-08-03 23:42:38 +02:00
Heldplayer 90e0eaf5f5 Fix render colour on bottom of fluids 2013-08-03 23:20:34 +02:00
Bo ea33f502fc Fixed install.sh not passing arguments to install.py 2013-08-03 17:43:57 +01:00
StormTiberius 4ea7e8d828 Add cloud height to WorldType 2013-08-03 05:45:22 +03:00
cpw 1a9a16495a Merge pull request #266 from grompe/patch-1
Add missing SideOnly in BaseMod
2013-08-01 04:21:22 -07:00
Christian cf4f1377d4 Merge branch 'master' of github.com:EnderShadow/MinecraftForge into miscchanges 2013-08-01 07:20:30 -04:00
Grom PE 971dc1eb00 Add missing SideOnly in BaseMod
NetClientHandler exists only on client side and thus method using it should be annotated with SideOnly.
2013-08-01 14:19:30 +07:00
Matthew Warren bf8f5aa306 added temperature to fluids
it could be useful for blocks that are affected by temperature
2013-07-31 22:15:42 -05:00
MrMasochism 9564575d77 Added a new function to allow control over whether an entity is dismounted when the entity it is riding goes under water 2013-08-01 08:02:19 +12:00
cpw 9776e0937a Merge pull request #700 from iChun/miscchanges
Fix RenderLivingEvent.Pre/Post not being fired by most Renders.
2013-07-31 01:35:18 -07:00
iChun 7b9971b20f Fix RenderLivingEvent.Pre/Post not being fired by most Renders. 2013-07-31 08:03:10 +08:00
cpw 952218c845 Add in some reverse lookup methods for game registry data 2013-07-29 22:05:22 +02:00
cpw 89d9fb3556 Updated FML:
MinecraftForge/FML@57befa89bb Fix keybindings being derped
MinecraftForge/FML@1d84e8063e Temporarily add a version of 'reobfuscate.py' that will resolve complex reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py' in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in the coming days.
2013-07-28 22:40:13 +02:00
cpw 7d31e4b25e Temporarily add a version of 'reobfuscate.py' that will resolve complex
reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py'
in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in
the coming days.
2013-07-28 22:38:26 +02:00
cpw e71ee7721b Fix keybindings being derped 2013-07-28 20:52:12 +02:00
cpw c3f62ed8bf Tweak setBlock in update tick - it should only send serverside updates for
source blocks. Experimental attempt to fix worldgen issues for fluid blocks
2013-07-28 19:25:51 +02:00
cpw 5c5cf3e7e7 Fix formatting error in PR 2013-07-28 19:15:00 +02:00
cpw 94045ea73e Merge pull request #695 from tommy1019/master
Fluid Rendering Fixes
2013-07-28 02:17:16 -07:00
tommy1019 e15c596e42 Fluid Rendering Fixes 2013-07-27 20:32:21 -05:00
cpw b317d10ade Add a translation map for looking up legacy liquid names to convert
to new fluid names.
2013-07-28 01:06:16 +02:00
cpw 31bd8d438d Add support for loading legacy liquid stacks as new fluid stacks.
Requires having been written with the "liquidname" code from forge 1.5.x
2013-07-28 00:53:23 +02:00
cpw 8b78f21199 Merge branch 'master' of github.com:tommy1019/MinecraftForge into miscchanges 2013-07-27 23:59:51 +02:00
cpw 8a8f5af084 Fix names for water/lava fluids. Closes #689 2013-07-27 23:37:06 +02:00
cpw f5a8974bb6 Merge branch 'master' of github.com:iChun/MinecraftForge into miscchanges 2013-07-27 22:57:44 +02:00
CovertJaguar fd5b7359e2 Add SneakClick bypass to client 2013-07-27 00:30:54 -07:00
tommy1019 077e05e0ed Fixed fluids eating each other
Fluids check for other fluids density before flowing, if their density
is higher they can flow into the other fluid, if not they can't.
2013-07-26 16:25:40 -05:00
iChun abdcd23d8b Update RendererLivingEntity.java.patch 2013-07-26 12:51:42 +08:00
iChun fb04d10886 if statement added 2013-07-26 12:49:14 +08:00
iChun 3e8711580e Add Pre and Post events firing for RendererLivingEntity 2013-07-26 12:46:52 +08:00
iChun f48dafda7e Add Pre and Post events for RenderLivingEvent 2013-07-26 12:38:17 +08:00
tommy1019 a42369e081 Fluid Render Fix
Formatting
2013-07-25 18:38:29 -05:00
LexManos 6397939c9e Merge pull request #665 from copyboy/master
Fix getArmorTexture by passing it the subtype
2013-07-24 13:18:31 -07:00
copyboy c9af365d44 Fix getArmorTexture by passing it the subtype 2013-07-24 22:12:38 +02:00
LexManos b6d543f15e Re-added deprecated liquids system. To be removed next major MC versions after issues with Fluids are fixed. (reverse-merged from commit 9b5208fa30)
This WILL be removed and should not be developed against aside for a temporary 1.6 release.
2013-07-22 15:19:35 -07:00
LexManos 8c3ebc7f87 Remove SideOnly(Client) in IBlockAccess.isAirBlock 2013-07-21 11:01:38 -07:00
LexManos ee70b21460 MinecraftForge/FML@10b16d32da Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:38:53 -07:00
LexManos f872ac0a90 Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:21:26 -07:00
LexManos acb6777ab5 General code cleanup of Fluid system. Made Fluid icons and associated functions non-sided. 2013-07-16 21:40:49 -07:00
LexManos f7ab5684e9 MinecraftForge/FML@3f21a2c1b4 Stupid spaces and windows escaping -.- 2013-07-16 14:35:22 -07:00
LexManos f4311e2fae Stupid spaces and windows escaping -.- 2013-07-16 14:34:43 -07:00
LexManos 8a8af5265e Package 'version.json' with universal jar for maunchers to use. It's the json used by the vanilla Minecraft launcher for Forge. 2013-07-16 13:55:31 -07:00
LexManos f72d672e0d MinecraftForge/FML@b2958c9066 Add quotes for paths with spaces -.- 2013-07-16 13:54:08 -07:00
LexManos a9e2a2089f Add quotes for paths with spaces -.- 2013-07-16 13:35:14 -07:00
LexManos 094c2bca2e MinecraftForge/FML@9520978b81 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:12:46 -07:00
LexManos f40e4cf3a8 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:08:26 -07:00
Chicken Bones 5d5d4cb448 Add onNeighborTileChange callback to block by generalizing func_96440_m to all blocks rather than just comparators. 2013-07-17 04:42:45 +10:00
LexManos 380c4ad2da Updated FML: MinecraftForge/FML@4981aa3421 Fix potential NPE in villager skin registry. Closes #678 2013-07-16 10:34:54 -07:00
LexManos 9de739723f Fix potential NPE in villager skin registry. 2013-07-16 10:32:29 -07:00
LexManos e57f1c230c Merge pull request #675 from Soaryn/patch-1
Fixes Vanilla Fluid Still Icon Setters
2013-07-15 22:36:56 -07:00
Soaryn 88e0ecf2cf Fixes Vanilla Fluid Still Icon Setters
Fixes null icons from being set for both the still water/lava icons, and sets the correct Icon.
2013-07-16 01:27:39 -04:00
LexManos 56ab2fd797 Updated FML: MinecraftForge/FML@c48b48ee15 Fix server launching. 2013-07-15 10:58:11 -07:00
LexManos 136e2180f7 Fix server launching. 2013-07-15 10:57:44 -07:00
Christian 81cce7b6ac Fix for new location of mcp logo. 2013-07-14 14:22:57 -04:00
Christian 745fa93f3f Updated FML:
MinecraftForge/FML@0378355c37 The server.classpath generates the runtime manifest, so it needs the non-debug asm jars.
MinecraftForge/FML@a3f48734ff Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading.
MinecraftForge/FML@9947ba8503 Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now.
2013-07-14 13:47:53 -04:00
Christian 10c6e5e353 Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now. 2013-07-14 13:40:55 -04:00
Christian d0c2a8e62b Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading. 2013-07-14 13:11:32 -04:00
Christian 8f2823709c The server.classpath generates the runtime manifest, so it needs the
non-debug asm jars.
2013-07-14 11:12:42 -04:00
LexManos c5af747da9 Monkey patch to try and make print flush properly. 2013-07-12 04:08:29 -07:00
LexManos c40499ab05 Update changelog generator to point to new jenkins. 2013-07-12 03:09:54 -07:00
LexManos 2e1aa99f54 MinecraftForge/FML@c625ef3009 Update Forge signature for new private key 2013-07-12 03:09:24 -07:00
LexManos bf6f038793 Update Forge signature for new private key 2013-07-12 03:05:20 -07:00
LexManos 70a6a316d7 Updated FML:
MinecraftForge/FML@7348929819 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala.
MinecraftForge/FML@6de36d78f5 Coremods now have a primitive dependency capability. Also, we search mods dir for special "TweakClass" manifests. These are using the vanilla tweak mechanism to inject into Minecraft. Helpful for other "platform" systems, when you don't want to have to deal with json changes!
MinecraftForge/FML@d4b30422b6 Update build and eclipse workspaces for debug asm.
2013-07-12 00:34:32 -07:00
LexManos 5d89e17ae9 Update build and eclipse workspaces for debug asm. 2013-07-12 00:22:11 -07:00
Christian caeb0afecf Coremods now have a primitive dependency capability. Also, we search mods dir for special
"TweakClass" manifests. These are using the vanilla tweak mechanism to inject into
Minecraft. Helpful for other "platform" systems, when you don't want to have to deal
with json changes!
2013-07-11 23:23:33 -04:00
LexManos 3dd0b5d496 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala. 2013-07-11 15:24:54 -07:00
LexManos e418dddbcf MinecraftForge/FML@b9f4b02cb0 Kill mcp's truncate method, for more useful logs. 2013-07-10 15:24:53 -07:00
LexManos bf127348c9 Merge pull request #661 from Adubbz/master
Made eating particles compatible with metadata
2013-07-10 15:24:07 -07:00
LexManos 09cf5feee5 Kill mcp's truncate method, for more useful logs. 2013-07-10 15:23:21 -07:00
Christian 75907e3815 Updated FML:
MinecraftForge/FML@e44e8b3112 Force a global asset scan prior to mod construction : you should be able to reference assets anywhere in your mod now.
MinecraftForge/FML@20e93a412e Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm library at dev time, since it contains full symbols and code in compiled form.
2013-07-10 17:30:45 -04:00
Christian e33a1a02bf Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm
library at dev time, since it contains full symbols and code in compiled form.
2013-07-10 15:47:13 -04:00
Adubbz c4ad7c3e2c Made eating particles compatible with metadata
Removed extra spaces

Made eating particles compatible with metadata
2013-07-10 20:39:15 +10:00
Christian 32680bb84d Force a global asset scan prior to mod construction : you should be able to
reference assets anywhere in your mod now.
2013-07-10 00:42:40 -04:00
LexManos 562e8e8021 Re-add reverted patch AGAIN cpw check your commits -.- 2013-07-09 12:56:34 -07:00
Christian c3fbd27a8d Updated FML:
MinecraftForge/FML@bab4d87ce7 Update FML for new stealth update for 1.6.2
2013-07-09 15:36:47 -04:00
Christian 28727a51a6 Update FML for new stealth update for 1.6.2 2013-07-09 15:00:28 -04:00
Christian a990c0bdc8 Remove forge ISidedInventory, deprecated since 1.5. 2013-07-09 11:38:54 -04:00
Christian 561b0fbe55 Allow optional rider interaction for entities, thanks for the suggestion Vswe.
Updated FML:
MinecraftForge/FML@7af5c21d74 @InstanceFactory was set to look for Fields instead of methods
MinecraftForge/FML@bc9d1fe657 Merge pull request #254 from CaptainShadows/patch-1
2013-07-09 11:23:49 -04:00
cpw 11bf88fceb Merge pull request #254 from CaptainShadows/patch-1
@InstanceFactory was set to look for Fields instead of methods
2013-07-09 07:19:24 -07:00
Christian 475918a1ca Updated FML:
MinecraftForge/FML@97269a5e3d Decode the file URL. Hopefully will make things work more..
MinecraftForge/FML@d4d522c597 And don't forget to remove the test code
2013-07-09 08:33:05 -04:00
Christian 1fe0dcec09 And don't forget to remove the test code 2013-07-09 08:31:40 -04:00
Christian fbfc11c9a9 Decode the file URL. Hopefully will make things work more.. 2013-07-09 08:30:47 -04:00
LexManos a85d82a859 MinecraftForge/FML@c913258ca3 Disable signature check of client for now, it's broken. 2013-07-09 05:04:50 -07:00
LexManos 95aa81bb3f Disable signature check of client for now, it's broken. 2013-07-09 05:04:11 -07:00
LexManos ae97ad2bca Updated FML:
MinecraftForge/FML@dfa3a2665d Add MC Version to installed version name.
MinecraftForge/FML@e91431fb70 Don't validate signatures on servers, they are not signed.
MinecraftForge/FML@c7ab872c85 Temporarily disable GuiModList's Mod logos.
2013-07-09 03:35:52 -07:00
LexManos 50a8b1cc68 Temporarily disable GuiModList's Mod logos. 2013-07-09 03:27:49 -07:00
LexManos a0211c4fb7 Don't validate signatures on servers, they are not signed. 2013-07-09 03:27:29 -07:00
LexManos f45499612d Add MC Version to installed version name. 2013-07-09 03:27:01 -07:00
LexManos 8eddb7f1b9 Updated FML:
MinecraftForge/FML@c997f2adbc FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that modifying the minecraft jar is still acceptable.
MinecraftForge/FML@0db4624b27 Don't initialize the server.
MinecraftForge/FML@4fa375683f Fix NPE in new debug line when patch targets don't exist.
2013-07-09 01:30:22 -07:00
LexManos 66531ad420 Fix NPE in new debug line when patch targets don't exist. 2013-07-09 01:21:50 -07:00
Christian 67caa6692d Don't initialize the server. 2013-07-08 22:31:15 -04:00
Christian 2f299820fb FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that
modifying the minecraft jar is still acceptable.
2013-07-08 22:10:06 -04:00
LexManos 29fabb12e0 Proper return for getRegisteredFluidContainerData thanks Soaryn. Ref issue #634 2013-07-08 18:54:03 -07:00
LexManos 34bcca2640 Fix accedential reverted patch. 2013-07-08 18:35:34 -07:00
Christian 38bd039a93 Make resourcelocation the class available on the server. 2013-07-08 19:40:15 -04:00
Christian 9071d7d5e2 Test server-siding ResourceLocation 2013-07-08 19:31:00 -04:00
Christian 033eedb50f Drop two domain related fixes that have been applied in vanilla.
Updated FML:
MinecraftForge/FML@c47d08c89d Tweak debug data on patched classes
MinecraftForge/FML@dbf5fe38ce We now generate an adler32 checksum for each patched file and verify at load time that they match. Mismatch won't crash, but will emit a big warning..
MinecraftForge/FML@e88a0cd13f Update for stealth update. Thanks mojang!
MinecraftForge/FML@2336002f20 The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties.
2013-07-08 14:44:51 -04:00
Christian e0b7d1599c The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties. 2013-07-08 14:34:03 -04:00
Christian bfe955dbf2 Update for stealth update. Thanks mojang! 2013-07-08 13:19:55 -04:00
Christian e64c07a109 We now generate an adler32 checksum for each patched file and verify at load time that they match.
Mismatch won't crash, but will emit a big warning..
2013-07-08 13:19:14 -04:00
Christian 94315253b1 Tweak debug data on patched classes 2013-07-08 12:28:32 -04:00
Captain Shadows b788686126 @InstanceFactory was set to look for Fields instead of methods
"fix it" to now match the javadoc :P

if it was set like that so modders wouldn't use it, it might be better to just say so in the documentation
2013-07-08 00:07:54 -04:00
LexManos 51ca5e028b Bump version to 9.10 for new MC version and removal of Fluids. 2013-07-07 14:05:48 -07:00
LexManos 9b5208fa30 Remove deprecated Liquids API, Use new Fluids system as replacement. 2013-07-07 14:05:23 -07:00
LexManos 85fd1d010d Updated FML:
MinecraftForge/FML@1d0384f8f6 Update for 1.6.2 and MCP 8.04
MinecraftForge/FML@111b0216fd Add the jsons for 1.6.2
MinecraftForge/FML@6f96d89e2b Update eclipse workspaces for 1.6.2
2013-07-07 14:03:26 -07:00
LexManos 611668931e Update eclipse workspaces for 1.6.2 2013-07-07 13:11:22 -07:00
Christian ab3220cbb3 Add the jsons for 1.6.2 2013-07-07 16:05:53 -04:00
Christian d164343522 Update for 1.6.2 and MCP 8.04 2013-07-07 15:49:11 -04:00
Christian 499610e44f Updated FML:
MinecraftForge/FML@c97ac284a5 Update ModLoaderFuelHelper.java
MinecraftForge/FML@3a200e901e Fix coremod injection into main system. Should stop double-dipping coremods.
MinecraftForge/FML@2676c8999c Update mcp data. fixes #248
MinecraftForge/FML@5990e29af7 Merge pull request #247 from jk-5/patch-1
MinecraftForge/FML@adc8972277 Add cascadedTweaks. This will allow simple coexistence for any other mod framework using the tweaker system as well. Hi Voxel and LiteLoader!
2013-07-07 00:58:32 -04:00
Christian dcab319acf Add cascadedTweaks. This will allow simple coexistence for any other mod framework using
the tweaker system as well. Hi Voxel and LiteLoader!
2013-07-06 22:26:03 -04:00
cpw 53a607bad9 Merge pull request #247 from jk-5/patch-1
Pull request for #232
2013-07-06 18:54:54 -07:00
Christian 9c8b8bb794 Update mcp data. fixes #248 2013-07-06 21:25:36 -04:00
Christian 412a86ec71 Fix coremod injection into main system. Should stop double-dipping coremods. 2013-07-06 20:51:00 -04:00
LexManos 13294083a9 Merge pull request #645 from XCompWiz/bedspawn
Makes player-specific spawnpoints dimension aware
2013-07-06 14:41:07 -07:00
XCompWiz 5f203ce808 Makes player-specific spawnpoints dimension aware
Makes ServerConfigurationManager correctly get player-specific spawn
point for the target dimension
Changes EntityPlayer to store and save a (bed) spawn point for every
dimension, as well as transfer them to respawn "clones"
2013-07-06 16:24:37 +03:00
LexManos dfc26937ca Re-gather list of Icons when atlas textures are stitched, allows for addition/removal of blocks/items after the atlas's inital constrction. 2013-07-05 22:50:55 -07:00
LexManos 22be4b49d5 Fix enchantment effect on single pass items. Closes #644 2013-07-05 16:55:42 -07:00
LexManos bc932a28ae Merge pull request #642 from MinecraftForge/newliquid
New liquid system
2013-07-04 13:11:36 -07:00
LexManos e9f1c83ff8 Mark old liquid system as deperated to be removed next Minecraft release. 2013-07-04 12:39:49 -07:00
LexManos 30be6d4bab Merge remote-tracking branch 'refs/remotes/origin/newliquid' into newliquid 2013-07-04 12:17:36 -07:00
Christian 1169ba9efb Merge branch 'master' into newliquid 2013-07-04 12:07:32 -07:00
Jeffrey Kog 3f257231a5 Update ModLoaderFuelHelper.java 2013-07-04 08:33:03 +02:00
LexManos 33ec5cdc44 Updated FML: MinecraftForge/FML@54e06e841d Move Resource refreshing until affter postInit. 2013-07-03 22:29:42 -07:00
LexManos d04480b8b0 Move Resource refreshing until affter postInit. 2013-07-03 22:29:10 -07:00
LexManos be14c33ed1 Add missing air checks to WorldGenTrees and ChunkCache Closes #593 2013-07-03 21:48:51 -07:00
LexManos b12872eed1 Fix compile errors temporarily, dont use till updated to new system. 2013-07-03 21:34:49 -07:00
LexManos 35caa32ad1 Merge pull request #539 from richardg867/techne-1
Techne model importer
2013-07-03 21:21:16 -07:00
LexManos 98aab2083b Render pass sensitive version of Item.hasEffect, Closes #517 2013-07-03 21:14:59 -07:00
LexManos 2b588ebce6 Fix lether item rendering colors. 2013-07-03 20:41:27 -07:00
LexManos d4ba95f606 Add hook for EntityWither trying to destroy a block. 2013-07-03 20:29:41 -07:00
LexManos 83504eb2e1 Merge pull request #600 from Lunatrius/rotation
Added rotation support for all vanilla blocks that can be rotated.
2013-07-03 20:16:25 -07:00
LexManos 7f5ec0eaef Fix domain issue with SoundPool entries. 2013-07-03 19:31:54 -07:00
LexManos 68ba3a84d6 Updated FML:
MinecraftForge/FML@7ce84491d1 Fix missing argument and startclient/startserver support.
2013-07-03 19:31:31 -07:00
LexManos a1db21a601 Fix missing argument and startclient/startserver support. 2013-07-03 19:30:30 -07:00
LexManos 125b134d87 Updated FML:
MinecraftForge/FML@155e846818 Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
MinecraftForge/FML@3f4bf61ae6 Update key
MinecraftForge/FML@4545beb49d Add deobf-data to setup env.
MinecraftForge/FML@e24f949517 Fix eclipse workspaces and launch configurations.
MinecraftForge/FML@532bee7ce1 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:54:47 -07:00
LexManos 4f535cfbf8 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues. 2013-07-03 18:23:38 -07:00
LexManos 0b1fdde35d Fix eclipse workspaces and launch configurations. 2013-07-03 18:22:57 -07:00
LexManos c3974de125 Add deobf-data to setup env. 2013-07-03 18:22:06 -07:00
LexManos f9236c4c98 Include MANIFEST file from FML's universal.jar, makes the jar runnable now! 2013-07-03 06:26:47 -07:00
LexManos 02e857827d TEMPORARY fix for MCP mapping issue. 2013-07-03 06:26:12 -07:00
LexManos 7e5560e60d Update dev worksapce: Proper natives location and new server launch profile. 2013-07-03 06:25:40 -07:00
Christian 30ec1e06c7 Update key 2013-07-03 08:28:59 -04:00
Christian a2a8f1247f Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now. 2013-07-02 23:03:01 -04:00
LexManos f35783f0fb Updated FML:
MinecraftForge/FML@6f0eedc9a6 Fixed ClassCastException when loading ModLoader mods
MinecraftForge/FML@8844554da6 Merge pull request #243 from jrtc27/modclassloader
MinecraftForge/FML@7aa7221756 Fix transformer search
MinecraftForge/FML@5f7df5e742 Revert "Keep these on our servers until the launcher is actually fixed -.-"
MinecraftForge/FML@ad79b9ed86 Fix up some deprecation warnings, and clean up coremod code that's going away.
MinecraftForge/FML@ba3707af22 More javadoc cleanup
2013-07-02 18:16:04 -07:00
Christian e45767d20a More javadoc cleanup 2013-07-02 19:39:02 -04:00
Christian aaaffda3f0 Fix up some deprecation warnings, and clean up coremod code that's going
away.
2013-07-02 19:27:50 -04:00
Christian d648514a90 Revert "Keep these on our servers until the launcher is actually fixed -.-"
This reverts commit f1b533ad87.
2013-07-02 19:03:06 -04:00
Christian f8f78c8a80 Fix transformer search 2013-07-02 18:40:23 -04:00
cpw 18c5bde7d0 Merge pull request #243 from jrtc27/modclassloader
Fixed ClassCastException when loading ModLoader mods
2013-07-02 15:32:35 -07:00
LexManos e74ef3e86e Attempt to gather lastBuild information to fix ChangeLog's off-by-one issue. 2013-07-02 15:18:23 -07:00
LexManos ae59f1abb4 Move resource location resolution down to TextureAtlasSprite and allow for sprites that are not stitched. 2013-07-02 13:57:50 -07:00
James Clarke b2ef2bed36 Fixed ClassCastException when loading ModLoader mods 2013-07-02 20:48:00 +01:00
Christian c0b09854b3 Start: f1b533ad87
End: f21cd286ca
Updated FML:
MinecraftForge/FML@f21cd286ca Resource packs, part two. FML mods are now resource packs. Vanilla will scan anything under 'assets' and turn it into a resource prefix. Use resourcelocations to look stuff up.
2013-07-02 13:53:28 -04:00
Christian 5d0d45ea40 Resource packs, part two. FML mods are now resource packs. Vanilla will scan anything under 'assets'
and turn it into a resource prefix. Use resourcelocations to look stuff up.
2013-07-02 11:11:50 -04:00
LexManos 2b61ea417b Update ChestGenHooks for new Dungeon chest strcture. 2013-07-02 02:37:05 -07:00
LexManos e57886e05a Fix resource domain when loading icon. Textures should be located in /assets/{domain}/textures/{block|item}/{name}.png Same strcutre as before except 'assets' instead of 'mods'. 2013-07-02 02:06:12 -07:00
LexManos b0520f3656 Update filler block to prevent useless console warning. 2013-07-02 02:04:28 -07:00
LexManos 3e9349bf7b Make Block.setIconName public 2013-07-02 02:04:04 -07:00
LexManos d5549d770d Fix bound texture in Controls screen, Closes #631 and #629 2013-07-01 23:35:03 -07:00
LexManos 4034cfe9dc Updated FML:
MinecraftForge/FML@5a97d183df Remember to update your patches!!!!
MinecraftForge/FML@f1b533ad87 Keep these on our servers until the launcher is actually fixed -.-
2013-07-01 23:33:48 -07:00
LexManos 58a00d68a4 Keep these on our servers until the launcher is actually fixed -.- 2013-07-01 23:26:40 -07:00
Christian 0f319c41e0 Remember to update your patches!!!! 2013-07-02 02:14:31 -04:00
LexManos 7864f2c8ea Updated FML:
MinecraftForge/FML@91ecf71109 Fix -rel json
MinecraftForge/FML@efc369ee83 Fix EventHandler annotation.
MinecraftForge/FML@fbd57b3264 Mods are now loaded as resource packs. Vanilla will scan for valid prefixes based on subdirs of 'ass
ets' which can then be referenced as ResourceLocations with the "<prefix>:path" notation.
2013-07-01 22:54:19 -07:00
Christian 76a1489d4b Mods are now loaded as resource packs. Vanilla will scan for valid prefixes based on subdirs of 'assets' which
can then be referenced as ResourceLocations with the "<prefix>:path" notation.
2013-07-02 01:39:40 -04:00
Christian f978e6b50e Fix EventHandler annotation. 2013-07-02 01:08:51 -04:00
Christian 160b2dc749 Fix -rel json 2013-07-02 01:02:02 -04:00
LexManos c157875ecd Fix installer unintended replace.
Updated FML:
MinecraftForge/FML@9b6525e805 Point scala downloads to our servers, Launcher doesn't like standard maven repos.
2013-07-01 21:54:10 -07:00
LexManos b474a69a90 Point scala downloads to our servers, Launcher doesn't like standard maven repos. 2013-07-01 21:53:13 -07:00
LexManos dac329bcf1 Updated FML:
MinecraftForge/FML@29d6c875d0 Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162
MinecraftForge/FML@3d17434510 Build installer package for the new client launcher.
MinecraftForge/FML@bf38d94756 Update json samples
MinecraftForge/FML@7037184a4e Fix up release JSON
MinecraftForge/FML@dc7d02ebf6 Fix json syntax error.
2013-07-01 21:42:52 -07:00
LexManos d072d91081 Release will now build a installer jar and use the standard 'target' output folder. 2013-07-01 21:42:33 -07:00
LexManos e156ec2940 Update ToolMaterial enum helper. 2013-07-01 21:41:47 -07:00
LexManos b758104a37 Fix json syntax error. 2013-07-01 20:33:26 -07:00
Christian fa9789a3d4 Fix up release JSON 2013-07-01 23:14:31 -04:00
Christian 46dcb86a62 Update json samples 2013-07-01 22:58:08 -04:00
LexManos 0f3e999323 Build installer package for the new client launcher. 2013-07-01 19:40:19 -07:00
LexManos 69d1a35cd5 Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162 2013-07-01 19:38:44 -07:00
LexManos 14295fd4b3 Merge pull request #627 from MinecraftForge/1.6
Merge 1.6 branch
2013-07-01 16:51:27 -07:00
LexManos ba4637f5a3 Update src distro installer script. Source distro works now! 2013-07-01 16:38:02 -07:00
LexManos fde224e83b Updated FML:
MinecraftForge/FML@1229c4c4ea Fix src distrabution, and got rid of pesky common folder in eclipse workspace. src is now installable.
MinecraftForge/FML@902772ed0c Revert common folder fix, Common folder does nothing, feel free to delete it after first load.
2013-07-01 16:33:34 -07:00
LexManos 7e8e083c80 Revert common folder fix, Common folder does nothing, feel free to delete it after first load. 2013-07-01 16:25:11 -07:00
LexManos ed5d8fa2e6 Fix src distrabution, and got rid of pesky common folder in eclipse workspace. src is now installable. 2013-07-01 15:50:49 -07:00
LexManos 895580de42 Merge pull request #626 from MinecraftForge/1.6
1.6.1 Branch Merge
2013-07-01 14:16:37 -07:00
LexManos b8b708aab6 Try absolute path, to not confuse jenkins. 2013-07-01 12:30:19 -07:00
LexManos df03ece63f MinecraftForge/FML@7fecf2ad6b Update mcp URL. 2013-07-01 12:04:46 -07:00
Christian ddbec7d9dd Update mcp URL. 2013-07-01 11:06:20 -04:00
LexManos f1dde02853 Deprecation sweep and update version to 8.9 to reflect 1.6.1 update. 2013-06-30 23:29:43 -07:00
LexManos 3df47c0250 Update release script to generate binary patches and include deobf data. 2013-06-30 23:21:28 -07:00
LexManos 17a539e173 Updated FML:
MinecraftForge/FML@c418da353f Cleanup coremod code, server side working now.
2013-06-30 23:20:56 -07:00
LexManos 7c53448734 Update GuiIngameForge to reflect Mojang changes in 1.6.1 2013-06-30 22:32:11 -07:00
LexManos 27779f096b Add new launch configs to dev workspace. 2013-06-30 22:31:54 -07:00
Christian 3e8f4552dd Cleanup coremod code, server side working now. 2013-06-30 22:51:56 -04:00
LexManos ab1ddd99b6 1.6.1 Update 2013-06-30 19:43:27 -07:00
LexManos fa965e5f7c Support dirty submodules in changelog script. 2013-06-30 19:43:09 -07:00
LexManos be88b0f22f Updated FML:
MinecraftForge/FML@110cf372eb Add deobf data to merge-common, workspace is now actually runnable!
2013-06-30 19:42:47 -07:00
LexManos cd9a5d63a2 Add deobf data to merge-common, worspace is now actually runnable! 2013-06-30 19:41:51 -07:00
LexManos e0d7b9e2c6 Updated FML:
MinecraftForge/FML@8960f6869f Add windows lzma executable http://tukaani.org/xz/ He states that most things are under public domai
n, But I couldn't find an exact reference to this executable. I'm going to assume it under public domain and distribuiting it here is fine. If not someone pleas
e direct me to the apropriate license and I will act accordingly.
MinecraftForge/FML@70cfe24e67 Fix wrong project name in distro eclipse launch.
MinecraftForge/FML@7a004087f7 Add deobf data to src dist. Dont create deobf jar as we ship the lzma Added *.lzma to .gitignore
2013-06-30 19:23:51 -07:00
LexManos f37e5b8338 Add deobf data to src dist.
Dont create deobf jar as we ship the lzma
Added *.lzma to .gitignore
2013-06-30 19:15:53 -07:00
LexManos 4e1ac5b80d Fix wrong project name in distro eclipse launch. 2013-06-30 18:33:26 -07:00
LexManos d92b8e8589 Add windows lzma executable
http://tukaani.org/xz/
He states that most things are under public domain, But I couldn't find an exact reference to this executable.
I'm going to assume it under public domain and distribuiting it here is fine. If not someone please direct me to the apropriate license and I will act accordingly.
2013-06-30 18:31:24 -07:00
LexManos be47ccfc7e Updated FML:
MinecraftForge/FML@6a318ddb78 Fix typo in new packages.
MinecraftForge/FML@3711da9c45 Another typo
MinecraftForge/FML@e35e4b16ff More fixups
MinecraftForge/FML@18371bd8c9 Some fixes for updated mcp code
MinecraftForge/FML@ef646d3146 Merge branch '16launch'
MinecraftForge/FML@7406b38d8a 1.6.1
MinecraftForge/FML@12c928c538 Tweak commands patch
MinecraftForge/FML@3f15cd54c2 Functional client @ 1.6.1
MinecraftForge/FML@71a92de5d9 Client launch for eclipse
2013-06-30 18:14:19 -07:00
LexManos 63dfed9d83 Small fixup, need to Update GuiIngameForge for new HUD changes. 2013-06-30 18:13:01 -07:00
Christian 5735c7f603 Client launch for eclipse 2013-06-30 21:06:33 -04:00
Christian de18b5ecc1 Functional client @ 1.6.1 2013-06-30 21:02:23 -04:00
Christian 7371511e5a Tweak commands patch 2013-06-30 19:33:47 -04:00
Christian 569b791b93 1.6.1 2013-06-30 16:50:30 -04:00
Christian a82c90d7d6 Merge branch '16launch' 2013-06-30 13:20:46 -04:00
Christian 72e0adedeb Some fixes for updated mcp code 2013-06-30 13:17:20 -04:00
Christian daa85290e4 More fixups 2013-06-30 09:04:50 -04:00
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 ae922989ed Another typo 2013-06-30 03:55:26 -07:00
LexManos bdc0011e90 Fix typo in new packages. 2013-06-30 01:01:55 -07:00
LexManos c7758deffa Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP. 2013-06-29 22:48:24 -07:00
RedmenNL 2c9e11299e Added more render methods to IModelCustom interface. 2013-06-29 23:26:39 -06:00
MachineMuse ca011729d3 Fixed both RenderAllExcept behaviours 2013-06-29 23:24:03 -06:00
Christian 572c9acc59 More fixes, binpatching works 2013-06-29 15:16:18 -04:00
Christian 5b5f05859c First draft of 1.6 update 2013-06-29 13:33:14 -04:00
Christian 70b1dcfbac New mappings for marker 2013-06-29 09:20:59 -04:00
Christian 069aba5b46 Tweak missing mapping 2013-06-29 09:20:59 -04:00
MachineMuse 0f25e6ec6b Added tessellation methods to obj model, for ISBRH-friendliness 2013-06-29 04:35:57 -06:00
LexManos 837a6fdf8a Add support for alternative maven servers in libraries.
Also download sources for public libraries, and atach them in eclipse. DOCUMENTATION!! YAYA!
2013-06-29 02:54:29 -07:00
LexManos 58ce9b33b3 Base GenDiff off deobf data's class list instead of the merged jar. Add option to delete target files that generate patches. 2013-06-29 01:40:01 -07:00
LexManos 028c77c3a0 Add Clean Server/Client launcher. Update Start.java to new Main class and login system. 2013-06-28 22:12:07 -07:00
LexManos da8fb7f8a0 Update eclipse projects for new libraries dependancies, and update packages for new 1.6 classes. 2013-06-28 20:31:02 -07:00
LexManos 4cd3d06286 Add suggestions output if it can. 2013-06-27 22:58:00 -07:00
LexManos 030e8e71a8 Fixed update_packages.py for new folder strcture. 2013-06-27 22:30:40 -07:00
LexManos cf448bb934 Add missing argument 2013-06-27 22:29:10 -07:00
LexManos 90c643183e Re-wrote/orginized a lot of fml.py. Almost everything is re-written/moved.
This is done in preperation for MCP to roll out SpecialSource support and the new 1.6 structure.
Also done for my sanity while reading through the code.

Intruduced a new function. If there is a 'mcp_data' folder in the FML folder, it will be copied to the MCP work directory after MCP is extracted.
It DOES overwrite anything that already exists.
This is intended for places like BuildServer to place libraries/assets to prevent them from needing to be downloaded every version.

Introduced a dev-env json. Need to write the eclipse workspace references to the new libraries.
Out custom json includes asm and legacylauncher.

Added proper OptionParsing to decompile.py
2013-06-27 20:48:52 -07:00
Christian 611c3b9591 Add a simple property annotation system for mods. 2013-06-27 08:40:31 -04:00
Christian b2e9557b87 Changed to the EventHandler annotation universally, documentation and stuff. 2013-06-26 14:52:56 -04:00
Christian 3c0048b6d6 Fixes, so it builds again.. 2013-06-24 16:30:18 -04:00
Christian b985ec886a Ignore binpatch 2013-06-24 16:03:54 -04:00
LexManos 3e346cb8b2 Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'. 2013-06-23 23:06:25 -07:00
LexManos 82c0fbce60 Upgraded minecraft downloader to work with new launcher's asset/library system
New parameter:
  --no-assets: Disables the downloading of minecraft's asset tree, recomended that build servers supply this flag to prevent downloading of useless data.
2013-06-20 16:23:15 -07:00
James af2b5eb6f6 Add an InputStream constructor to WavefrontObject
It is said that Resource Packs will return InputStreams. And I like putting my models into texture packs which, obviously, give InputStreams rather than URLs.
2013-06-19 15:57:44 -06:00
Ross Swartz b207111c50 Update OreDictionary.java 2013-06-17 19:09:40 -03: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
Christian 39858c6ead No more debug please 2013-06-15 01:11:29 -04:00
Christian 14ddd2be05 Fix build script. Add a sample JSON file. You'll need the newest Launcher code to run this. 2013-06-14 21:00:15 -04:00
Christian 30d836fa36 More fixups for new launcher model 2013-06-14 20:45:52 -04:00
Christian 07a5efe612 Merge in binpatch and use launcher 2013-06-14 17:21:49 -04: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 21240df8bc More tweaks 2013-06-14 09:32:51 -04:00
Christian a923a2c142 Server side tested and working. Setup is complex atm. That will change. 2013-06-13 09:57:55 -04:00
Christian 4802d04bfd First cut of runtime binary patching. Needs some work to actually test it in a real scenario.. 2013-06-12 08:53:10 -04:00
Ross Swartz 05b2a19bac Add stone and cobblestone to Ore Dictionary 2013-06-11 23:58:05 -03: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 83ed6fa32c Small tweaks to the mcp data. Nothing major.. 2013-06-11 14:47:23 -04:00
Christian c170b98a8c Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer.. 2013-06-11 14:41:19 -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 146e773264 Fix sysout with trailing messages after a newline 2013-06-06 11:52:15 -04:00
Christian 1261c7a3e0 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.
2013-06-06 10:05:34 -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
Christian fea7a25a86 Don't continue trying to send events to mods that depend on errored mods. 2013-06-04 13:59:04 -04:00
Christian 8602848f2c 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. 2013-06-04 12:51:46 -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
Christian 2a064ffdc7 Send the "suspect list", and print the suspect versions 2013-05-27 11:03:23 -04:00
Christian 6ca37a60b7 Throw the sorting exception 2013-05-27 10:46:22 -04:00
Christian 8be20d6805 Add in a pretty sorting error screen 2013-05-27 10:28:00 -04:00
Christian e3cd509b9a More tweaks to the mod sorting code 2013-05-27 10:09:51 -04:00
Christian ece6290c19 Try and clean up cycle detection output a bit 2013-05-27 09:25:50 -04:00
King Lemming 6cd56ebed6 Forge Fluid System!
Signed-off-by: King Lemming <[email protected]>
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
Christian aa18bed75e Fix server side derp with Forge network packet handler 2013-05-21 11:01:50 -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
Christian c8cc7b27d1 Separate network mod config from setup. Allows for Forge Packet Handler nicety 2013-05-20 21:40:42 -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
Christian 2a86167c98 Updated FML:
MinecraftForge/FML@23b070c7d0 Alternative @SidedProxy setter for Scala.
MinecraftForge/FML@2cca7aa759 Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e. object C {   @SidedProxy(...)   var proxy: P = null } Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
MinecraftForge/FML@8517a824e5 Merge declaration and initialization of a variable.
MinecraftForge/FML@a3a920437f Merge pull request #230 from fnuecke/master
2013-05-15 18:49:07 -04:00
LexManos 0f36b52d7d Merge pull request #563 from Asajz/master
Default Quartz Ore Dictionary
2013-05-13 21:23:46 -07:00
LexManos 7e702833ab Merge pull request #568 from hitchh1k3r/master
Furnace XP bug fix (fixed)
2013-05-13 21:23:29 -07:00
LexManos ed5dc83c81 Merge pull request #571 from odininon/master
Addition: ItemStack sensitive canHarvestBlock
2013-05-13 21:22:39 -07:00
LexManos 348add87b3 Merge pull request #565 from CovertJaguar/patch-1
Possible NPE if the liquid isn't in the LD
2013-05-13 21:09:00 -07:00
LexManos 55dac73d10 Fix NPE when rendering EntityItems that are not blocks but int he block range. 2013-05-13 21:04:55 -07:00
Freyja c5b64c5eef Created an ItemStack sensitive version of canHarvestBlock. 2013-05-13 23:33:12 -04:00
LexManos f4b9333c99 Prevent water from dropping snowballs. 2013-05-13 20:31:46 -07:00
hitchh1k3r fecb4dc35f updated FurnaceRecipes.java.patch 2013-05-12 01:15:52 -04:00
cpw 8f779cf618 Merge pull request #230 from fnuecke/master
Alternative setter logic for @SidedProxy in Scala classes/mods.
2013-05-11 15:34:37 -07:00
LexManos e19ec10b7f Fire EntityJoinWorled event for forced entities {Players and there mounts} as well, just ignore the cancelled value. 2013-05-11 12:16:37 -07:00
LexManos 7ea4508933 MinecraftForge/FML@787c0c4a6a Don't spit error on LWJGL not supporting 4.3 just warning.
Make custom item renderers attempt to use EQUIPPED type when running first person. For backwards compatiblity, will be removed in 1.6.
And a small change to make the 1.6 check not print it's stack trace.
2013-05-11 10:59:03 -07:00
LexManos 6b39f612df Don't spit error on LWJGL not supporting 4.3 just warning. 2013-05-11 10:55:39 -07:00
LexManos 348af15cb5 Merge pull request #564 from purpleposeidon/patch-1
Fix render bounding box of trapped double chests
2013-05-11 09:59:07 -07:00
LexManos 79aaddbf57 Merge pull request #566 from jampot5000/patch-1
Make getStencilBits static
2013-05-11 09:56:20 -07:00
jampot5000 9873eee53a Make getStencilBits static
Made getStencilBits static so it can be called.
2013-05-11 16:58:02 +02:00
CovertJaguar a88692a0f2 Possible NPE if the liquid isn't in the LD
https://github.com/BuildCraft/BuildCraft/issues/787
2013-05-11 04:27:52 -06:00
LexManos 4cd70f5e98 Move Partical rendering down in the order, after everything else. Should fix particals rendering behind water, digging process, and selection. 2013-05-11 01:02:30 -07:00
James 1a52514c9d Fix render bounding box of trapped double chests 2013-05-11 00:48:04 -07:00
Asajz c6a1db22ff Added oreQuartz
Gives a default quartz Ore Dictionary (I know of at least 3 used by different mods that use Nether Quartz as an equivalent).
2013-05-10 16:29:58 -05:00
Jeffrey Kog 109d4ff134 RenderGameOverlayEvent.Post(ALL) is now called in GuiIngameForge 2013-05-09 14:27:59 +02:00
LexManos e805d53089 Fixed NPE in rendering dragged items. 2013-05-09 01:03:36 -07:00
LexManos ec755e09d0 Attempt to allocate a 8-bit stencil buffer when creating Minecraft's display context. If that throws an error it will revert back to it's default values.
Also contains a method for modders to rereive how many bits the context was created with. Closes #552
2013-05-08 17:13:19 -07:00
LexManos 2b7cd66f9a New RenderPlayer and RenderLiving events. Closes #493 2013-05-08 16:30:59 -07:00
LexManos 417fff89b8 Changed to just plane entity for flexability. 2013-05-08 15:27:18 -07:00
LexManos 810b03bd83 EntityPlayer sensitive version of Item.isValidArmor, deprecated older version. Closes #551 2013-05-08 15:09:53 -07:00
Florian Nücke 15e6ddcb14 Merge declaration and initialization of a variable. 2013-05-08 20:16:15 +02:00
Florian Nücke a14c627cd7 Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e.
object C {
  @SidedProxy(...)
  var proxy: P = null
}
Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
2013-05-08 19:04:35 +02:00
Florian Nücke 283dfb6e7d Alternative @SidedProxy setter for Scala. 2013-05-08 05:36:28 +02:00
LexManos 0444cc063c Merge pull request #557 from pahimar/master
Expose the EntityLiving's combat tracker
2013-05-06 19:13:16 -07:00
LexManos c5c44c2de4 Merge pull request #556 from micdoodle8/master
Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types
2013-05-06 19:08:21 -07:00
pahimar da49e2fb45 Update forge_at.cfg 2013-05-06 14:23:41 -03:00
LexManos 2444a80bef Capture and fire the PlaySoundAtEntity event for The client entity. Minecraft does some odd bypasses for no good reason. Thanks iPixile for reporting this. 2013-05-04 17:39:10 -07:00
micdoodle8 b28910e722 Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types 2013-05-04 16:59:47 -04:00
LexManos 3fdbc02c54 Updated FML:
MinecraftForge/FML@99bb50d8f8 Improved Entity Spawn Error
MinecraftForge/FML@c0cca7f41d Merge pull request #227 from CovertJaguar/patch-1
MinecraftForge/FML@49111e9c5c Add version detection to astyle and print error if it doesnt detect version 2.0+
 Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:39:08 -07:00
LexManos 4db40c7861 Add version detection to astyle and print error if it doesnt detect version 2.0+
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:26:27 -07:00
LexManos 408ced2ea2 Merge remote-tracking branch 'refs/remotes/origin/1.5.2'
Conflicts:
	common/net/minecraftforge/common/ForgeVersion.java
2013-05-02 09:06:36 -07:00
LexManos cd40aba38e Bump version number for 1.5.2 2013-05-02 09:02:26 -07:00
LexManos 46a369e932 Merge pull request #550 from cadyyan/master
Build Script Error Handling Error
2013-04-30 20:20:52 -07:00
cpw 3d5658b90f Merge pull request #227 from CovertJaguar/patch-1
Improved Entity Spawn Error
2013-04-29 22:10:53 -07:00
CovertJaguar ce99b80932 Improved Entity Spawn Error 2013-04-29 20:41:20 -07:00
James Durand a5cc807dcd Fixed build error handling using invalid Python syntax. 2013-04-29 11:18:05 -05:00
LexManos 3242904b36 Fixed hardcoding of MC version in debug text. 2013-04-28 17:10:16 -07:00
LexManos 24f2fb1f6a Updated FML:
MinecraftForge/FML@00f00b17bf Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
2013-04-28 16:57:19 -07:00
LexManos 42564b3988 Fix scalac detection to actually use the located command instead of defaulting to 'scalac' 2013-04-28 16:35:23 -07:00
LexManos 784e23668b Changelog generator will now bundle failed builds with the next successful build. Should make it look better and prevent the version numbers from being confusing. 2013-04-28 15:35:14 -07:00
LexManos a6b8055c44 Bump version to 7.7.2 so I can make a release. 2013-04-28 14:21:33 -07:00
LexManos 2c05258205 Update to 1.5.2 PR.
MinecraftForge/FML@f0bba74a47 Update for minecraft 1.5.2
MinecraftForge/FML@62fdbad74c Update MCP's md5 for the fixed srg files.
2013-04-28 13:28:40 -07:00
LexManos bff831ce8d Update MCP's md5 for the fixed srg files. 2013-04-28 12:33:42 -07:00
Christian 3baad0a897 Update for minecraft 1.5.2 2013-04-27 01:24:06 -04:00
LexManos cffaef6e0f Merge pull request #543 from Chimaine/master
Fix unregistering of event listener
2013-04-26 13:07:06 -07:00
Chimaine 3061fd6db6 Replaced derpy tabs with spaces 2013-04-26 21:53:09 +02:00
Chimaine 4b4f5a07a5 Fixed ListenerListInst not being rebuild after unregistering a listener, causing calls to unregistered event listeners. 2013-04-26 12:45:45 +02:00
cpw cb14e29cdb Merge pull request #542 from KingLemming/master
OreDictionary additions + ItemStack maxDamage hook
2013-04-25 18:46:06 -07:00
King Lemming b8a17e2748 -Add vanilla Ores to the Ore Dictionary. No recipe replacement required.
-Add NBT-sensitive getMaxDamage() for ItemStack.

Signed-off-by: King Lemming <[email protected]>
2013-04-25 21:36:51 -04:00
LexManos 4da2992df5 Attempted a fix for the changelog generation, should print all builds back to 1 now. 2013-04-24 10:49:33 -07:00
Christian 54b3654eaa Updated FML:
MinecraftForge/FML@cf9b5b445b Don't leave scala running in interactive mode.
2013-04-23 23:37:56 -04:00
Christian 2c7c944e96 Don't leave scala running in interactive mode. 2013-04-23 22:56:18 -04:00
Christian b483c7ee74 Updated FML:
MinecraftForge/FML@aa200923f0 Fix patch derp.
2013-04-23 22:51:28 -04:00
LexManos 74e9b293e1 Fix patch derp. 2013-04-23 19:47:43 -07:00
Christian e50fb10bff Updated FML:
MinecraftForge/FML@ddadf93ca1 Fix when an old scalac is present on the system to not fail the build
2013-04-23 22:44:35 -04:00
Christian 5a81b37bcf Fix when an old scalac is present on the system to not fail the build 2013-04-23 22:43:51 -04:00
LexManos 15ffb962e4 Fix rotation issue with non-block items. 2013-04-23 19:05:35 -07:00
Christian b56d05ef9d ItemStack delegation to Item for damage values. 2013-04-23 19:05:11 -04:00
Christian 7aa91ca635 Try and be less noisy about world leaks 2013-04-23 07:51:07 -04:00
Christian 10f1028a8f Updated FML:
MinecraftForge/FML@cfda7fc738 Fix URL for MCP
MinecraftForge/FML@781c681216 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.
2013-04-23 07:41:45 -04:00
Christian cee176eb96 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP. 2013-04-23 07:40:49 -04:00
Christian e97834b433 Fix URL for MCP 2013-04-23 07:22:25 -04:00
Christian 95c144dcf0 Updated FML:
MinecraftForge/FML@dcf069ca52 Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
MinecraftForge/FML@58ba24add2 Fix possible NPEs in GameData
2013-04-22 21:15:04 -04:00
Christian 4d442ac219 Fix possible NPEs in GameData 2013-04-22 21:14:34 -04:00
Christian 8974a78c0a Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes. 2013-04-22 21:14:34 -04:00
richardg867 f3caada13a Complete it, got the bug figured out 2013-04-22 13:08:59 -03:00
richardg867 27d922d470 Techne model loader (incomplete for debugging) 2013-04-21 21:32:23 -03:00
Christian 6e2d06c950 Add forge/FML data to the f3 screen. 2013-04-21 16:54:11 -04:00
Christian de8a4c8855 Updated FML:
MinecraftForge/FML@a3b5eaacfd Fix a small modloader compatibility derp: closes #222
MinecraftForge/FML@677a6e578e Fix scala supporting SidedProxy. It should work now.
MinecraftForge/FML@334a76de75 Update FMLDeobfuscatingRemapper.java
MinecraftForge/FML@42f1d87955 Merge pull request #224 from Glought/master
MinecraftForge/FML@2dcabe0123 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
MinecraftForge/FML@11ac46daeb Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code: MyBlock myBlock = new MyBlock(); GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock"); where MyBlockItem class has one constructor with signature: public MyBlockItem(int id, Block block)
MinecraftForge/FML@c3fda11d10 Merge pull request #225 from MarcinSc/master
2013-04-21 16:43:24 -04:00
cpw d15889075c Merge pull request #225 from MarcinSc/master
Suggested fix for issue 221
2013-04-21 11:32:51 -07:00
Marcin Sciesinski bdee7e3c5b Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code:
MyBlock myBlock = new MyBlock();
GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock");
where MyBlockItem class has one constructor with signature:
public MyBlockItem(int id, Block block)
2013-04-21 19:01:18 +01:00
Christian 0512525c58 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data 2013-04-21 13:58:18 -04:00
LexManos c0d7e23c8d Merge remote-tracking branch 'refs/remotes/origin/GuiIngame'
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-04-21 10:42:17 -07:00
cpw 76ffd19bc5 Merge pull request #224 from Glought/master
Fix for  Issue #223
2013-04-21 08:13:54 -07:00
Glought 074d7c2ec7 Update FMLDeobfuscatingRemapper.java
Fixes a "Type mismath:cannot convert from element type Object to FieldNode" error at line 176.
2013-04-21 05:09:19 -07:00
LexManos 960eaf99ef Allow spawning of Bonemeal particles even if block is not set. 2013-04-21 00:15:02 -07:00
Christian 3446f1ce26 Fix scala supporting SidedProxy. It should work now. 2013-04-20 23:31:22 -04:00
Christian 6c0bb61425 Fix a small modloader compatibility derp: closes #222 2013-04-20 22:55:56 -04:00
LexManos c998db6a86 Restore world unload event for client worlds Closes #531 2013-04-20 11:25:16 -07:00
LexManos 06727b965e Fix replaceable checks to work on blocks with a non-replacable material, Closes #532 2013-04-20 11:19:05 -07:00
LexManos 13ff75bd9c Fix the BLOCK_3D render helper for items that aren't an instance of ItemBlock Closes #533 2013-04-20 11:12:35 -07:00
LexManos 2d84dcd44e Fix logic issue in CrashReportCategory patch, blame Jadedcat for sloppy quick patch. 2013-04-19 22:08:07 -07:00
LexManos 74742fd12f Merge pull request #530 from Azanor/master
Fix for BiomeDictionary.getTypesForBiome throwing a ClassCastException when called.
2013-04-19 10:52:30 -07:00
Azanor 4b2aca2124 getBiomesForType will cause the same problem 2013-04-19 14:29:07 +03:00
Azanor 09dd117d1d Fix for ClassCastException when attempting to fetch Biome types from BiomeDictionary
Attempting to fetch the BiomeDictionary types linked to a biome throws a ClassCastException. This fixes that
2013-04-19 14:08:53 +03:00
Christian cf90eb37f7 Simple block recolouring API: closes #525
Fix up documentation on "rotation" API: it is up to the mod to decide interpretation of "rotation" for the mod/block.
2013-04-18 17:21:26 -04:00
Christian cb9e944257 Updated FML:
MinecraftForge/FML@b3d4ea05ec Fix possible NPE in findItemStack, closes #218
2013-04-18 16:39:11 -04:00
LexManos cb4a073f5d Adds a field to the player for maximum health. Player.dat additions are present, getMaxHealth() needs a magic number for spawning. Closes #527 2013-04-17 19:16:34 -07:00
LexManos a0891d74a0 Fix return value of EnchantPower hook, closes #518 2013-04-17 19:08:50 -07:00
LexManos 11115d5f3a Forge now takes control of GuiIngame's renderGameOverlay, and spits out a ton of events to give modders control of how the screen is rendered.
Inital draft for community feedback.
2013-04-17 18:55:06 -07:00
LexManos d3a2243799 New hook to allow Items to render Helmet overlays like pumpkins do. 2013-04-17 14:03:59 -07:00
Christian e204d580a8 Fix possible NPE in findItemStack, closes #218 2013-04-17 07:55:33 -04:00
Christian 718e9b3756 Updated FML:
MinecraftForge/FML@394f424185 Fix to output versions in crash logs
MinecraftForge/FML@8f35adca7a Use more expressive language when a version specifier is a simple unbounded above condition
2013-04-16 13:57:46 -04:00
Christian 3d142df102 Use more expressive language when a version specifier is a simple unbounded above condition 2013-04-16 13:46:55 -04:00
Christian 0888a95f2d Fix to output versions in crash logs 2013-04-16 13:46:55 -04:00
Christian 588bc8c865 Updated FML:
MinecraftForge/FML@5673c1dd29 Add srgname to registerTileEntityWithAlternatives
MinecraftForge/FML@7aea09f4ca Add type info to properly deobfuscate overloaded fields. Fixes #210.
MinecraftForge/FML@edffd04ed2 Add in some caching of the read field descriptions for efficiency
MinecraftForge/FML@0daf1a6df4 Merge branch 'agaricusb-fix-deobf-field'
MinecraftForge/FML@ada52078c7 Merge pull request #216 from agaricusb/add-srgname
2013-04-15 19:06:41 -04:00
cpw 470070e2ce Merge pull request #216 from agaricusb/add-srgname
Add srgname to registerTileEntityWithAlternatives
2013-04-15 15:50:47 -07:00
Christian 3020daf42d Merge branch 'agaricusb-fix-deobf-field' 2013-04-15 17:31:09 -04:00
Christian 1a9cb9e3c9 Add in some caching of the read field descriptions for efficiency 2013-04-15 17:30:35 -04:00
LexManos 4bd7d4f3d9 Merge pull request #521 from ProgrammerHero/master
Fixed a bug that prevented proper lava generation near bedrock
2013-04-15 10:17:01 -07:00
ProgrammerHero add399284b fixed a bug that prevented proper lava generation near bedrock 2013-04-15 10:14:16 -03:00
LexManos 560931a14a Fix AIOOB in crash report stack trimming. 2013-04-14 21:42:13 -07:00
Agaricus 03bc9cf00a Add type info to properly deobfuscate overloaded fields. Fixes #210. 2013-04-14 16:54:11 -07:00
Agaricus 76275cafc4 Add srgname to registerTileEntityWithAlternatives 2013-04-14 14:11:37 -07:00
LexManos 5cdc45b6da Merge pull request #515 from pahimar/master
Fixes parsing faces for faces that do not have texture coordinate data
2013-04-12 14:10:06 -07:00
pahimar 46eeadf3a2 Missed a bit 2013-04-12 16:05:56 -04:00
pahimar 6bb839e13c Fix a derp in that we provision the various arrays for a face, even if we are not going to parse data into it. Solves NPEs for when obj models that don't have texture coordinates attempt to render. 2013-04-12 15:57:59 -04:00
LexManos 3818ffdf56 Cave and Ravine gen will now take into account the Biomes top and foller block, allowing them to break the surface in modded biomes. Beaches, MushroomIslands and Deserts are exempt from this check to preserve vanilla world gen functionality. Closes #491 2013-04-11 11:39:23 -07:00
Christian a09c5ad484 Fix offset in AdvancedModelLoader. *doh* 2013-04-10 20:27:29 -04:00
LexManos cb67c72cd7 Added a small method in the Block.java to specify the amount of enchanting power it can supply to an enchanting table. Closes #508 2013-04-10 16:56:31 -07:00
LexManos b66d3b6b0f Added NBT data to liquid stacks. Closes #501 2013-04-10 16:44:31 -07:00
LexManos 969cd4e762 Add Item 'swing' callback for use when playing the arm swing animation. Closes #505 2013-04-10 16:33:16 -07:00
LexManos 395c537f2c Item callback for EntityItem update tick. Closes #426 2013-04-10 16:06:07 -07:00
Christian 02a0824716 Delete sneaky extra file 2013-04-10 18:39:47 -04:00
Christian 1ae7fa0080 Add in a generic factory interface, allowing for additional model support
to be added at runtime.
2013-04-10 18:30:25 -04:00
pahimar d4b71ef964 More interface work 2013-04-10 18:30:25 -04:00
pahimar 091c4ab6ac Adding interface for other custom model format importers to implement 2013-04-10 18:30:25 -04:00
pahimar 09fee09a01 Switch out String.matches in favour of Pattern/Matcher usage, and a tad more documentation.
Fixed a bug in texture coordinate parsing (can have 2-3 values per entry, instead of the 3-4 I had before)
2013-04-10 18:30:25 -04:00
pahimar 46e53fb461 Wavefront object importer. Imports Wavefront object and offers some simple render methods for rendering the models in game. Modders have complete access to all the data in the model to write their own rendering related code as well. 2013-04-10 18:30:25 -04:00
Christian 7c6468a9ea Update MCP names to recent published names
Updated FML:
MinecraftForge/FML@1774e2bf30 MCP names update
2013-04-10 18:30:25 -04:00
LexManos 77f6d9eeab Re-add and mark deprecated the old signature for ForgeHooksClient.getArmorTexture. 2013-04-10 18:30:25 -04:00
Christian 1490479bd6 Deprecate preloadTexture, make it a no-op. Should stop derpiness with new
texturing system performance tweaks.
2013-04-10 18:30:25 -04:00
LexManos 460eefab49 Updated FML: MinecraftForge/FML@4836b3272a Re-worked the Texture patches, optifine helper function, and re-added support fo
r dynamically rotating the texture for mod authors who do things horribly wrong.
2013-04-10 18:30:25 -04:00
Christian dd720bbb5c Updated FML:
MinecraftForge/FML@a31607ae7d Fix compilation derp, and clean up rotation helper.
2013-04-10 18:30:25 -04:00
Christian cefcd8aee6 Fix performance of texture uploads
Updated FML:
MinecraftForge/FML@00c7883088 Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working properly for an even more significant speed boost. But this gets things started.
MinecraftForge/FML@57ad221cc6 And add the patches *sigh*
2013-04-10 18:30:25 -04:00
LexManos f755fb2ebb Optimize Texture loops a bit for non-rotated textures. Should help the FPS loss on higher resolution texture packs. If it becomes a major issue we may have to look into a more optimized animation system.
https://mojang.atlassian.net/browse/MC-13206
2013-04-10 18:30:24 -04:00
LexManos dc047fcb7a Small bugfix in Stitcher that was preventing ti from fully filling the possible texture space. Should lower the amount of empty space in textures. 2013-04-10 18:30:24 -04:00
LexManos 2de6f297e1 Small optimization for usages of Minecraft.getGLMaximumTextureSize(), only need to calculate it once. 2013-04-10 18:30:24 -04:00
LexManos 9e35cdfa33 Fix scoreboard saving bug caused by our fix of vanilla map saves. 2013-04-10 18:30:24 -04:00
LexManos f05b27c27d Deprecate long dead interface that moved to FML. remvoe next MC version. 2013-04-10 18:30:24 -04:00
LexManos f80ed1553d Updated FML: MinecraftForge/FML@1de89525cc Fixed issue with instalation when java/javac commands had quotes. 2013-04-10 18:30:24 -04:00
LexManos be80a794ac Updated FML: MinecraftForge/FML@704a70902f Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files. 2013-04-10 18:30:24 -04:00
LexManos 2ee07bb250 New hook to allow Items to provide there own armor models. Closes #487 2013-04-10 18:30:24 -04:00
ChildWalrus 0034a0c6c2 This allows the result of the explosion to take into account metadata,
tile entities, or even to cancel it altogether.

Allowed block exploding to take into account tile entity and metadata
2013-04-10 18:30:24 -04:00
LexManos 5f44333b8f Untag NBTTagList.removeTag as client side only, allowing simple removal ont he server side. Closes #477 2013-04-10 18:30:24 -04:00
LexManos 02d0e5e9ed Fix item deletion in creative menu for items that are the same id/meta but differnet NBT's. Closes #479 2013-04-10 18:30:24 -04:00
LexManos 829a60722c Allow items to provide there own FontRenderer for there tooltips. Added for #463 2013-04-10 18:30:24 -04:00
Tarion 9b58fb9384 Clarify Factory call and Event Functionality 2013-04-10 18:30:24 -04:00
Tarion aa202878e2 Added maxCanSpawnInChunk event to allow overriding of creature chunk spawn cap 2013-04-10 18:30:24 -04:00
Christian 0a1f3e3150 MCP names update 2013-04-10 12:28:20 -04:00
LexManos d89f0dc683 Re-worked the Texture patches, optifine helper function, and re-added support for dynamically rotating the texture for mod authors who do things horribly wrong. 2013-04-09 20:06:41 -07:00
Christian ff95739dc8 Fix compilation derp, and clean up rotation helper. 2013-04-09 21:20:31 -04:00
Christian 2208df18c4 And add the patches *sigh* 2013-04-09 20:26:10 -04:00
Christian 10f08460a6 Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires
texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working
properly for an even more significant speed boost. But this gets things started.
2013-04-09 20:15:14 -04:00
LexManos bc44fbe7dd Fixed issue with instalation when java/javac commands had quotes. 2013-04-05 10:26:33 -07:00
LexManos 5cd066767a Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files. 2013-04-04 23:30:10 -07:00
LexManos a44bd6dadf Add function to remove categories from a configuration, indavidual properties can be removed using ConfigCategory.remove() Closes #462 2013-04-04 18:09:01 -07:00
LexManos 814123a973 Pulled Biome Tag System by Emasher, Closes #433
An issue with biome adding mods which is becoming increasingly annoying for players, is that many mod authors that add biome specific world generation or mobs in their mods, for the most part, hard code them to work with vanilla biomes only. This becomes a huge problem when it's difficult to even find a vanilla biome, let alone a specific one, when biome mods are installed.

A simple solution to this problem is a tag system for biomes that allows mod authors to set up their world generators, or mobs to generate or spawn in biomes that have been registered with a specific tag such as "FOREST", or "FROZEN". I wrote such a system a few months ago, which I've been using with my own mods, and have made available to anyone who wants to use it. Since then, I've had requests from mod authors and players alike to try and get it, or at least similar functionality, into Forge, where other mod authors will be more comfortable using it.

Aside from the tags, it also includes a rule based system to classify biomes that have not already been registered with it when information is requested on them (You can opt out of this by registering a biome as type "NULL"). And additionally, the ability to register IWorldGenerators for specific biomes, or biome types (tags) to speed up chunk generation a little bit.
2013-04-04 17:55:35 -07:00
LexManos 6b0d1bb319 Deprecate IArmorTextureProvider, moved to Item. And exposed more information to the function. Closes #365 2013-04-04 17:28:50 -07:00
LexManos 488322baa2 Add checking for 'ENUM$VALUES' in EnumHelper. Eclipse uses it's own internal compiler which does not follow the java standard of making the values field names $VALUES and private. Instead its public and ENUM$VALUES. Closes #502 2013-04-04 16:04:04 -07:00
LexManos b3a814785c Updated FML: MinecraftForge/FML@570faeb790 Added the ability to save transformed classes to disc for debugging. 2013-04-04 16:02:00 -07:00
LexManos 2c0133af1d Added the ability to save transformed classes to disc for debugging. 2013-04-04 10:32:48 -07:00
LexManos bbe0c3c4bb Revert MinecraftForge/MinecraftForge@f594109b30 If concurancy issues arise we will reassess. The provided solution caused entities to be removed incorrectly and cause 'invisible' entities client side. 2013-04-03 04:07:01 -07:00
LexManos 0b16831ce9 Fix EntityPlayer passed to Bonemeal event. 2013-04-03 02:27:07 -07:00
LexManos 42875b70d9 Removed index bounds checking in some chunk functions, if you error blame Grum. 2013-04-03 02:07:51 -07:00
LexManos 6df717db5a Fix off-by-one in rotated textures. 2013-04-03 01:32:33 -07:00
LexManos 39ccc2e150 Fix vanilla texture bug causing rotated textures to be placed wrong. 2013-04-02 23:51:53 -07:00
Christian 5b03eb9792 Updated FML:
MinecraftForge/FML@8b8837c9ff Fix NPE when branding isn't present
2013-03-31 10:02:14 -04:00
Christian cc2bf9d8ac Fix NPE when branding isn't present 2013-03-31 10:01:46 -04:00
cpw 0b50c01fa5 Merge pull request #496 from Krapht/master
Remove a SideOnly that crashes server
2013-03-31 06:50:24 -07:00
Krapht 1ec2810bac Remove unneeded SideOnly. ref: Buildcraft/Buildcraft#710 2013-03-31 09:04:49 +02:00
Christian 727e27e191 Removed obsolete patches
Updated FML:
MinecraftForge/FML@26ccb9106e Change snooper/crash report brand handling. fmlbranding now loads another string!
MinecraftForge/FML@eff464cf0e And the core patches for that
2013-03-30 12:18:10 -04:00
Christian 5be6e8b756 And the core patches for that 2013-03-30 12:13:53 -04:00
Christian 41cd50d4c0 Change snooper/crash report brand handling. fmlbranding now loads another string! 2013-03-30 12:12:54 -04:00
Christian 5ad133c664 Sanity check the item ID for loaded liquid stacks better. 2013-03-29 21:43:59 -04:00
Christian 8a4a62ab4e Add in persistence code for LiquidTank. Using it should protect against liquids that get removed f.e. Closes #395 2013-03-29 16:21:17 -04:00
Christian b1e7248a67 Make liquidstacks immutable in their type data. Sorry about this, but it makes things a lot easier. 2013-03-29 15:40:45 -04:00
Christian fc976c7714 Fix up liquidstack so it knows about the texture sheet for it's icon 2013-03-29 12:42:55 -04:00
Christian 6b1c46cc4a Fix AT file 2013-03-28 17:41:18 -04:00
Christian b4116f1f31 Fix possible NPE in ChunkManager. Closes #478 in reality 2013-03-28 08:19:24 -04:00
Christian a7108bc2ff Fix up some liquid logic 2013-03-28 08:07:09 -04:00
Flow86 41ed59f424 fix bug #489 from #429 2013-03-28 08:07:09 -04:00
Krapht 6fe6912456 made BlockFluid.theIcon protected 2013-03-28 08:07:09 -04:00
Christian 5ac0e3a621 Updated FML:
MinecraftForge/FML@0d84487412 Fix up derp in access transformer
2013-03-27 19:27:37 -04:00
Christian 7cfb28fecb Fix hashCode 2013-03-27 19:27:00 -04:00
Christian 1bfb87a701 Fix up derp in access transformer 2013-03-27 19:23:10 -04:00
Christian 91cecec28a Use the liquid name in liquid stack persistence. Closes #429 2013-03-27 19:09:57 -04:00
Christian e5315714a9 Updated FML:
MinecraftForge/FML@2bc6a0666f Attempt to make any "default package" class public. This might fix problems with certain modloader mods that ship changes to vanilla classes.
2013-03-27 16:56:01 -04:00
Christian 27fe51a39c Attempt to make any "default package" class public. This might fix problems with certain modloader mods that ship changes to vanilla classes. 2013-03-27 16:54:26 -04:00
LexManos 2d08490a27 Bump version number for 1.5.1 Note: We really need to do this more... 2013-03-26 20:49:44 -07:00
LexManos dc05f210f5 Fix NPEs when modders stupidly register null texture names. 2013-03-26 11:11:31 -07:00
LexManos 9bb558078b Fixed issue with Event.hasAnnotation ignoring it's parameter. And cached its values for potential performance gain. Closes #482 2013-03-26 10:38:55 -07:00
Christian 891527883e Damn you python and your tab obsession! 2013-03-23 23:25:08 -04:00
Christian 626ae3a725 Changelog fixup 2013-03-23 23:18:24 -04:00
Christian 93a629dd95 Re-enable changelog? Hopefully... 2013-03-23 22:31:28 -04:00
Christian ada4bff990 Merge branch 'mithionchanges' 2013-03-23 22:03:18 -04:00
Christian 177b5123c9 Update patches! 2013-03-23 22:02:58 -04:00
Christian 8e1c8f25f3 Merge branch 'mithionchanges' 2013-03-23 16:57:03 -04:00
Christian 300f471c57 Merge branch 'mithionchanges' of github.com:Mithion/MinecraftForge into mithionchanges
Fix up code for minecraftforge style. Clean up patches.

Conflicts:
	common/forge_at.cfg
	patches/minecraft/net/minecraft/block/Block.java.patch
2013-03-23 16:56:01 -04:00
Christian f483adf8bb Updated FML:
MinecraftForge/FML@82bc9f1b35 Add some information, and a log message letting you know it worked
2013-03-23 16:01:49 -04:00
Christian a408fec0b8 Add some information, and a log message letting you know it worked 2013-03-23 16:01:20 -04:00
Christian d8a1cb87ca Updated FML:
MinecraftForge/FML@ede93d438f Validate supplied stack size
MinecraftForge/FML@d73ac867df Add a mechanism to dump the registry- useful for mod developers.
2013-03-23 15:40:05 -04:00
Christian f41210d982 Add a mechanism to dump the registry- useful for mod developers. 2013-03-23 15:39:34 -04:00
Christian 49ebcae9a1 Validate supplied stack size 2013-03-23 15:10:13 -04:00
Christian 541425309b Updated FML:
MinecraftForge/FML@5e1949eb0e Clone the itemstack, and allow for passing in a stacksize
2013-03-23 14:58:56 -04:00
Christian 4550b5795a Clone the itemstack, and allow for passing in a stacksize 2013-03-23 14:58:25 -04:00
Christian 23f4c8d817 Updated FML:
MinecraftForge/FML@2d368c4c2e Itemstacks in the GameRegistry (manual registration by mods)
2013-03-23 14:49:33 -04:00
Christian db46ea94bc Itemstacks in the GameRegistry (manual registration by mods) 2013-03-23 14:48:57 -04:00
Mithion b8856e9ed9 quick bugfix in entityenderman
reversed boolean check on event result
2013-03-23 14:15:20 -04:00
Mithion e13dff305e Ender Teleport Changes
Renamed Ender Teleport Event and added it in to ender pearls.
2013-03-23 14:12:42 -04:00
Mithion 81ff5d7896 Enderman attackEntityFrom changed
Changed so that if the teleport fails upon being attacked, Endermen will
take damage as normal.
2013-03-23 13:40:13 -04:00
Mithion 4de9793ec9 Enderman Teleport Event
New event when an enderman teleports that allows the teleport location
to either be modified or completely cancelled.
2013-03-23 12:59:06 -04:00
Mithion 833e9f0c88 Access Transformer Changes
AT changes and corresponding class changes.
Additions (all made public):
EntityLiving.targetTasks
PotionHelper.potionRequirements
PotionHelper.potionAmplifiers
PotionEffect.duration
Potion.setIconIndex
Item.setPotionEffect
Block.blockHardness
Block.blockResistance
2013-03-23 12:58:24 -04:00
Christian 4de9140a34 Add in block rotation support. It supports most vanilla blocks (hopefully), logs should be added soon. 2013-03-23 11:56:58 -04:00
Christian 88d3723e4e Fix itemframe render bug 2013-03-23 10:23:26 -04:00
Christian baf43da9a0 Fix AT config for texturemap 2013-03-22 16:54:42 -04:00
Mithion ee6dce2390 Player Flyable Fall Event
Adds an event to EntityPlayer that is posted on player fall when the
player has flight capabilities.
2013-03-22 15:05:58 -04:00
Mithion fa2cbe2671 Brewing Stand Changes
Added an event on potion ingredient applied.  Event contains the item
stacks of each of the potions being brewed as well as any remaining
ingredients.

Changed TileEntityBrewingStand and SlotBrewingStandPotion to look for
instanceof ItemPotion rather than potion.itemID
2013-03-22 15:05:23 -04:00
Mithion 2a76f7740e Entity Extended Properties Changes
Adds IExtendedEntityProperties interface, which specifies three methods
that are needed:  Init, Save, and Load.

Adds the EntityConstructing event, which is called during the
constructor of Entity.  It is needed there so that the reference is in
place during the ReadNBT call.

Adds hooks into Entity that allow registration of
IExtendedEntityProperties classes, as well as saving and loading to NBT.
2013-03-22 15:04:00 -04:00
Christian 734f434f45 Allow itemstack sensitive damage computation for attacks. Should allow
storing data in the nbt :)
2013-03-22 14:05:56 -04:00
Christian f6a2bf28fe Allow items to decide if they can or cannot have book enchantments applied 2013-03-22 12:34:19 -04:00
Christian d6b70f7b66 Updated FML:
MinecraftForge/FML@d9db27275e Fix mismatch screen a bit. Should render more correctly now and at least not be blank in a lot of circumstances..
2013-03-22 10:21:34 -04:00
Christian 1d0e8e9935 Fix mismatch screen a bit. Should render more correctly now and
at least not be blank in a lot of circumstances..
2013-03-22 10:20:53 -04:00
Christian c38467c577 Updated FML:
MinecraftForge/FML@d1ff1967b5 Fixed FMLRelaunchLog's Newline Handling
MinecraftForge/FML@591a25722b Merge pull request #208 from jrtc27/patch-1
2013-03-22 09:29:09 -04:00
cpw b6835334b2 Merge pull request #208 from jrtc27/patch-1
Fixed FMLRelaunchLog's Newline Handling
2013-03-22 05:44:38 -07:00
James Clarke 84684cf3b6 Fixed FMLRelaunchLog's Newline Handling
System.out.println("\n") causes currentMessage to start with a newline character, which means idx will always be 0 from then on. Therefore if idx is 0 messages must still be logged, otherwise no more messages sent to stdout will be logged and they will just accumulate in currentMessage.
2013-03-22 09:19:39 +00:00
Christian a754724f7f Updated FML:
MinecraftForge/FML@f709ce7579 Fix missing block world rendering
MinecraftForge/FML@748eece456 Merge pull request #206 from mDiyo/patch-1
MinecraftForge/FML@012a755bb9 Fix up patch properly. Also, fix md5s for the jars.
2013-03-22 01:51:23 -04:00
Christian 7e87a2e18f Fix up patch properly. Also, fix md5s for the jars. 2013-03-22 01:48:21 -04:00
cpw d5bce9d7f8 Merge pull request #206 from mDiyo/patch-1
Fix missing block world rendering
2013-03-21 07:41:35 -07:00
mDiyo 68f48f4acc Fix missing block world rendering 2013-03-21 07:10:55 -07:00
LexManos 411696f6b8 Merge MC 1.5.1 branch to master. 2013-03-21 04:24:44 -07:00
LexManos c33f8316d9 Merge MC 1.5.1 branch to master. 2013-03-21 04:10:30 -07:00
LexManos 727c042a0e Updated FML:
MinecraftForge/FML@625da6492d Fix install.py --mcp-dir option. Fixes #204.
MinecraftForge/FML@687d3c059d Merge pull request #204 from agaricusb/fix-mcpdir
2013-03-20 18:49:36 -07:00
LexManos 83b1acb169 Merge pull request #204 from agaricusb/fix-mcpdir
Fix install.py --mcp-dir option
2013-03-20 10:24:27 -07:00
LexManos 342a33c142 MinecraftForge/FML@aaf02ea2ac Updated for new PR client jar. 2013-03-20 09:05:58 -07:00
LexManos b6f2573adb Updated for new PR client jar. 2013-03-20 08:59:25 -07:00
Agaricus 79abc05c20 Fix install.py --mcp-dir option. Fixes #204. 2013-03-19 21:42:04 -07:00
LexManos 3d9629013b Update to 1.5.1 Pre-Release:
MinecraftForge/FML@9565529baf Updated to latest MCP and Minecraft 1.5.1 Pre-release.
MinecraftForge/FML@a573faf92d Someone derped up this function bad, revert name.
2013-03-19 18:09:48 -07:00
LexManos c0eaa8d743 Someone derped up this function bad, revert name. 2013-03-19 17:54:06 -07:00
LexManos 4900d41946 Updated to latest MCP and Minecraft 1.5.1 Pre-release. 2013-03-19 15:48:42 -07:00
LexManos 8aca6b4193 Updated FML:
MinecraftForge/FML@3c346247e1 Fix NPE with CoreMods who do not have the new MCVersion annotation.
2013-03-19 13:49:31 -07:00
LexManos 11d5ac1e07 Fix NPE with CoreMods who do not have the new MCVersion annotation. 2013-03-19 13:48:18 -07:00
LexManos f30f7cb4ab Change placement of ChunkDataEvent.Save call to apply before sending to worker thread. 2013-03-18 14:24:07 -07:00
Christian 8ab1e918f6 Updated FML:
MinecraftForge/FML@5cc90f060c Fix the logger to treat newlines better, hopefully. Closes #199
MinecraftForge/FML@5e3af8ac0e Use the relaunch log, for class circularity safety.
MinecraftForge/FML@ce949e6099 Support simple mc version test in coremods, only effective through jar loading. Also, log some more data about the environment.
2013-03-18 08:04:05 -04:00
Christian b8f72c678b Support simple mc version test in coremods, only effective through
jar loading.
Also, log some more data about the environment.
2013-03-17 23:40:12 -04:00
Christian ed17b11a76 Use the relaunch log, for class circularity safety. 2013-03-17 23:19:39 -04:00
Christian ab79ef7e19 Fix the logger to treat newlines better, hopefully. Closes #199 2013-03-17 23:15:18 -04:00
LexManos 2395699afd New TextureStitchEvents called before and after a TextureMap gathers and stitches textures together.
Also added a config option to diable the writing of resulting stitched textures to disc. Default disables the writing.
2013-03-17 20:07:30 -07:00
LexManos a964725d46 Updated FML:
MinecraftForge/FML@24022ab6ba Added comments to note FML-only methods
MinecraftForge/FML@8905237306 Merge pull request #200 from bspkrs/patch-2
MinecraftForge/FML@577b19c1cf Fix potential NPE in class loading and add extra debug information.
2013-03-17 12:01:41 -07:00
LexManos a8ae410493 Fix potential NPE in class loading and add extra debug information. 2013-03-17 11:54:26 -07:00
LexManos 458a79611b Fix placing of certian items on Redstone Blocks. 2013-03-16 23:06:58 -07:00
LexManos 71127d1cc0 Fix equipment slots for items when right clicked, and dispensed using a dispensor. 2013-03-16 22:11:55 -07:00
LexManos a30584cb64 Fix logic inversion that allowed SnowMen to create snow on hoppers. 2013-03-16 12:50:57 -07:00
LexManos 7588bec62e Prevent pistons from generating snowballs. 2013-03-16 12:50:30 -07:00
LexManos 6636a2913e Merge pull request #460 from LepkoQQ/master
Shaped Ore Recipe mirroring issue
2013-03-16 11:27:22 -07:00
Christian d52160919d Fix multipass item rendering so that it uses the right spritesheet for the item. 2013-03-16 13:44:32 -04:00
LepkoQQ f1b32126c5 Fix ShapedOreRecipe checking mirrored recipes 2013-03-16 11:57:11 +01:00
LexManos 304421a4c9 Merge pull request #459 from ChildWalrus/sleep
Made some sleep-related fields public to allow fixing of sleeping bug in new dimensions
2013-03-15 21:32:30 -07:00
LexManos 90698d64b6 Fix Activator rails activating TNT carts, closes #458 2013-03-15 21:20:29 -07:00
LexManos 66a2081d2e Merge pull request #455 from Corax/patch-1
Update ForgeDummyContainer.java
2013-03-15 20:28:02 -07:00
ChildWalrus 3e6ca3a740 Made WorldServer.allPlayersSleeping public
Made EntityPlayer.sleepTimer public

Sleep changes
2013-03-15 21:54:06 +00:00
cpw e53e39343b Merge pull request #200 from bspkrs/patch-2
Added comments to note FML-only methods
2013-03-14 18:37:08 -07:00
Christian ed8d51b021 Updated FML:
MinecraftForge/FML@c5d5f4e516 Fix AllPublic access transformer not affecting methods. Should fix modloader compatibility
2013-03-14 16:00:40 -04:00
Christian 06347b2a54 Fix AllPublic access transformer not affecting methods. Should fix modloader
compatibility
2013-03-14 15:53:19 -04:00
Corax de0910b4fb Update ForgeDummyContainer.java 2013-03-14 10:02:17 +01:00
bspkrs 30f76c67e5 Added comments to note FML-only methods 2013-03-14 01:29:36 -03:00
LexManos 8f5f4f7385 Updated FML:
MinecraftForge/FML@4762d4d8ef Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
MinecraftForge/FML@6370c242f0 OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract
2013-03-13 13:15:39 -07:00
LexManos d98a805b30 OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract 2013-03-13 13:11:43 -07:00
LexManos 99b938a800 Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX 2013-03-13 13:11:10 -07:00
LexManos df1e32d7db Remove the block if TE errors. 2013-03-13 12:40:45 -07:00
LexManos 62cb053d5f Add config toggle to atempt to remove TileEntities and Entities that error during there update without fully crashing the server, use at your own risk. Closes #424 2013-03-13 12:20:57 -07:00
Christian 981310c5a3 Updated FML:
MinecraftForge/FML@8f2dbf7046 Fix up stupid derp in IMC code: actually reset the IMC list after each delivery. Fixes a bunch of mods. Sorry everyone.
2013-03-13 15:11:07 -04:00
Christian a208d69a09 Fix up stupid derp in IMC code: actually reset the IMC list after
each delivery. Fixes a bunch of mods. Sorry everyone.
2013-03-13 15:09:50 -04:00
LexManos 95a7ec3f08 Merge pull request #449 from iChun/patch-5
[Bugfix] One should not assume an item would use the item spritesheet.
2013-03-13 11:53:50 -07:00
LexManos 58ad89ca90 Fix for nether quartz not generating in the nether, Closes #454 2013-03-13 11:51:36 -07:00
LexManos 81c00a89c5 Fix RedstoneBlock power issues, Closes #452 2013-03-13 11:49:10 -07:00
LexManos 3b40687f55 Fix bug with rendering one too many passes for ItemEntities Closes #450 2013-03-13 11:48:39 -07:00
LexManos c471a9a557 Deprecation Sweep in DungeonHooks and fixed wildcard in ChestGenHooks remove function. 2013-03-13 10:55:08 -07:00
iChun 44e690b8de [Bugfix] One should not assume an item would use the item spritesheet.
Item class has a func to return an int to use terrain.png or items.png. This makes forge take account of it.
2013-03-13 20:36:32 +08:00
LexManos ff0340f5b4 Fix missed wildcard change in OreDictionary closes #448 2013-03-12 19:44:47 -07:00
LexManos 3e1949fc1c Add call to EntityLiving when counting entities for Spawning Cap. Closes #447 2013-03-12 19:41:51 -07:00
LexManos 2cd9382bfc Move the RenderWorldLastEvent back to before renderHand like it was in 1.4 Closes #444 2013-03-12 19:14:41 -07:00
LexManos 48e95f3d44 Fix RenderItem to work with items that use the terrain texture map that aren't in the block ID range. Close #443 2013-03-12 19:02:18 -07:00
LexManos 31b908473d Fix crash when EnumHelper can't find $VALUES field, log info, and return gracefully. 2013-03-12 18:42:43 -07:00
Christian 40e7798d1e Updated FML:
MinecraftForge/FML@23ea835fa7 Pass obfuscation status to coremods
2013-03-12 21:07:25 -04:00
Christian a80049eca2 Pass obfuscation status to coremods 2013-03-12 21:06:37 -04:00
Christian 546ceaa9d8 Updated FML:
MinecraftForge/FML@d88db6c0cf Fix up deep tree deobfuscation
2013-03-12 21:06:07 -04:00
Christian 83d4be5a05 Some tweaks to the liquid dictionary, to allow for canonical liquid stacks for things like rendering 2013-03-12 20:33:50 -04:00
Christian 78732231d4 Fix up deep tree deobfuscation 2013-03-12 20:33:19 -04:00
LexManos ce2ebc1d04 Updated FML:
MinecraftForge/FML@7b722bfcd6 Update MCP for latest PR silent update.
MinecraftForge/FML@c6dab815f4 Missed joined.exc, must fix scripts.
2013-03-12 15:21:49 -07:00
LexManos 71fc1afd0d Missed joined.exc, must fix scripts. 2013-03-12 15:12:49 -07:00
LexManos 619c97a634 Update MCP for latest PR silent update. 2013-03-12 15:02:58 -07:00
LexManos ee1460d8c4 Removed get/setTextureFile from Block, nolonger used. 2013-03-12 14:47:05 -07:00
LexManos dfdef18d35 Updated FML:
MinecraftForge/FML@a90504315e Readjust size of mods button when Minecraft Realms button is enabled.
2013-03-11 16:28:19 -07:00
LexManos 81d9e8315c Readjust size of mods button when Minecraft Realms button is enabled. 2013-03-11 16:20:56 -07:00
Christian 529062d73f Fix the oredictionary for the new recipe wildcard value of Short.MAX_VALUE. 2013-03-11 17:43:23 -04:00
Christian 4d6c135182 Updated FML:
MinecraftForge/FML@3765ceb02d Update MCP, fixes the "broken texture packs" problem.
2013-03-11 16:37:53 -04:00
Christian 1f4098d779 Update MCP, fixes the "broken texture packs" problem. 2013-03-11 16:31:26 -04:00
Christian 94a0203882 Updated FML:
MinecraftForge/FML@dab22f5b74 Fix "0 mods" display when installed in forge.
2013-03-10 12:14:40 -04:00
Christian f08dec0d63 Fix "0 mods" display when installed in forge. 2013-03-10 12:12:22 -04:00
Christian 811c53e518 Updated FML:
MinecraftForge/FML@179c504746 Simplify logic in tick start/end
MinecraftForge/FML@29edd242cd Fix coremods without a manifest crashing the game. Closes #181
MinecraftForge/FML@ac16845fc4 Fix demo mode crash. Closes #187
MinecraftForge/FML@984291cee9 Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
MinecraftForge/FML@f647929993 Merge branch 'master' of github.com:Uristqwerty/FML
MinecraftForge/FML@b301e8e4c1 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189
2013-03-10 01:34:45 -05:00
Christian afb18ee321 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189 2013-03-10 01:25:36 -05:00
Christian b6d98f47a8 Merge branch 'master' of github.com:Uristqwerty/FML 2013-03-10 01:22:24 -05:00
Christian 424ba13bb2 Fix supertype parsing to handle null superclass (Hi Object!). Closes #160 2013-03-10 01:20:08 -05:00
Christian 72f55cfd08 Fix demo mode crash. Closes #187 2013-03-10 01:15:16 -05:00
Christian d3d4e7683c Fix coremods without a manifest crashing the game. Closes #181 2013-03-10 01:05:31 -05:00
Christian 4175d2f306 Updated FML:
MinecraftForge/FML@591e65fa1a Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
MinecraftForge/FML@2a779ec328 Try a different way of remapping the fields. Should work because it's userspace, not relauncher space
MinecraftForge/FML@ca2d8bd834 Fix reflection helper: it needs to unmap the classname to find the field maps.
2013-03-09 17:59:21 -05:00
Christian 796f70b545 Fix reflection helper: it needs to unmap the classname to find the field maps. 2013-03-09 17:58:18 -05:00
Christian 46b909e818 Try a different way of remapping the fields. Should work because it's userspace, not relauncher space 2013-03-09 17:36:31 -05:00
Christian a713300e0a Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
This reverts commit 485db6be2e.
2013-03-09 17:32:11 -05:00
Christian d5edaea88f Updated FML:
MinecraftForge/FML@485db6be2e Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf.
2013-03-09 17:21:13 -05:00
Christian c33cd0d9ea Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf. 2013-03-09 17:19:48 -05:00
Christian c9f6412392 Updated FML:
MinecraftForge/FML@25f3fcad46 Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too.
2013-03-09 15:30:32 -05:00
Christian 0d3d03ab83 Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too. 2013-03-09 15:25:58 -05:00
LexManos 4a0393f613 Updated FML:
MinecraftForge/FML@6bf7c9878c Fixed srg name of minecraftDir for runtime deobf.
2013-03-09 11:57:13 -08:00
LexManos d24461c50a Fixed srg name of minecraftDir for runtime deobf. 2013-03-09 11:52:40 -08:00
Christian d12554a3e2 Updated FML:
MinecraftForge/FML@95d0ff18cd Fix runtime deobfuscation for remapped inner classes
2013-03-09 14:15:14 -05:00
Christian f13437df46 Fix runtime deobfuscation for remapped inner classes 2013-03-09 14:06:39 -05:00
Christian 170d22e5ac Refresh patch 2013-03-09 13:39:12 -05:00
LexManos 3d8b247884 Updated FML:
MinecraftForge/FML@86a9c7d359 Fixup reobfusication of server code if present.
MinecraftForge/FML@8e7956397d Just enable server side compile, and warn not to complain tous.
MinecraftForge/FML@889efc1c0a Fixes GameRegistry.registerBlock
MinecraftForge/FML@fe1623a36a Merge pull request #195 from RainWarrior/snapshot15
MinecraftForge/FML@62f5adf8e2 Revert "Fix modlist to use the new texture binding functions, i think"
MinecraftForge/FML@58ee06ea8e Some fixes for the snapshot
MinecraftForge/FML@368a2245ef Merge branch 'snapshot15'
MinecraftForge/FML@1eba1dfdc0 Fix accidental commands.patch overwrite
MinecraftForge/FML@ebdb166ec8 Merge branch 'snapshot15'
MinecraftForge/FML@450dd8313c Fix up some small things, merging into mainline
MinecraftForge/FML@1642bad402 Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves.
2013-03-09 10:10:22 -08:00
LexManos a8da44fb8f Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves. 2013-03-09 10:07:41 -08:00
LexManos 14c362196e Merge remote-tracking branch 'origin/snapshot15' 2013-03-09 09:53:43 -08:00
Christian a98bf99037 Fix up some small things, merging into mainline 2013-03-09 12:39:36 -05:00
Christian 23ea71130f Merge branch 'snapshot15' 2013-03-09 12:26:14 -05:00
Christian 1176144590 Fix accidental commands.patch overwrite 2013-03-09 12:25:24 -05:00
Christian 9b8c65d3c2 Merge branch 'snapshot15' 2013-03-09 12:19:37 -05:00
Christian 3c14424e30 Some fixes for the snapshot 2013-03-09 12:10:13 -05:00
Christian 1a3022ae7a Revert "Fix modlist to use the new texture binding functions, i think"
This reverts commit 48544db690.

Conflicts:
	client/cpw/mods/fml/client/GuiModList.java
2013-03-09 11:12:12 -05:00
cpw 3f197d0b30 Merge pull request #195 from RainWarrior/snapshot15
Fixes GameRegistry.registerBlock
2013-03-09 07:07:48 -08:00
RainWarrior c2fce94d6b Fixes GameRegistry.registerBlock 2013-03-09 14:06:12 +04:00
LexManos 4945bd9d0f Fix reobf call. 2013-03-09 01:00:52 -08:00
LexManos 9a72d50dec Early define CrashReport classes to combat invalid crash details. 2013-03-08 20:31:37 -08:00
LexManos 025d4f8f25 Updated FML:
MinecraftForge/FML@f1c6bdd57d Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
MinecraftForge/FML@0419b9d975 Update MCP info for latest
2013-03-08 20:16:35 -08:00
Christian 2dece4d42a Update MCP info for latest 2013-03-08 23:14:30 -05:00
Christian 07513ff7c8 Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility 2013-03-08 23:13:39 -05:00
LexManos a91a50cd9d Deprecated Forge's ISidedInventroy, there is a vanilla solution. Added temporary config option to legacy furnace slot orientation. 2013-03-08 19:16:48 -08:00
LexManos 9f8a07f7d8 Fix typos. 2013-03-08 18:57:00 -08:00
LexManos 2488ad2826 Updated to 1.5 Pre-release
Updated FML:
MinecraftForge/FML@2d98835db8 Scala support! It's still primitive, I hope that people will like it. I do :)
MinecraftForge/FML@5bfaf7c170 Global object registry, also, support the new itemblockwithmetadata constructor
MinecraftForge/FML@80a40c03e6 Update to MCP 1.5 and minecraft 1.5.
MinecraftForge/FML@b3e854a15d Update for new MCP with srg reobf.
2013-03-08 18:48:52 -08:00
LexManos 6f124e0f1a Update for new MCP with srg reobf. 2013-03-08 18:11:44 -08:00
Christian ed3b056305 Update to MCP 1.5 and minecraft 1.5. 2013-03-08 20:36:05 -05:00
Christian 0de7554d8b Global object registry, also, support the new itemblockwithmetadata constructor 2013-03-08 13:17:12 -05:00
Christian 304e717aea Scala support!
It's still primitive, I hope that people will like it. I do :)
2013-03-07 20:22:24 -05:00
Christian 667fda257a Updated FML:
MinecraftForge/FML@e9ff699c2d Refresh the renderengine after modloading is complete. Should fix issues with out-of-place texture registration by mods.
MinecraftForge/FML@a723aa6860 Refresh copyright notices on everything
MinecraftForge/FML@c42a210140 Strip deprecated code
MinecraftForge/FML@6eeae8c49f Fix up state transition derp when the server crashes with an error- it shouldn't double-derp
MinecraftForge/FML@81c6421f84 Tweak license text- any osi licensed project can use the asm transformer code
2013-03-07 19:45:32 -05:00
Christian 88c7b12ba3 Clean up Access Transformer mapping data 2013-03-07 19:44:26 -05:00
Christian f744cd0686 Tweak license text- any osi licensed project can use the asm transformer code 2013-03-07 19:41:52 -05:00
Christian 845a9c5792 Fix up state transition derp when the server crashes with an error- it shouldn't double-derp 2013-03-07 19:37:52 -05:00
Christian ba5165f86b Strip deprecated code 2013-03-07 19:33:34 -05:00
Christian d2509a70b7 Refresh copyright notices on everything 2013-03-07 19:25:48 -05:00
Christian 545d5e0524 Refresh the renderengine after modloading is complete. Should fix issues with out-of-place texture registration by mods. 2013-03-07 19:02:26 -05:00
LexManos e7f7c6417f Make release quit on compile error. 2013-03-06 20:45:40 -08:00
LexManos 2c07b18e1a Fix compile error, forget to flush to disc. 2013-03-06 19:26:29 -08:00
LexManos 6b5a086be3 Readd second render pass to TileEntities and Entities, patches were missed when merging in master branch. As note, CB can DIAF. 2013-03-06 19:18:26 -08:00
Christian e5913fb29f Add an Icon to the LiquidStack, for rendering the liquid in various ways 2013-03-06 20:54:24 -05:00
Christian b0e42ebcea Updated FML:
MinecraftForge/FML@abe4f73a9a FIX massive performance issue with FML. Thanks to @sfPlayer1 for finding this epic derp on my part!
2013-03-06 14:07:06 -05:00
Christian e7e2ffd8fb FIX massive performance issue with FML. Thanks to @sfPlayer1 for finding
this epic derp on my part!
2013-03-06 14:00:28 -05:00
Christian f5ba66068a let's do it right this time. Hmmm 2013-03-06 13:32:34 -05:00
Christian 101ae36f57 Call stitcher for non-existent textures as well. Probably allows
for generated textures. Hmmm
2013-03-06 10:29:25 -05:00
LexManos 5ff9983772 Updated FML:
MinecraftForge/FML@debbdc00be Capture Minecraft logs into FML logging
MinecraftForge/FML@74fffc6fdc Update next render to 40
2013-03-05 15:46:26 -08:00
LexManos c2b610d335 Fix ItemSeedFood respecting custom soils. 2013-03-05 15:44:31 -08:00
LexManos 43a1bf1425 Removed erroring imports and update build function to die on errors. 2013-03-04 20:57:42 -08:00
LexManos 20db933cee New world event for controlling potential entity spawnlists. For #430 2013-03-04 20:29:05 -08:00
Christian 56be84a3b8 Update next render to 40 2013-03-04 22:52:24 -05:00
Christian 9cbf2a08e9 Capture Minecraft logs into FML logging 2013-03-04 22:45:58 -05:00
LexManos ebdc10eb1d Add callback on TextureStitched to control texture loading. 2013-03-04 19:36:19 -08:00
LexManos 2e947b364c Add helper functions for deling with custom TextureStitched 2013-03-04 18:55:15 -08:00
LexManos 88e44f0761 Fix animation location for textures with domains 2013-03-04 18:54:21 -08:00
LexManos 432e08b5d6 Updated FML:
MinecraftForge/FML@aed2cc446a Force file name encoding to UTF-8, caused different zips on different systems.
2013-03-04 18:29:23 -08:00
LexManos 95497900c3 Force file name encoding to UTF-8, caused different zips on different systems. 2013-03-04 18:19:06 -08:00
LexManos 493cb50583 Fixed new python changes. 2013-03-04 17:21:15 -08:00
LexManos 16475908be Rework configuration, configs should now use Config.hasChanged to deterne if thehould call save(), also re-worked the saving to not use String.format as much. 2013-03-04 16:33:52 -08:00
LexManos 1860885fee Copy over some needed files for debugging. 2013-03-04 16:33:02 -08:00
Christian b644696668 Update submodule 2013-03-03 22:45:09 -05:00
LexManos 8daafa79b6 Change FML module to read-only connection. 2013-03-03 19:41:13 -08:00
LexManos 00c596f5a3 Update python scripts to reflect that FML is now a submodule. Delete updateasmdata as it's in /fml/ now. Build should work once again. 2013-03-03 19:30:23 -08:00
LexManos f7d6c2384c Remove window helper batch files. 2013-03-03 18:51:39 -08:00
LexManos 95ba5f4e3a Removed GNUWin32 files and uneeded files seince FML is now a submodule. 2013-03-03 18:36:38 -08:00
LexManos d1479d1a77 Added submodule changelog ganerator:
Updated FML:
MinecraftForge/FML@e74087ee43 Ignore again, testing submodule.
2013-03-03 14:09:48 -08:00
LexManos d6a86916eb Testing selective commit of submodule. 2013-03-03 12:03:46 -08:00
LexManos 530b6fb074 Ignore again, testing submodule. 2013-03-03 11:54:53 -08:00
LexManos fd94a8f541 Ignore this commit. 2013-03-03 11:52:47 -08:00
Christian 59b8e5e93c Add in simple texture management for mods using the stitcher. Scope with "{domain}:{texture}" to
get textures that are not at /textures/<item|block>/{texture}.png but /mods/{domain}/textures/<item|block>/{texture}.png
instead
2013-03-03 14:11:31 -05:00
Christian 72e013fb66 Fix up patches for FML, also, add in FML as a submodule rather than a zip 2013-03-03 14:05:34 -05:00
Christian a37607979d Ignore deobf data 2013-03-03 14:04:41 -05:00
Christian c8a403fa24 Force the joined.srg timestamp to zero- avoids annoying sha1 differences 2013-03-02 15:06:13 -05:00
Christian 879213019b Don't enforce signatures on minecraft classes 2013-03-02 14:48:08 -05:00
Christian b1e826eb62 Update MCP URL for snapshot 2013-03-02 10:56:25 -05:00
Christian 3a2d167885 Fix up runtime deobfuscation. Working well now. 2013-03-02 10:46:32 -05:00
Christian 429dfc3d3d Build, and use, MC versioned deobfuscation data 2013-03-02 10:30:45 -05:00
Christian 245e7312b2 Merge branch 'runtimedeobf' into snapshot15 2013-03-02 10:04:06 -05:00
Christian 8b8b150aa9 Add in build for deobf data zip file, update for official mcp 7.39 2013-03-02 10:02:02 -05:00
LexManos 9bd8f2697c Updated Forge to s13w09c 2013-03-02 03:08:27 -08:00
LexManos 97f2bbe5dd Fix exc for renamed Behavior classes. 2013-03-02 00:48:44 -08:00
LexManos a0a4683ef9 Actually remove classes from the csv when removed, and moved All EntityMinecart entities to net.minecraft.entity.item 2013-03-02 00:12:31 -08:00
LexManos 5ef2c4c5ab Delete unneeded patch 2013-03-02 00:11:48 -08:00
LexManos e0c7e3859d Readd ignore for argo and bouncycastle, needed for our replacement to work properly. 2013-03-02 00:11:33 -08:00
Christian 793ae904af Update FML to 1.5 snapshot 13w09c 2013-03-02 02:06:32 -05:00
Christian f9094e3f85 Tweaks to runtime deobf 2013-03-02 01:49:45 -05:00
LexManos 81bf16decd Update distribuited eclipse's classpath for updated libraries. 2013-02-28 04:22:34 -08:00
LexManos ed55969932 Not supposed to have debug stuff... 2013-02-28 03:59:57 -08:00
LexManos a04e7912b0 Sync up with FML, Will not run nativly as you need deobfusication_data.zip in your libs folder.
We have not setup the download for that yet, to make it yourself just zip joined.srg name it deobfusication_data.zip and put it in lib
2013-02-28 03:53:42 -08:00
LexManos 4272159492 Fix crash in GuiModList for mod logo files, logo is not rendering for unknow reason. 2013-02-27 22:41:00 -08:00
LexManos d8e82d4c35 Fix bug in rename_vars where certian items would fail to be renamed. 2013-02-27 22:40:15 -08:00
Christian 082ee1a5ea Merge branch 'master' into snapshot15
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.35.556-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
2013-02-27 23:19:11 -05:00
LexManos a766603b38 Merge commit '695b080197bd577cc34fe6dbc72b74f4a74b2d5c' into snapshot15
Testing cherry picking.
2013-02-27 00:57:35 -08:00
LexManos 3d48e707e8 Just enable server side compile, and warn not to cmplain to us. 2013-02-26 14:54:18 -08:00
LexManos 685aecddac Fixup reobfusication of server code if present. 2013-02-26 14:34:51 -08:00
Christian e7b1242cfb Tweak IASM hook api. You can return multiple classes now. 2013-02-26 15:04:45 -05:00
Christian e4dd3791ef Merge branch 'runtimedeobf' into snapshot15 2013-02-26 10:24:03 -05:00
Christian 7b0745c336 Change readFully to actually read a bunch of bytes at once now. Thanks to nallar and aartbluestoke for the suggestion to
revisit this..
2013-02-26 01:07:14 -05:00
Christian 2e269c967a Clean up more junk 2013-02-26 00:28:12 -05:00
Christian b5ba054fe5 Update libs for 1.5. Lots of new libs. 2013-02-26 00:16:57 -05:00
Christian 939bf833b3 Fix renderengine patch *sigh* 2013-02-25 22:06:20 -05:00
Christian 22831e6b63 Merge branch 'master' into snapshot15
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
2013-02-25 21:53:56 -05:00
Christian c056f49796 Merge branch 'master' into snapshot15
Conflicts:
	client/cpw/mods/fml/client/TextureFXManager.java
2013-02-25 21:18:08 -05:00
LexManos a520e128d7 Fix TESR culling for beacons, and implement a good enough measure for Chests. 2013-02-24 22:55:48 -08:00
LexManos a0bc6a3ed0 Bump version to 6.6.2, declaring Forge for MC 1.4.7 feature complete, as 1.5 is on the horizon, only bug fixes from this point on. Unless something major happens on Mojang's end. 2013-02-23 14:20:49 -08:00
LexManos 0f696c3739 Add water and lava to liquid dictionary by default, closes #419 2013-02-23 13:53:05 -08:00
LexManos f0ea9c9106 Store the glMultiTexCoord lightmap for later use with glDrawArrays closes #406 2013-02-23 13:50:12 -08:00
LexManos 3530e0d861 Added unload event for client worlds Closes #405 2013-02-23 13:41:43 -08:00
LexManos a7cdcc1f33 WorldGen*Trees shoud not respect custom soils. Closes #355 2013-02-23 13:07:00 -08:00
LexManos 0396ba2252 ItemStack sensitive versions of Item.getPotionEffect and Item.isPotionIngredient Closes #321 2013-02-23 12:02:36 -08:00
LexManos f703dbb230 clarify what the size is measured in for the dormant chunk cache. -.- 2013-02-23 11:51:16 -08:00
LexManos b754d6f301 Fix movement speed check, closes #420 2013-02-23 11:30:56 -08:00
LexManos d9ebd3fb53 Change usage of ketSet/get to entrySet in OreDictionary, closes #422 2013-02-23 11:22:01 -08:00
LexManos 3945819851 Fixed entity colision above max world height, and below 0. Closes #400 2013-02-23 10:59:44 -08:00
LexManos d50f150c56 Disable automatic equiti of pcke dup items for players, and fixed index issues in Player.setCurrentItemOrArmor. 2013-02-23 10:42:33 -08:00
cpw 53855cc96b Merge pull request #188 from immibis/master
Console log thread should be a daemon thread.
2013-02-22 22:35:14 -08:00
immibis 75c1dc1091 Console log thread should be a daemon thread. 2013-02-23 19:27:16 +13:00
LexManos feca047114 Update FML to 556:
b6d6f235 Fix sprite map issue.
1158aa46 Fix Language Registry, closes #FML 163
50ce6fb3 Option to disable renaming for srgnames.
2013-02-22 15:01:45 -08:00
LexManos 604e81a323 Fix sprite map issue. 2013-02-22 14:45:25 -08:00
Christian ad582c82a0 Merge branch 'master' into runtimedeobf 2013-02-17 16:29:13 -05:00
Christian 4cafd6c627 Fix Language Registry, closes #163 2013-02-17 16:28:54 -05:00
Christian d25d70d59d Fix Language Registry, closes #163 2013-02-17 16:22:58 -05:00
Christian 047de02402 Merge branch 'master' into runtimedeobf 2013-02-16 14:28:29 -05:00
LexManos 53aac39d90 Jenkins needs this script, *pokes Overmind* -.- 2013-02-15 05:11:55 -08:00
LexManos 307dd48229 Fix profiler issue with RenderGlobal patch. Closes #414 2013-02-15 04:56:55 -08:00
LexManos 183b3e6316 Fix EventTransformer throwing an NPE when transforming a class that doesn't exist. Closes #413 2013-02-15 04:53:56 -08:00
LexManos e11feec55f Fix fortune modifier always passed as 0 to idDropped closes #412 2013-02-15 04:49:33 -08:00
LexManos dcdd7c6c0e Fixes comparison for items in creative inventory, closes #411 2013-02-15 04:43:20 -08:00
LexManos ace8c29085 Added a hook into SlotArmor so Items can control if they are classified as a Armor type. Closes #408 2013-02-15 04:25:08 -08:00
LexManos 1c57f03722 Add item frame transformations to the EntityItem render helper Closes #407 2013-02-15 04:10:49 -08:00
LexManos 0a2e78d0c6 Made LiquidStack.isLiquidEqual(ItemStack) properly check the contained liquid, in addition to obvious id/meta closes #399 and closes #403 2013-02-15 04:00:46 -08:00
LexManos 6e302a1350 Kill .sh wrappers until someone writes more robust versions, closes #392 and closes #402 2013-02-15 03:38:46 -08:00
LexManos 57b77ce17e Actually use the line parameter in ServerChatEvent, closes #401 2013-02-15 03:22:59 -08:00
LexManos f1987359c9 Kill generated timestamp in config files, if you want to retreive this information, usethe file's modified time. Closes #404 2013-02-15 03:18:36 -08:00
LexManos bd25e14545 Option to disable renaming for srgnames. 2013-02-08 14:50:17 -08:00
Christian 6673844c54 Fix ServerBrand retriever- forge is now forge,fml!
Update FML: cd96718
cd96718 Fix HD mob skins, FINALLY!!! Stupid eyes are stupid.
2013-02-06 20:28:54 -05:00
Christian ae58a0dbe3 Fix HD mob skins, FINALLY!!!
Stupid eyes are stupid.
2013-02-06 01:25:46 -05:00
Christian afea4fce1d Remove the single use interface ITickingArmor, and apply to Item directly. 2013-02-04 17:53:47 -05:00
Christian 40a3660c93 Fix possible null case for collision bounding box. 2013-02-04 13:58:55 -05:00
Christian 7e5a9076f0 Fix TESR rendering for double chests 2013-02-04 11:19:39 -05:00
Christian c5bb9fc78f Merge branch 'TESRculling' 2013-02-04 11:13:29 -05:00
Christian fbf9527be3 Add in "armor ticking"- implement the interface and the armor piece will tick.
Update FML:22dbe41
22dbe41 Fix up mistake that broke all modloading. Nice.
2013-02-04 11:07:53 -05:00
Christian 06eea87b71 Fix up mistake that broke all modloading. Nice. 2013-02-04 10:58:48 -05:00
Christian 11f226e813 Fix some class naming and packaging issues, pending an MCP update
for the same
2013-02-02 10:54:48 -05:00
Christian 92a377a4e8 Update for MCP 7.34 and MC 13w05b 2013-02-01 23:05:23 -05:00
Christian 74043f515f MCP compilation works 2013-02-01 22:42:28 -05:00
Christian 3a0634b5d1 Update FML:549b6fd
549b6fd IMC tweaks: runtimeMessages now work (thanks for all that testing for this much requested feature!) and IMCEvent will no longer rem
9fafdc1 More logging tweaks. You can probably configure individual mod log files if you wish now
f169f7c A log of logging cleanup. FML will now read logging.properties to configure logging channels a couple of times during startup. You
3ac891f Try and handle "death on startup" a bit cleaner
2dc0189 Deprecate the old GUI ticktype. They're dead and have been for some time.
dd98784 Tweak a method signature
1c9a510 Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling serv
1bd6847 Fix up packages.csv ordering for easier diffing
2013-01-31 13:51:56 -05:00
Christian fb46c7a01f Fix small derp in TE 2013-01-31 13:46:29 -05:00
Christian 3101006e58 IMC tweaks: runtimeMessages now work (thanks for all that testing for this much requested feature!)
and IMCEvent will no longer remove messages if no one gets them, so you can do
just manual runtime polling, if you wish.
2013-01-31 13:39:53 -05:00
Christian 46ccfb235d More logging tweaks. You can probably configure individual mod log files if you wish now 2013-01-30 20:55:12 -05:00
Christian 0c6019da8f A log of logging cleanup. FML will now read logging.properties to configure logging channels a couple of times during startup.
You should be able to filter a lot of messages based on things like modid and certain FML related features that can be noisy
like item tracking.
Should close #175
2013-01-30 18:57:21 -05:00
Christian 0f3bd780e1 Merge branch 'master' into TESRculling 2013-01-29 10:01:00 -05:00
LexManos 1dc9ef9b08 Fix initalization issue with the clamping threshold config value. And remove vanilla console spam related to it. 2013-01-29 03:11:59 -08:00
LexManos 4299aa22ff Change WorldServer.allPlayersSleeping to public, and remove the SideOnly annotation on EntityPlayer.getSleepTimer() Closes #393 2013-01-28 18:12:29 -08:00
LexManos 40392216b3 Change access of upper and lower chest fields of InventoryLargeChest to public. Closes #387 2013-01-28 18:08:38 -08:00
LexManos 6d6405973c Added catch to TileEntityChestRenderer for potential crash when modders do bad things -.- Closes #389 2013-01-28 18:05:38 -08:00
LexManos 704f879320 Rework canSilkHarvest hook to try and honor vanilla overrides, should close #391 2013-01-28 17:51:48 -08:00
LexManos fb87773c3a Added input getters for Ore recipies, and javadoc warning for modders, #390 2013-01-28 17:33:53 -08:00
LexManos c58433692c Add DimensionManager.unregisterProviderType for PR #388 2013-01-28 17:26:02 -08:00
LexManos fbe86287b4 Fixup a resource leak warning. 2013-01-28 17:06:45 -08:00
LexManos 89e695cee9 Forge Additions: Exposed ChunkCache.worldObj to public PR #383 2013-01-28 17:02:31 -08:00
LexManos 30db577389 Moved warning logic down, so that no more tickets are isues if the mod is over it's alotment. Fixes #378 2013-01-28 16:36:03 -08:00
Christian 7c6c1254fc Final part of the deobfuscation data setup- fields are now deobfuscated as well.
All that remains, is to figure out what and how to distribute the deobfuscation data itself.
2013-01-28 17:48:44 -05:00
Christian 0c4347f2c3 Read the joined.srg file directly from lib/deobfuscation_data.zip now. Still debating distribution method. 2013-01-28 17:39:22 -05:00
Christian b41af51ccf Now actually works for mods, somewhat. It currently generates access violations for
ModLoader mods that presume access to fields that are not actually accessible from
a different package.
2013-01-27 22:42:36 -05:00
Christian 9c2b899454 Method deobfuscation now works 2013-01-27 21:50:08 -05:00
Christian 82415f3962 Working to read class names and remap them at runtime. 2013-01-27 17:09:00 -05:00
Christian b4c7fe1d0e First draft runtime deobf 2013-01-27 15:55:37 -05:00
Christian 5c99e3488a Try and handle "death on startup" a bit cleaner 2013-01-27 15:54:36 -05:00
Christian f06e0be5e5 We try and log a message if we detect a world leak: it's probably not infallible, but it should
help mod developers- if you see this when testing your mod with, say, mystcraft, you're probably
keeping a hold of an invalid handle to the World (either directly, or indirectly via Entity or TileEntity)
and you should look to refactor to wrap those handles in WeakReferences
2013-01-27 10:43:35 -05:00
Christian b386565881 Add in a mechanism for explicit subclassing of WeightedRandomChestItem to allow for
generational style chest content generation rather than static. Cleans up some old code nicely
2013-01-26 14:12:46 -05:00
Christian c483f68b26 Bump the revision number for the TESR and renderpass changes 2013-01-26 12:35:01 -05:00
Christian b164f9b21e Merge branch 'renderpass' of https://github.com/Chicken-Bones/MinecraftForge into TESRculling
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
	patches/minecraft/net/minecraft/entity/Entity.java.patch
	patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
2013-01-26 12:12:21 -05:00
Christian 70ca0eeb74 Add in TESR culling, and a new TileEntity method to allow for differential sizing of the
TESR view culling vs the TE collision bounding box (the former defaults to the latter)
Checked into a branch because it's likely to break expanded TileEntities.
2013-01-26 11:11:20 -05:00
Christian 695b080197 Fix NPE causing issue with the cache. Derpy derp. 2013-01-26 10:24:48 -05:00
Christian ae7e328228 Fix a potential problem with "Entity already added" when using the dormant
chunk cache capability. The entities in the dormant chunk cache will get new
IDs prior to the cached chunk returning.
2013-01-25 21:21:20 -05:00
Christian c19646421a Deprecate the old GUI ticktype. They're dead and have been for some time. 2013-01-24 17:29:46 -05:00
Christian 3dbffd1754 Tweak a method signature 2013-01-24 10:23:36 -05:00
LexManos d9db242f4c Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling server. 2013-01-24 03:08:19 -08:00
Christian f20ea649c6 Attempt to fix a possible NPE in the face of ChickenBones' hackery. ChickenBones. stop it! 2013-01-23 23:36:59 -05:00
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 331e6bcf62 Merge branch 'master' into snapshot15
Fix up compilation and patching errors

Conflicts:
	common/cpw/mods/fml/common/registry/GameRegistry.java
	conf/joined.srg
	conf/params.csv
	conf/version.cfg
	patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
2013-01-22 15:21:22 -05:00
Christian 1b332fc1ea Fix up packages.csv ordering for easier diffing 2013-01-22 14:43:27 -05:00
Christian 51fcf93605 Update for MCP7.30c - fixes redstone rendering issues 2013-01-22 14:40:09 -05:00
Christian c77cb8ba53 Update FML:aebf6eb
aebf6eb Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definiti
2013-01-22 13:53:46 -05:00
Christian 472ca8c8a9 Add in a registry method to allow for alternative TileEntity names- they will be used to support
loading maps containing the older definitions.
2013-01-22 13:11:32 -05:00
Chicken Bones 323517e88b Gave entities and tile entities access to the second render pass for translucency. 2013-01-23 03:07:00 +10:00
Christian a5325cf0a8 Change DimensionManager.getCurrentSaveRootDirectory() to try and work even for the new server about to start event
Update FML:8921cfe
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. A
2013-01-22 10:07:41 -05:00
Christian c13502c690 Remember to add the new patches! 2013-01-22 09:32:53 -05:00
Christian 6962786e4b The "ServerStarting" event should now properly crash the server if it fails,
so the client will properly exit. Also, added in a "pre-server-start" event
that fires before the worlds are loaded for a save, just for you immibis.
2013-01-22 09:17:04 -05:00
Christian c40c81924a Some javadoc fixes 2013-01-21 21:57:48 -05:00
Christian 509b5f8e7e Javadoc cleanup 2013-01-21 21:37:29 -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 bdcaa0024a Update FML: 5ce4e31
5ce4e31 Fix breaking change
2013-01-20 18:46:28 -05:00
Christian 825ecf1a7f Fix breaking change 2013-01-20 17:54:56 -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 2e1ea20952 Update FML: a99c488
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
aa822e3 Fix logical error in comment text
26a5b31 FMLLogFormatter: dynamic log level name
2013-01-20 11:42:08 -05:00
Christian 7f4818fd94 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates 2013-01-20 11:31:47 -05:00
Christian b52c44e42b Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates 2013-01-20 11:31:24 -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
Christian 2c58102515 Update MCP to MCP7.26a and refresh MCP names 2013-01-20 10:30:36 -05:00
Christian 3ddf9b2382 Update address of the FML repository to the new location in all the files 2013-01-18 21:26:43 -05:00
CovertJaguar 78a3d1a656 Fixed render passes for EntityItems
Should be < instead of <=
2013-01-18 12:06:29 -08:00
bspkrs cb769265f0 Fix logical error in comment text 2013-01-16 23:49:09 -05:00
Christian d576691bfa Update license text to make clear that FML is not a way to sidestep
MCP licensing.
2013-01-15 16:54:26 -05:00
LexManos 875709931c Bump major and minor version numbers to mark 1.5, it's gunna break everything. Should be a compileable 1.5 build. 2013-01-12 20:44:31 -08:00
LexManos 1155235d92 Fix check in getItem() to allow lowest item ID #361 2013-01-12 16:30:08 -08:00
LexManos 2c974a55ac Update FML:
New scripts for signing jars, and repackging source folders.
Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in all languages now (assumes UTF-8)
Fix incorrect end length calculation. Closes #161 Thanks BStramke!
2013-01-12 16:29:48 -08:00
LexManos 8bc11fbb27 Merge pull request #370 from CovertJaguar/snapshot15
MCL Update
2013-01-12 15:30:53 -08:00
Christian 180173fa94 Fix mcp conf md5 signatures for the snapshot 2013-01-12 14:25:03 -05: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 c229018c9e Updated FML and at config for 1.5 snapshot 2013-01-12 00:06:37 -08:00
LexManos 3fc95b71e2 Update patche for jad-style names. 2013-01-11 23:46:08 -08:00
donington 3e4ed24750 FMLLogFormatter: dynamic log level name
FMLLogFormatter now uses getLocalizedName or getName for log level name

Changes to be committed:
	modified:   common/cpw/mods/fml/relauncher/FMLLogFormatter.java
2013-01-12 00:42:36 -05:00
Christian 334e386b56 Temporary hosting 2013-01-12 00:38:42 -05:00
Christian c048ec7aef Another packaging update. I think we're done now. 2013-01-12 00:33:32 -05:00
Christian 3e5a3fb0e4 Fix modlist to use the new texture binding functions, i think 2013-01-12 00:27:11 -05:00
Christian 59af780c91 A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone 2013-01-12 00:17:35 -05:00
Christian cad228093d Delete old patches not needed anymore 2013-01-11 23:53:14 -05:00
Christian 431372dc5f Initial patch update for snapshot 2013-01-11 23:47:05 -05:00
Christian 31faf09c49 Initial setup for snapshot- the client compiles, but patches fail to apply. 2013-01-11 22:49:09 -05:00
LexManos 674a9e5e52 Updated patches for new JAD style names. 2013-01-11 13:16:40 -08:00
LexManos 04e4ce6266 FML will now rename local variables to have JAD-style names instead of FernFlower var## names. New script to do this, to allow for modders to run it over there own code: python rename_vars.py -mcp [folders to rename]... 2013-01-11 13:16:23 -08:00
Christian 8edde44161 Fix incorrect end length calculation. Closes #161 Thanks BStramke! 2013-01-11 09:41:47 -05:00
Christian 79c7933b5e Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in
all languages now (assumes UTF-8)
2013-01-08 08:46:50 -05:00
cpw 256aef5e0f Merge pull request #158 from CovertJaguar/patch-2
Added an accessor for villagers
2013-01-08 05:36:45 -08:00
CovertJaguar 224d933564 Added an accessor for villagers 2013-01-07 14:55:17 -08:00
LexManos 550928735e New python script to update java files for new package names. Usage: paython update_packages.py --mcp-dir <mcp folder> [Folders To Repackage] 2013-01-06 22:10:19 -08:00
LexManos 00f65d2c40 New python script for signing partial jar files. See comments inside for details. 2013-01-06 22:09:12 -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
LexManos 170585960b Some small code cleanups. 2013-01-01 20:57:45 -08:00
LexManos c96b923e1c Fixed issue where ChunkPriderEvent.InitNoiseField used the wrong sizeY value. 2013-01-01 20:55:37 -08:00
LexManos 9fe0b4dfba Fix issue where dungeon loot table had wrong values. 2013-01-01 20:54:55 -08:00
Christian 53c579b8d2 Update FML:6f1b762
6f1b762 Move server stopped *after* the server has actually stopped. *sigh*
2012-12-31 11:21:36 -05:00
Christian 55ca46b382 Move server stopped *after* the server has actually stopped. *sigh* 2012-12-31 01:20:35 -05:00
Christian 5e4315415d Update FML:d9bfb29
d9bfb29 Add in a "server stopped" event
2012-12-31 00:03:09 -05:00
Christian 80193d4969 Add in a "server stopped" event 2012-12-30 23:52:38 -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 937c84090f Update FML:6fc7bc4
6fc7bc4 Add in some classloader debugging information: use fml.debugClassLoading=true as a system property to track down prob
2012-12-30 22:56:04 -05:00
Christian 2454ed0fbf Add in some classloader debugging information: use fml.debugClassLoading=true as a system property
to track down problems with classes not being found or loading erratically.
2012-12-30 21:32:37 -05:00
Christian e2dc263f12 Fix noisy exception logging 2012-12-30 21:30:48 -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 3715b73f05 Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1.4.6 to 1.4.7 compatibility 2012-12-29 00:00:24 -05:00
Christian 19347c5322 Update for MC 1.4.7
Update FML: f7cc50b
2012-12-28 12:06:56 -05:00
Christian 964c51f4ae Update for MC 1.4.7 2012-12-28 10:07:53 -05:00
LexManos 0c5563fbf5 Attempt a fix for the new chunk compression changes. 2012-12-27 22:13:46 -08:00
Christian 2ad434fda4 Update FML:1a232cf
1a232cf Fix multiple GUI containers for ML containers. Sorry ultimatechest that this fix took so long, a bug report at
853f54b Log if there's a problem reading the class bytes
2012-12-27 23:19:12 -05:00
Christian bf9272f61e Fix multiple GUI containers for ML containers. Sorry ultimatechest that
this fix took so long, a bug report at github.com/cpw/FML would help,
next time ;)
2012-12-27 23:00:52 -05:00
Christian 193aae6030 Log if there's a problem reading the class bytes 2012-12-27 23:00:37 -05: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 91c8ca5379 Fixed typo in dungeon loot 2012-12-25 22:03:11 -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 da1679a061 Merge branch 'Uristqwerty-master' 2012-12-25 22:11:42 -05:00
Christian 5fef1d5e9b Merge branch 'master' of https://github.com/Uristqwerty/MinecraftForge into Uristqwerty-master 2012-12-25 22:11:26 -05:00
Christian 7553f98367 Protect deflation with a simple semaphore. Should close #336 2012-12-25 22:06:20 -05:00
LexManos 58dc621fb7 Update FML: Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent 2012-12-25 16:15:35 -08:00
LexManos 95f0315634 Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent 2012-12-25 15:59:30 -08:00
Uristqwerty 09ab39a238 Force parent ListenerListInsts to rebuild.
Without this change, it is possible (and, in fact, nearly guaranteed) for lists to rebuild endlessly if a parent list is marked as needing a rebuild but never actually read. This change forces the parent list(s) to rebuild as well, resulting in a significant performance increase and smoother framerate due to greatly reduced GC activity.
2012-12-24 20:40:09 -05:00
Christian 81f0de81ea Update FML: 7e6456d
7e6456d Fix a message delivery issue in IMC
664ebda Some tweaks for signing and ID matching
2012-12-24 10:03:11 -05:00
Christian 35ee8510fe Fix a message delivery issue in IMC 2012-12-24 09:41:22 -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 e34e3a44fe Fixed parameter ordering u.u 2012-12-24 01:39:08 -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 052d798970 Some tweaks for signing and ID matching 2012-12-23 22:27:26 -05:00
Christian 3ee114c9b4 Some access transformations to allow mystcraft to work again. Closes #331 2012-12-23 15:32:25 -05: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
LexManos 662bb5f363 Update FML:
Fixed issue with users who don't have the JDK installed in there path
MCP will now output bfusicated files with windows reserved names to _name.class and FML will prioritize those names.
Fixed placement of onConnectionClosed callback
2012-12-20 15:00:16 -08:00
LexManos 484a673b1f Remove unneeded file 2012-12-20 14:30:59 -08:00
LexManos c5a1b58d85 Fixed placement of onConnectionClosed callback. 2012-12-20 14:30:41 -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 a085a9c95e Access Transform a couple of methods 2012-12-20 08:25:39 -05:00
LexManos 909b629fa4 MCP will reobf classes with reserved names in windows to a legal file name. And FML will try to read these classes over the default ones. 2012-12-19 19:10:00 -08:00
LexManos 48551959ec Output obfed files with reserved windows names to _NAME.class 2012-12-19 18:12:11 -08:00
LexManos 211800e390 Merge remote-tracking branch 'origin/master' 2012-12-19 13:42:47 -08:00
LexManos 09505c636c Fixe BiomeDecorator AT entry. 2012-12-19 13:42:22 -08:00
LexManos c77f20ae17 Add quotes around javac command. 2012-12-19 02:58:09 -08: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 d8dda4c2fd And fix up the other equals 2012-12-18 18:12:22 -05:00
Christian c976aae00c Fix comparing ItemStack tags for equality 2012-12-18 18:02:41 -05:00
Christian f5e800d288 Update FML: 40e57a2
40e57a2 Update MCP to newer version Fix fingerprint fire
2012-12-18 17:08:29 -05:00
Christian 6201e51134 Update MCP to newer version
Fix fingerprint fire
2012-12-18 16:43:48 -05:00
Christian 0b9727305e Fix accidentally removed not-deprecated methods.
Update FML: d604e44
d604e44 InterModComms now supports a runtime polling based model for inter-mod comms at runtime. Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
8b7778c Don't be as alarming about item overwrites.
2012-12-18 14:17:56 -05:00
Christian 2fc0ba693c InterModComms now supports a runtime polling based model for inter-mod comms at
runtime.
Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
2012-12-18 13:58:57 -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
Christian 926766b487 Don't be as alarming about item overwrites. 2012-12-18 08:33:46 -05:00
LexManos 3d7bb9c472 Updated FML:
Fixes startclient/startserver

Added configuration file which allows modids to ignore ID validation checking. IT WILL CRASH YOUR GAME in 99.999% of cases.

Immibis is a whingy ass. And TinyTimRob too. Now STFU and GTFO. closes fml/#510 for ever.
2012-12-18 05:28:53 -08:00
LexManos 9833c5652c Removed all functions marked as deperacted for the new MC version 2012-12-18 05:28:09 -08:00
Christian 7caae273c5 Added configuration file which allows modids to ignore ID validation checking. IT WILL CRASH YOUR GAME in 99.999% of cases.
Immibis is a whingy ass. And TinyTimRob too. Now STFU and GTFO. closes #510 for ever.
2012-12-18 08:15:46 -05:00
LexManos ca2d1fb033 Dixed ev eclipse worksapce, now references BC. 2012-12-18 05:10:32 -08:00
LexManos ec8d75d1b2 Added client src folder to classpath for startclient/startserver. 2012-12-18 05:06:20 -08:00
LexManos e9cabc2b7e Removed hardcoded additions 2012-12-18 05:05:25 -08:00
LexManos ce5479a166 Try and print error while signing jar 2012-12-18 00:21:24 -08:00
LexManos 9bab1ddaa1 Added jar signing to forge, we sign cpw/* and net/minecraftforge/* 2012-12-17 23:53:33 -08:00
LexManos a2f4a0d2dd Inital update to 1.4.6, Version bumped to 6.5 2012-12-17 22:33:28 -08:00
Christian 5770708e75 Update to MC 1.4.6 2012-12-17 21:48:29 -05:00
Christian 251cb92b12 Fix build script 2012-12-17 17:56:00 -05:00
Christian 0b36189547 more 1.4.6 tweaks 2012-12-17 17:00:54 -05:00
Christian 47dfd99d4f More work 2012-12-17 14:30:51 -05:00
Christian 289ce3339a Merge branch 'securityupdate' 2012-12-17 11:46:47 -05:00
Christian 65473ad838 Merge branch 'master' into securityupdate 2012-12-17 11:46:27 -05:00
Christian 420e04f1b9 Update FML: e98c311
e98c311 Fix up handling null names. *sigh*
2012-12-17 10:54:14 -05:00
Christian 25c367f9db Fix up handling null names. *sigh* 2012-12-17 10:29:54 -05:00
Christian ffbee734e7 Update FML: 293edb3
293edb3 Some tweaks to item identification. The GameRegistry methods are deprecated to encourage you to use the new named ones instead. These will force a name on the item/block, allowing for stronger matching t
9266ff3 Updated MCP download mirriors upon Searge's request.
31695d5 Fix var name messup
bfb3020 Update released eclipse project to link BouncyCastle
22a88ea Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update. Also, ordinal rearrangements within a mod will no longer trigger server disco
2012-12-16 23:07:49 -05:00
Christian e6c71bb148 Some tweaks to item identification. The GameRegistry methods are deprecated
to encourage you to use the new named ones instead. These will force a
name on the item/block, allowing for stronger matching than "sequential guessing"
2012-12-16 22:57:11 -05:00
Christian bbe4b9fbc2 More fixes 2012-12-16 21:22:55 -05: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 3369976c05 Updated MCP download mirriors upon Searge's request. 2012-12-16 05:35:46 -08:00
Christian a26b495ef9 Move Side and SideOnly to relauncher package 2012-12-15 23:21:26 -05:00
Christian 8f3b1aeff7 Fix newline fun 2012-12-15 22:37:32 -05:00
Christian d811fea82c More stuff for the thingy 2012-12-15 22:30:16 -05:00
Christian 16651d6994 Remove old NEI/CCC compatibility code and other classloading tweaks 2012-12-15 20:40:08 -05:00
Uristqwerty 47281f2de1 Simplify logic in tick start/end
Change the EnumSet equivalent of "A &= ~ new(~B)" to "A &= B".
This eliminates the need for one temporary object in a frequently called loop, and reduces the number of methods that need to be invoked.
2012-12-14 04:14:17 -05:00
LexManos 8fe14a8b99 Update FML to fix a typo 2012-12-13 00:31:54 -08:00
LexManos 70b9cd6e1f Fix var name messup 2012-12-13 00:22:30 -08:00
LexManos d6d20503d3 Update FML: Fixed the eclipse workspace to reference BouncyCastle library. 2012-12-12 23:48:44 -08:00
LexManos a4c790c969 Update AT for repackage 2012-12-12 23:46:01 -08:00
LexManos ad42901b7e Update patches for repackage. 2012-12-12 23:45:35 -08:00
LexManos 60b6913a87 Update released eclipse project to link BouncyCastle 2012-12-12 23:44:28 -08:00
LexManos 45a3f771bd Updated python scripts for removal of common folder 2012-12-12 23:38:51 -08:00
LexManos 1daa45c7f4 Update FML:
Minecraft is now decompiled into sane package names.
Got rid of the src/common folder as the only folder that exists is src/mincraft, because the client and server codebase is merged.
ID Map generation/validation fixes
2012-12-12 23:31:17 -08:00
LexManos e7008ae750 Manual import fixes 2012-12-12 23:27:57 -08:00
LexManos c1f0302f9d Fixup workspace for BC replacement 2012-12-12 23:01:05 -08:00
LexManos 061ab81041 Automatically resolved imports. 2012-12-12 21:58:35 -08:00
LexManos 52e87dd165 Bump version to 6.4.2 to mark the merge of TerrainGen branch. 2012-12-12 18:34:16 -08:00
Christian 3ed793bce5 Merge branch 'terraingen' 2012-12-12 21:13:20 -05:00
LexManos ff30c11bb5 Derp, imported the repackaged names not old names. 2012-12-12 17:18:36 -08:00
LexManos 05be21b3f1 Update FML:
2f34290e: Fix possible escape leakage..
83deece6: Change ID management slightly. IDs are tracked by block type for ItemBlock items now. This means servers will need to update.

Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 17:06:02 -08:00
Christian 1dcf3bfbdc Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update.
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 19:31:05 -05:00
Christian d13187d689 Fix possible escape leakage.. 2012-12-12 19:31:05 -05:00
LexManos 238dcdd18d More robust eclipse workspace replacement 2012-12-12 14:31:07 -08:00
LexManos d7f1923d7d Update readme to reflect the fact that we now download MCP. 2012-12-12 14:28:36 -08:00
LexManos 910f9e852f Make BlockButton.sensible protected and non-final 2012-12-12 02:48:30 -08:00
LexManos 0433190b01 Expose BiomeDecorator fields for custom Biome information, Issue: #239 2012-12-12 02:42:13 -08:00
LexManos d4a5b7e3a5 Fix shouldRiderSit() to properly determine if rider is sitting. 2012-12-12 02:24:47 -08:00
LexManos 76d6bc3cfa Fixes crash when mods add TreeMaps to the Configuration map, thanks AtomicStryker, PR: #282 2012-12-12 02:20:46 -08:00
LexManos c68dfae100 Fix type in ForgeChunkManager.ticketCountAvaILableFor, thanks iChun PR: #285 2012-12-12 02:16:23 -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 dfd9844c13 Pistons now respect world height a little better, for PR #286, will review Rotation event later. 2012-12-12 01:58:24 -08:00
LexManos 599591e883 New TileEntity function to determine if the TE should be destroied when Block/Meta changes, For Issue #300 2012-12-12 01:55:12 -08:00
LexManos ee0763fb4a Add CloudRenderer for PR #304 2012-12-12 01:35:18 -08:00
LexManos 9381fd07be Add .DS_Store to the gitignore for mac users 2012-12-12 01:24:19 -08:00
LexManos c48a15357b Moved check if map cursor should 'spin' and which world a player respawns in to WorldProvider for PR #308 2012-12-12 01:22:43 -08:00
LexManos 17637de863 Made BlockButton.func_82535_o overrideable for issue #311 2012-12-12 01:05:18 -08:00
LexManos 33901fb968 Made GuiContainer.drawSlotInventory overrideable for issue #312 2012-12-12 01:03:00 -08:00
LexManos 9c8fb046be Fix ForgeDirection.ROTATION_MATRIX for issue #313 2012-12-12 01:02:24 -08:00
LexManos 1812016e29 Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx 2012-12-11 21:47:45 -08:00
LexManos b73c85c82c Fix for FML Fixes eclipse workspace, now sets execution bits on astyle-osx, and mcp .sh files. Also now kills install if astyle is not found. 2012-12-11 21:40:03 -08:00
Christian 55dc3467de Change to download bouncy castle as well. We also finally properly use the downloaded libs
even in vanilla code!
2012-12-11 22:37:07 -05:00
Christian 229a501def Remove extraneous patch file 2012-12-11 20:37:12 -05:00
Christian 64226c3d7e Merge branch 'repackage'
Conflicts:
	build.xml
	client/cpw/mods/fml/client/FMLClientHandler.java
	client/cpw/mods/fml/client/GuiIdMismatchScreen.java
	common/cpw/mods/fml/common/FMLCommonHandler.java
	common/cpw/mods/fml/common/IFMLSidedHandler.java
	common/cpw/mods/fml/common/network/ModIdMapPacket.java
	common/cpw/mods/fml/common/network/ModListResponsePacket.java
	common/cpw/mods/fml/common/registry/GameData.java
	common/cpw/mods/fml/common/registry/GameRegistry.java
	common/cpw/mods/fml/common/registry/ItemData.java
	common/cpw/mods/fml/common/registry/LanguageRegistry.java
	common/cpw/mods/fml/server/FMLServerHandler.java
	install/fml.py
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
	patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
2012-12-11 14:58:38 -05:00
Christian f97b330605 Merge branch 'repackage' of github.com:cpw/FML into repackage
Conflicts:
	common/cpw/mods/fml/common/registry/GameData.java
2012-12-11 14:49:23 -05:00
cpw 29348240fc Merge pull request #145 from pahimar/master
More logging of loading files in LanguageRegistry
2012-12-11 08:28:39 -08:00
pahimar 5ef0cbfc32 Update common/cpw/mods/fml/common/registry/LanguageRegistry.java
Add in logging of what file failed to be loaded
2012-12-11 11:27:05 -05: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
LexManos 9ab56779f9 Fixed install --mcp-dir 2012-12-10 15:43:40 -08:00
LexManos f105e52a21 Fixed release -skipchangelog 2012-12-10 15:43:19 -08:00
LexManos 65a8bbf9e7 Fix patches, rebased with HEAD 2012-12-10 15:37:48 -08:00
LexManos 9be4b14371 Remade python dist as 32-bit. 2012-12-10 15:26:15 -08:00
Christian 1c5b8ecb7b Fixing id map generation - should validate correctly now 2012-12-10 15:26:13 -08:00
LexManos 5753eb0738 Reenabled replacement of the eclipse folder. 2012-12-10 14:56:23 -08:00
LexManos 41e899dcea Remade python dist as 32-bit. 2012-12-10 14:56:05 -08:00
Christian aee1a3f24d Fixing id map generation - should validate correctly now 2012-12-09 22:24:16 -05:00
Christian 3f383e2dc6 Fix up idmap code 2012-12-09 22:01:13 -05:00
LexManos 2761b5deab And finally, fix up the release install script to have a parameter to specity the MCP directory. 2012-12-09 18:58:01 -08:00
LexManos 5792c7fb76 Fix Forge install script to use python shipped with FML. 2012-12-09 18:44:43 -08:00
LexManos 56e4849c02 Push didn't get all of eclipse.... 2012-12-09 14:11:59 -08:00
LexManos 719db6eabc Cleaned up eclipse workspace and moved it to a zip file.
Setup will extract it if it doesn't already exist.
2012-12-09 14:09:11 -08:00
LexManos 5e0af1f2cb Some derp protection in the workspace copy. 2012-12-09 02:20:21 -08:00
LexManos 00bdb3dc0b Removed remaining references to src/common
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
2012-12-09 02:10:28 -08:00
LexManos 3537fb7f21 Updated build script to not use the mcp common directory as it doesn't exist anymore. 2012-12-08 21:41:51 -08:00
LexManos 099b8259a6 Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect. 2012-12-08 21:41:16 -08:00
LexManos 21c66eaf98 Updated the update_packages script to support different mcp locations 2012-12-08 21:40:39 -08:00
LexManos 1742abb139 Update fml_marker.cfg, Minecraft is now runnable! 2012-12-08 20:25:29 -08:00
LexManos 804e597aca Update all imports for repackaging. Branch is compileable. 2012-12-08 20:21:03 -08:00
LexManos e63311b4d0 Some stragler patches 2012-12-08 19:34:35 -08:00
LexManos b02f93aeed Updated patches to new packages. 2012-12-08 19:33:29 -08:00
LexManos ded6b4667b Give new classes a distinct package to be moved from. 2012-12-08 17:50:14 -08:00
LexManos 2009c89bf7 Fixed 0.tree to actually refresh the workspace. 2012-12-08 17:35:11 -08:00
LexManos 3e1efdf05b Remerged branch, and updated dev eclipse workspace. 2012-12-08 17:08:51 -08:00
Christian f4070ff625 Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
2012-12-08 17:05:18 -08:00
Christian e6d66322fe Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-08 16:46:47 -08:00
Christian 57fe3c475a Fix build eclipse extractor task 2012-12-08 16:46:46 -08:00
Christian 3909cdb3ec Fix RenderBlocks patch, touch branch 2012-12-07 16:43:15 -05:00
Scott Killen 768484d393 For @XCompWiz, added a hook to allow mods to dynamically change the color that water is rendered. 2012-12-07 16:43:15 -05:00
Scott Killen 079db5d854 Readded unchanged version 2012-12-07 16:43:15 -05:00
Scott Killen f747a97b85 Removed unchanged file 2012-12-07 16:43:15 -05:00
Scott Killen 69ac1fa3a5 Added terrain gen events
Added biome color events for @XCompWiz
2012-12-07 16:43:15 -05:00
Christian fa6769dbcf Fix release script for new forge job name. Add in skip changelog option for local builds 2012-12-07 16:42:32 -05:00
LexManos ece6628b50 Remove MCP from released src distro.. whops. 2012-12-07 11:25:19 -08:00
Christian bccad16ea6 Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
2012-12-07 01:52:16 -05:00
Christian 6bc367f005 Fix static method, closes #271
Don't spam the log if a mod requests a ticket beyond their maximum. A single message is fine.
2012-12-06 16:14:15 -05:00
Chicken Bones f1e3481c0a Add Chunk Watch and UnWatch events. 2012-12-06 09:11:20 -05:00
Abrar Syed 5cb03bc07d fix List configs 2012-12-06 09:09:34 -05:00
GuntherDW 021ec72f11 Fix typo in chunkmanager config 2012-12-06 09:31:06 +01:00
Christian 538755dad7 Tweak release.py script: HEAD==master in general
Update FML: 26a2ef5
26a2ef5 Add a modid on the mods list, should make it easier to do things like fo
b4e3490 Fix build eclipse extractor task
828341f Fix typo
7a8dae5 Try and make branch non-derpy
d3c0e1f Try defaulting branch differently
9c77d3f Remove old eclipse workspace and ship/extract as a zip file (use ant set
6371e9b Assume Forge is the parent directory when checking for AT configs.
516954e Name both zips the same format
1151d5c Last part of branch name only please
25f1dda Try and get a valid branch name on jenkins
39a146f Clean up build.xml script- support outputting a branched jar file
037dcae Small derp in install.py
01d6da3 Try marking python as binary.
8b26659 FML will now attempt to download MCP as part of the install process Now
42b3e6a Windows Python distrabution created using py2exe, thanks Fesh0r for the
e709ab8 Marked more spots in gui/items bitmask as being free.
2012-12-05 22:09:01 -05:00
Christian d4b06fd4bc Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-04 18:08:27 -05:00
Christian 7b7255013a Fix build eclipse extractor task 2012-12-04 18:04:45 -05:00
LexManos 742e93caec Fix issue with DimensionManager.shouldLoadSpawn 2012-12-04 02:01:01 -08:00
Christian 71044df76b Fix typo 2012-12-04 01:30:38 -05:00
Christian edb4e08b22 Merge branch 'master' into repackage
Conflicts:
	eclipse/Clean/.classpath
	eclipse/Clean/.project
	eclipse/FML/.classpath
	eclipse/FML/.project
	install/fml.py
2012-12-04 01:24:50 -05:00
Christian fa34555efa Try and make branch non-derpy 2012-12-03 23:47:23 -05:00
Christian 45583a7420 Try defaulting branch differently 2012-12-03 22:26:12 -05:00
LexManos 51159de108 Update python files to add support for specifying MCP directory and FML downloading MCP on the fly. 2012-12-03 18:15:38 -08:00
LexManos d124a56844 Update FML, now includes python, and will download MCP for you 2012-12-03 18:14:50 -08:00
LexManos 76ee9440a9 Add wget and unzip from GnuWin32 for use in the setup scripts. 2012-12-03 18:12:05 -08:00
Christian e8ff9f25d9 Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
LexManos 61a90e9e74 Assume Forge is the parent directory when checking for AT configs. 2012-12-03 16:53:03 -08:00
Christian 9cdbadb66c Merge branch 'master' into repackage
Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
Christian 6fdf5960ef Name both zips the same format 2012-12-03 08:38:20 -05:00
Christian 329fe50b1d Last part of branch name only please 2012-12-03 08:30:44 -05:00
Christian 461173a778 Try and get a valid branch name on jenkins 2012-12-03 08:23:21 -05:00
Christian 16418dd7ad Clean up build.xml script- support outputting a branched jar file 2012-12-03 08:13:20 -05:00
LexManos e334a469fb Small derp in install.py 2012-12-02 20:26:36 -08:00
LexManos d583a760ec Try marking python as binary. 2012-12-02 20:19:55 -08:00
LexManos c584d4e3db FML will now attempt to download MCP as part of the install process
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
LexManos 5cf07b008e Windows Python distrabution created using py2exe, thanks Fesh0r for the script. 2012-12-02 19:56:17 -08:00
Christian e3dfb1e3b7 Fix #289 2012-12-02 22:00:12 -05:00
Christian 784ad96194 Add in some additional ticket loading callbacks for ChickenBones. Closes #284
Add in a call to determine if there are possible chunktickets for a world. This should let
Mystcraft and other dynamic world generating mods check if they should immediately load
a world based on existing chunk tickets.
2012-12-02 00:56:53 -05:00
LexManos 0243df1c4a Fix issue where non-BlockContainer TEs would not be removed properly. 2012-11-30 20:22:50 -08:00
LexManos e65c0a3d88 Fix issue where worlds were potentially unloaded improperly on server shutdown. 2012-11-29 04:05:00 -08:00
LexManos fdb2933ceb Fix logic issue in ForgeChunkManager.ticketCountAvaliableFor(username) PR 2012-11-29 04:04:03 -08:00
LexManos 096989d4eb Small change to fix loading configs. 2012-11-27 22:43:23 -08:00
LexManos e5231f306b Added section of the EntityData NBT that will be persisted for players across respawning. 2012-11-27 16:52:08 -08:00
LexManos 4a748beb69 Fix potential NPE in EntityJoin handler and print warning. 2012-11-27 16:12:54 -08:00
LexManos cbe52abe42 Exposed some ChunkLoader information for PR #278 2012-11-27 15:28:59 -08:00
LexManos 7b6d65ce85 Small tweak to config to use Treemap 2012-11-27 14:53:43 -08:00
LexManos 820aa195bd Merge pull request #269 from XCompWiz/chunkcon
Adds a more intelligent chunk constructor
2012-11-27 14:53:12 -08:00
LexManos 530c19293b Fixed AIOOB issue with new sanity check in getBlock 2012-11-27 12:24:52 -08:00
LexManos 50426ea0fe Fix potential NPE in saving a property that didn't define a type. 2012-11-27 02:14:20 -08:00
LexManos 81b5db6f37 Added new functions to the Config class to allow for specification of comments when getting properties.
Added new getTerrainBlock whihc will limit the resuling ID to < 256, useful for world gen.
Calls to getBlock with IDs less then 256 will be assigned values above 256 {Thus freeing up terrain gen slots}
Made ConfigCategory implement Map<String, Propertery> should fix compatibility with most mods that broke two builds ago.
2012-11-27 02:06:29 -08:00
LexManos adc2d61feb Merge pull request #277 from Xhamolk/patch-1
OreDictionary addition: getOreID(ItemStack)
2012-11-27 00:28:29 -08:00
LexManos 88f9fa75c9 New nested configuration category support, for PR #258 2012-11-26 23:46:01 -08:00
LexManos 07a6e4ed5f Fixed random chest items not generating to there max stack sizes. 2012-11-26 20:25:35 -08:00
LexManos 4bf2dbaeb7 Fixed issue with abandoned chunks. 2012-11-26 20:06:23 -08:00
Xhamolk_ c0276a63f7 OreDictionary addition: getOreID(ItemStack)
Allow getting the oreID from a ItemStack, as an alternative from getOreID(String).

Now is easier to exchange items for their equivalencies through the OreDictionary.
2012-11-26 21:22:11 -06:00
cpw 26159e3ed9 Merge pull request #274 from iChun/patch-2
Add check that Entity saves to disk before saving entity to saved chunkloading data.
2012-11-24 11:14:21 -08:00
iChun 1e8c2a9acf Add check that Entity saves to disk before saving entity to saved chunkloading data.
Returning false to addEntityID prevents the entity from being saved (cred to LexManos)
Entities which do not save to disk but are chunkloaders causes errors the next time the world loads. This ought to fix it.
2012-11-24 16:27:17 +08:00
LexManos 9a1c12c492 Updated FML, proper free-sprite list for /gui/items.png, and fixed MCP version. 2012-11-21 16:07:20 -08:00
LexManos adad5c96cf Marked more spots in gui/items bitmask as being free. 2012-11-21 15:58:04 -08:00
Zach Laster 17151718aa Fixes ordering for z & x loops (proper array increment order)
The ordering before would skip about in the ids and metadata arrays.  This runs linearly and should improve performance.
Done live on github
2012-11-21 14:56:17 +02:00
XCompWiz e8aaf81627 Fixes some weird formatting 2012-11-21 05:15:20 +02:00
XCompWiz 0eba8eeaab Adds a more intelligent chunk constructor
Adds a chunk constructor with full block id range, that's metadata
sensitive, has intelligent coord ordering, and which allows for
generation at greater heights than 127.
2012-11-21 05:05:51 +02:00
LexManos 10cdc06cc3 Delete duplicate file 2012-11-20 18:07:39 -08:00
LexManos 78ff6182fe Finished repackaging net.minecraft.* net.minecraft.client is left 2012-11-20 17:58:22 -08:00
LexManos 7fb23bf89f More re-packaging, got most classes out of the default package. 2012-11-20 17:22:55 -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
Christian 25a10d6fc4 Fix up MCP version 2012-11-20 08:47:14 -05:00
Christian 389608116f Merge joined.exc add update howto 2012-11-20 08:38:33 -05:00
Christian f74b8ac30b Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
This reverts commit fa567014a5.
2012-11-20 08:27:13 -05:00
LexManos 554d86f59b Remove common folder from projects 2012-11-20 03:15:45 -08:00
LexManos f75bf90e77 Move IBossDisplayData to shared 2012-11-20 03:15:16 -08:00
LexManos 8b1ed2d255 First half of new patches 2012-11-20 03:15:01 -08:00
LexManos 586807c2c8 Update FML imports 2012-11-20 03:14:36 -08:00
LexManos 73a22bb571 Inital script side commit for MC source repackaging done. 2012-11-20 01:55:41 -08:00
LexManos 2e2751e5c0 Fix TE Issue 2012-11-19 20:05:16 -08:00
LexManos 397d36e900 Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config. 2012-11-19 17:45:53 -08:00
LexManos 5bc4d22bdd Updated to MC 1.4.5b 2012-11-19 16:03:52 -08:00
LexManos 745b697779 Forgot mcp.cfg 2012-11-19 15:47:18 -08:00
LexManos 950154aa61 Updated to 1.4.5b 2012-11-19 15:35:08 -08:00
LexManos 5e5919f61c Fix python error 2012-11-19 15:03:13 -08:00
LexManos 786b04c57d Modified decompile so that we do not have to decompile the server, saves time. 2012-11-19 15:01:04 -08:00
LexManos 72938c9133 Cleaned up some tabs 2012-11-19 15:00:11 -08:00
LexManos f842aa75bb Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit. 2012-11-19 13:33:22 -08:00
LexManos ee266cd325 Removed GnuWin32 programs, should no longer be needed as we've moved to python. 2012-11-19 13:31:11 -08:00
Christian f30daebbcb Update FML: 570592b
570592b Attempt to fix a possible comodification risk
2012-11-18 21:22:38 -05:00
Christian 02b6904843 Attempt to fix a possible comodification risk 2012-11-18 20:40:48 -05:00
Christian 913f3adade Stupid eclipse resetting preferences. Spaces, not tabs!!! 2012-11-18 19:33:15 -05:00
Christian ed252ad8ed Add in events when forcing and unforcing chunks. Hope this works for you ChickenBones! 2012-11-18 19:28:02 -05:00
Christian 7916c0dd77 Update FML: fde9414
fde9414 Change texturebinding to use the textureId directly rather than iconInde
2012-11-18 11:12:34 -05:00
Christian 8025bf3a2c Change texturebinding to use the textureId directly rather than iconIndex
to determine if it needs to rebind the texture sheet
2012-11-18 08:45:25 -05:00
LexManos 24f8d6be02 Fixed custom soil checks for NetherStalk and Reeds 2012-11-18 01:36:21 -08:00
LexManos 8bbe281de9 Fixed issue with default implementation of Beach plant type check 2012-11-18 01:35:48 -08:00
LexManos 6dafa3d0c2 Release script will now include the Minecraft version in the arcive names. 2012-11-17 22:58:34 -08:00
Christian 6a8a8a78c4 Update FML: f348496
f348496 Fix mod display list. Shouldn't be derpy anymore.
a5c31b5 Fix World patch- workaround no longer required and leftovers are bad.
2dc3f0d Cleaned up the AT config updater, should work for any setup of the MCP w
2012-11-18 00:17:21 -05:00
Christian 0340719ca2 Fix mod display list. Shouldn't be derpy anymore. 2012-11-17 23:51:14 -05:00
Christian c445ab004b Fix World patch- workaround no longer required and leftovers are bad. 2012-11-17 23:44:53 -05:00
LexManos 8d26642a84 Cleaned up the AT config updater, should work for any setup of the MCP workspace now. 2012-11-17 19:08:47 -08:00
LexManos 5b324861a0 Fixed beds not working properly when respawning. 2012-11-17 17:52:37 -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 783926194e Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit. 2012-11-16 22:50:21 -05:00
Christian e8c5b0791f 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 patches.
2012-11-16 22:50:00 -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 1c9b59b405 Clean up a patch 2012-11-16 16:49:44 -05:00
Christian 719f5f2bde Update FML for MC 1.4.5 2012-11-16 16:31:06 -05:00
Christian ca16b4b1bd Some liquid events. Non-API breaking. Add them at your leisure. This helps liquids know
what's happening to them. In case they're volatile or something ;)
2012-11-16 01:28:29 -05:00
Christian da00985e5f Another difference 2012-11-15 21:54:19 -05:00
Christian 5a72d49359 Fix fillLiquidContainer - return null, not the empty container for
previous API compatibility
2012-11-15 21:46:38 -05:00
LexManos f55329bb97 Merge remote-tracking branch 'origin/master' 2012-11-15 14:21:54 -08:00
LexManos a5b5c0f483 Update FML to fix ModLoader/addOverride functionality. 2012-11-15 14:20:22 -08:00
LexManos 6191f2530c Fix for ModLoader static overrides not displaying. 2012-11-15 14:08:41 -08:00
Christian 8a1f589db2 Merge branch 'KingLemming-master' 2012-11-15 06:44:43 -05:00
Christian 0f7811624b Change name to LiquidContainerRegistry. Fix up missing API. This better be it now! 2012-11-15 06:43:16 -05:00
King Lemming 213fb9bd1a Fixed oversights in liquid registry, added functionality for instant checks as requested by CJ.
Liquid list return is now secure.

Signed-off-by: King Lemming <[email protected]>
2012-11-15 02:43:35 -05:00
Christian a3a6f281e0 Merge branch 'KingLemming-master' 2012-11-14 21:23:47 -05:00
Christian 223aca8a28 Rename some liquid stuff for more sensible naming. Tweak API slightly. 2012-11-14 21:22:44 -05:00
King Lemming 73a2a5d78a Liquid Manager Rewrite - slightly more memory usage, loads more efficient at runtime.
Added default Lava and Water registrations to Liquid Manager.
Removed method which relied on flawed assumption that a given liquid only had a single type of container.

Signed-off-by: King Lemming <[email protected]>
2012-11-14 20:27:47 -05:00
Christian a759353afa Add in the basic IBlockLiquid interface. The actual block implementation
will follow.
2012-11-13 21:54:57 -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
Christian 2fb5ea1008 Change getLeft to getRotation, around any axis. 2012-11-13 15:05:49 -05:00
Christian 1072a8f0ae Some new stuff on the liquid API for better RP2 interaction. Coming soon: blocks! 2012-11-13 14:27:31 -05:00
Christian 52ac3c1af8 Tweak liquidcontainer API for sidedness capability 2012-11-12 21:41:46 -05:00
LexManos 95ec601569 Fix breaking despite cancel in creative mode for PlayerInteractEvent OR #247 2012-11-12 17:34:26 -08:00
LexManos 2087b2b44e Allow for modders to decide whether or not players are positioned on ridingEntities similarly to pigs PR #244 2012-11-12 17:33:12 -08:00
LexManos 369f8ce38f Fix issue where players would spawn in the ground. 2012-11-12 17:29:14 -08: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 9803c9e83e Added saplings and leaves to the ore dict. PR: #242 2012-11-12 17:07:33 -08:00
LexManos 3c355f0129 Updated FML, Fixed spelling issues in logs, and file name issues. 2012-11-12 17:05:22 -08:00
Christian 8a40e72f90 Fix up derpy file name handling: closes #127
Fix up duping childmods: closes #126
FMLPreinitializationEvent now offers a getLogger() that'll return your mod a personalized logger instance
2012-11-12 17:54:21 -05:00
Christian 58fc306bf2 As agreed, liquid API from BuildCraft has been migrated to minecraft forge. There will be cleanups to follow,
including sided handling and client rendering tweaks. Stay tuned!
Tweak forgedirection for a couple of naming constants
2012-11-10 21:27:08 -05:00
Christian 477e9bfc2b Add toLeft rotational data to ForgeDirection 2012-11-09 22:51:37 -05:00
LexManos ba55660dc8 New field in ForgeDirection to hold just the valid directions. And made getOrientation a bit more efficient. 2012-11-09 18:00:03 -08:00
LexManos 770585e731 Fix crops not droping seeds properly. 2012-11-09 16:21:41 -08:00
LexManos ba6c4dd7df Fix entity items rendering on the ground. 2012-11-09 16:21:23 -08:00
LexManos 5355348181 Fix spelling issue. 2012-11-08 21:01:31 -08:00
LexManos c8753aa104 Bumped version number for 1.4.4 2012-11-08 20:44:17 -08:00
LexManos e73cbd088f Update to 1.4.4 2012-11-08 20:19:12 -08:00
LexManos 4e2f04c48a FML setup should now download and verify all the minecraft files needed to run MCP. 2012-11-08 17:54:05 -08:00
Christian 96971abe13 Small fix to some MCP metadata for pre2 2012-11-08 20:34:45 -05:00
Christian 3dbe774ec1 Update to MC 1.4.4 2012-11-08 17:55:20 -05:00
LexManos 955683349d Ore Dictionary Improvements, replaces vanilla recipes with OreDict recipes for some vanilla items. Thanks Covert. 2012-11-05 16:15:43 -08:00
LexManos 207843e279 Made Item constructor public, and made setTextureFile chainable, requires mods to recompile, but as this is for 1.4.3 i'm not concerned. 2012-11-04 15:42:04 -08:00
Christian 27aa35aa17 Fix bug when a modloader mod is run on a dedicated server and has a
connection handler assigned to it. Hi SmartMoving! Perhaps you should try
@Mod instead of BaseMod?
2012-11-04 10:57:49 -05:00
Christian b63009fd7d Merge branch 'mc143pre'
Update to minecraft 1.4.3 prerelease
2012-11-03 01:32:03 -04:00
LexManos 2f0dcebbf9 Readdaed teleporter sensitive versions of the teleport function
Added per-world list of custom teleporters, Modders, use World.Load to populate this list.
Changed the definition of our version schemes.
2012-11-02 22:16:32 -07: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
Christian 9c3b07f53a Clean up some patch fuzz 2012-11-02 17:32:39 -04:00
Christian c2350be4a7 Update joined.exc file from latest conf 2012-11-02 17:23:54 -04:00
Christian 25ea7e7023 Update FML: 8356fe9
8356fe9 FUUUUUU! Stupid ticking. STOP REGISTERING TICK HANDLERS IN YOUR CONSTRUC
6edce8b Patch a file handle leak in RegionFileCache handling when under memory p
ca2bbe0 Update MCP mapings again, yay bad syncs.
c8941a7 Updated MCP mapings.
5e20c03 StartServer is now useable in merged code base.
2012-11-02 14:48:00 -04:00
Christian 8ec0cf6ab9 Update to 1.4.3 2012-11-01 23:53:13 -04:00
Christian 1a11b9c0e6 A useful tool for performing updates 2012-11-01 23:11:21 -04:00
Christian 448b85ceeb FUUUUUU! Stupid ticking. STOP REGISTERING TICK HANDLERS IN YOUR CONSTRUCTORS.
I'm looking at you Rei's!
2012-11-01 10:51:17 -04:00
Christian 92010b5bca Patch a file handle leak in RegionFileCache handling when under memory pressure. 2012-10-31 22:58:01 -04:00
LexManos c19ae55885 Update FML: Updated MCP mapings, and fixed StartServer 2012-10-31 10:16:46 -07:00
LexManos 30db9154b2 Update MCP mapings again, yay bad syncs. 2012-10-31 09:23:17 -07:00
LexManos ac41e0928e Updated MCP mapings. 2012-10-31 07:40:53 -07:00
LexManos 755cceb5cb StartServer is now useable in merged code base. 2012-10-31 07:40:40 -07:00
Christian f6b3865454 Update FML: b19e882
b19e882 Remove some debug, closes #123
9d7d32a Fix up tick management outside of mod loading phases for ModLoader mods.
d512539 Negatively cache failed class lookups, should help with @SideOnly performance issues.
2012-10-30 21:57:30 -04:00
Christian 771c818cd4 Remove some debug, closes #123 2012-10-30 21:53:08 -04:00
Christian 17d1f1f157 Fix up tick management outside of mod loading phases for ModLoader mods. 2012-10-30 21:47:06 -04:00
Christian 5197e98fb1 Negatively cache failed class lookups, should help with @SideOnly performance issues. 2012-10-30 21:17:17 -04:00
Christian 418a47976a This update fixes some world corrupting vanilla error handling, mostly caused by
mods doing something derpy. Hopefully, your world saves will thank me.
Note that if the mod does derp, it's data is lost. It's not FML or Minecraft Forge's
responsibility if "DirtChest 2000 Mk5" can't write their TileEntity method correctly
and you lose your 100000 diamonds.

Update FML: a3a93f3
a3a93f3 Fix some whitespace issues, handle possibly bugged entities as well
a7eb5dc Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
2012-10-30 09:27:34 -04:00
Christian 1bd53fe75f Fix some whitespace issues, handle possibly bugged entities as well 2012-10-30 09:13:18 -04:00
Christian 01048c704b Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load. 2012-10-29 17:41:08 -04:00
LexManos 64354382d4 Cleanup some debug in the script, and fix version number for the current build. 2012-10-28 23:42:41 -07:00
LexManos d7adac4508 Fix a vanilla bug related to certian seeds and stronholds. 2012-10-28 23:42:19 -07:00
LexManos f9ea207cdc Fix cast issue when mods attempt to make fake worlds. 2012-10-28 23:41:43 -07:00
LexManos 6c803ea1de Change logs should now be bundled with downloads, as well as avalible on files.minecraftforge.net 2012-10-28 22:04:47 -07:00
Christian 56013719e8 Update FML:b23081d
b23081d Support for ModLoader 1.4.2. Good job Risu!
66db4ec Add in an exclusion list tag for @Mod. The backend code isn't yet implemented, but shows the basic idea.
2012-10-29 00:52:18 -04:00
Christian dd011e16d2 Support for ModLoader 1.4.2. Good job Risu! 2012-10-28 23:55:58 -04:00
LexManos 25941fd58c Fix compile issue. 2012-10-28 15:37:11 -07:00
LexManos bcc8dcd30c Merge pull request #232 from CovertJaguar/patch-7
Added vanilla wood + dye to the Ore Dict
2012-10-28 07:45:48 -07:00
LexManos 820d61d56d Added Stonghold, Village, and Spawn biome management helpers for PR 207 2012-10-28 07:38:38 -07:00
CovertJaguar 9bb6726d31 Added vanilla wood + dye to the Ore Dict
Should help simplify interaction between mods that add similar items.
2012-10-28 07:24:01 -07:00
LexManos 31638a0697 New hook to allow for custom beacon support blocks. 2012-10-28 06:47:53 -07:00
LexManos f72f6ab7b0 Exposed functions for adding superflat presets. 2012-10-28 06:38:44 -07:00
LexManos 705509054a Added metadata sensitve experience to furnace recipies and added Item callback to determine experience gain. 2012-10-28 06:37:54 -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 1a7e580f01 New hook to allow items to be on multiple creative tabs PR 176 2012-10-28 05:57:23 -07:00
LexManos d7de1e8be2 Remove some debug code 2012-10-28 05:42:55 -07:00
LexManos f6a7ea063b Changeable name tag render distance for PR: 174 2012-10-28 05:33:32 -07:00
LexManos 887b083782 EntityLiving.experianceValue private->public for Issue #225 2012-10-28 05:21:58 -07:00
MinecraftForge eb96aa9d04 Merge pull request #231 from ShadwDrgn/master
ServerChatEvent
2012-10-28 04:53:10 -07:00
ShadwDrgn 24cec145ca Add event to cancel or change chat messages sent from server 2012-10-28 07:50:57 -04:00
ShadwDrgn 77bd22d3c1 Add event to cancel or change chat messages sent from server 2012-10-28 07:31:53 -04:00
LexManos 5650ae7ee9 Added system to place all configs that use Forge's Configuration function into a single file on disc. Optional config to enable this. Blame MattaBase for this idea.. 2012-10-28 04:18:12 -07:00
LexManos dc7db59f74 Pickblock will new compare NBT data, should allow mods to refine there result better. 2012-10-28 04:15:53 -07:00
Christian 463514fbbe Add in an exclusion list tag for @Mod. The backend code isn't yet implemented, but shows the basic idea. 2012-10-27 15:13:28 -04:00
LexManos b52f397a6f Fix ItemSeed placement to take into account the IPlantable interface. 2012-10-27 00:56:13 -07:00
LexManos c689a982b5 Added a per-world MapStorage feature that provides a method to store data files associated with a specific world, as well as fixes the issue with villagers loosing there village. {Where villagers wouldn't go inside at night} 2012-10-26 22:37:41 -07:00
Christian efcda1a946 Fix the accessor and type on World.getPersistentChunksFor()
Update FML: 8bd98c3
8bd98c3 Fix a small problem with the new MCP container- it can cause NPEs. Nice.
34cc42d Fix up some javadoc complaints
2012-10-26 21:13:56 -04:00
cpw 40368aec68 Merge pull request #228 from pahimar/master
SlotCrafting fix for damageable container items
2012-10-26 08:59:28 -07:00
pahimar 322c79f022 Update patches/common/net/minecraft/src/SlotCrafting.java.patch 2012-10-26 12:26:16 -03:00
Christian 5115306e76 Fix a small problem with the new MCP container- it can cause NPEs. Nice. 2012-10-26 07:55:23 -04:00
Christian 1a31cd0886 Fix up some javadoc complaints 2012-10-25 16:18:42 -04:00
Christian ce90f7e7f6 MCP information is now included in Minecraft Forge. They deserve the credit :)
Update FML: 09eade4
09eade4 Update build - include MCP information in the source pack
9bfe7df MCP deserves lots of credit. So here it is.
2012-10-25 10:27:58 -04:00
Christian f7403a509f Update build - include MCP information in the source pack 2012-10-25 10:00:34 -04:00
Christian c2f4738c8c MCP deserves lots of credit. So here it is. 2012-10-25 09:02:49 -04:00
Christian 2b3ddc31db Update FML: 8006b77
8006b77 Fix instantiation bug
7cc91cf Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback
24d7285 Update for MC 1.4.2
cedf3d5 Duplicate Mod display screen.
2012-10-24 22:15:41 -04:00
Christian 8a6680f9c7 Fix instantiation bug 2012-10-24 21:58:36 -04:00
LexManos b8674bb327 Downgrade to FML 415, issue with new IMC system. 2012-10-24 15:17:26 -07:00
LexManos 0cb74abe8b Update to 1.4.2, obf stayed the same, so only small revision. 2012-10-24 13:55:04 -07:00
Christian a72f6b1eff Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback 2012-10-24 16:39:55 -04:00
Christian 39d6ef64c2 Update for MC 1.4.2 2012-10-24 15:12:06 -04:00
Christian f9db650310 Duplicate Mod display screen. 2012-10-24 09:41:46 -04:00
LexManos 6dac04b954 Update World patch to fix map provider issue. 2012-10-24 03:54:39 -07:00
Christian 8489ca051d Add an access transform for Block.setBlockBounds - should help a lot of code that uses this.
Update FML: d915f39
d915f39 Fix typo in access transformer
346691c Fix the merge for forge
6dadc1d Fix up references to minecraftDir in obf code
8a55f68 Update FML for Minecraft 1.4.1
5645fa5 First update to 1.4.1, patches need updating.
ff0f00f Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.
2012-10-23 21:53:45 -04:00
Christian 4d620ade3e Fix typo in access transformer 2012-10-23 21:21:28 -04:00
LexManos 043f570ff9 Update to MC 1.4.1 and Forge 6.0.0 2012-10-23 16:04:58 -07:00
Christian fc0fc0cc75 Fix the merge for forge 2012-10-23 18:36:05 -04:00
Christian a3e71f4016 Fix up references to minecraftDir in obf code 2012-10-23 18:10:06 -04:00
Christian 6e8902da86 Update FML for Minecraft 1.4.1 2012-10-23 18:00:33 -04:00
LexManos 37697d7f44 First update to 1.4.1, patches need updating. 2012-10-23 14:44:04 -07:00
LexManos 54f5225530 Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading. 2012-10-23 13:32:02 -07:00
LexManos 717b80781b Fix color issues with Dyed Leather armor. 2012-10-23 05:24:36 -07:00
LexManos 5ca845f069 Fix up the setHandeled/setHandled for events, it is now a generalized setResult, the meaning of which is defined by each event. 2012-10-22 00:29:28 -07:00
LexManos ad51183584 Cleanup mirrored things in ShapedOreRecipe to address issue 208 and issue 210 2012-10-21 23:19:11 -07:00
LexManos a09ea82fc7 Remove deprecated code. 2012-10-21 23:18:09 -07:00
LexManos dc9b1d90bd Fix NPE issue when mods add null EntityFX's to be rendererd. 2012-10-21 22:59:57 -07:00
Christian 9e86399aae Update FML: 7a34246
7a34246 Ship a client only class so the merge works both sides.
2012-10-21 23:09:04 -04:00
Christian 190c71eeb5 Ship a client only class so the merge works both sides. 2012-10-21 22:50:20 -04:00
Christian 4ee6852d4d Fix install.py so it can be installed properly from src distribution 2012-10-21 21:21:19 -04:00
Christian b32aedacce Update FML (entire change log since last by me): 62a6b52
62a6b52 Fix RenderRegistry render ID - now at 36 Fix SpriteMaps - they're running out fast! Switch to forge if you can! RenderBiped now has an armo
b845cde Fix up FML python script for forge
2c36dfb Update to MCP pre 3. Fixes some weirdnesses with explosions.
acd880d Merge branch '1.4'
e6f57e5 Update for MCP release
b1de0fc Remove fuzz from patches for INetworkManager change
ad44619 Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use...
3a94211 Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace
9386e23 Update gitignore - ignore the files that will change or be deleted
10b318c Add in "starter" image for eclipse workspace
995d5b7 Eclipse workspace fixup 2?
bbb12c8 Clean up eclipse workspace- part 1
b50058e Clean up a bit of patch fuzz
4a0bfa9 Fix CommonHandler for rename of the server thread class
4d1ec66 Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it.
b52e3d0 Fix exception for CodecMus
a1011c9 Fix some compilation issues. Requires resolving the worldclient abstract method
0ebd4f3 Inital patch update to 1.4
89c68c4 Moved into EntityVillager
e4702cb Fix line ending detection during checkout.
6e64fd7 We don't need logging here...
014b3f4 remove useless -Server projects
7628c67 Updated the AT config and Marker config for 1.4 obf
54a322c Updae build to copy files that may decompile differently but are actually the same, and updated for 1.4 values.
aadf396 Update MCP Merge config.
81e1855 Pull in MCP's 1.4 conf files.
5686fd4 Fix error in merging of exec's
2012-10-21 20:56:56 -04:00
LexManos 1f1a7edebb Update release script for mcp changes, releases now build. 2012-10-21 10:39:05 -07:00
LexManos 2e4a43e875 Updated Forge version to 5.0.0, for 1.4 2012-10-21 10:27:07 -07:00
LexManos 158c2f1feb Updated World patch, there are a lot of new things happening int he constructor, xcomp should probably vet this. 2012-10-21 10:26:07 -07:00
LexManos 07a4a9f41f Teleporting has a new function (func_82448_a), made it so that you can supply your own teleporter to that function, and so it works with dimension movement factors. 2012-10-21 10:25:27 -07:00
LexManos a705a12cdf Removed Forge's TileEntity.getRenderDistance, now a vanilla feature: TileEntity.func_82115_m 2012-10-21 10:23:46 -07:00
LexManos 3f03cc8c87 BlockCrops is now the parent class of multiple types of crops, Wheat, Potatoes, and Carrots, updated getBlockDropped patch to reflect. 2012-10-21 10:22:56 -07:00
LexManos 067458bdc0 Patches removing forge spawn protection, now a vanilla feature. 2012-10-21 10:21:39 -07:00
LexManos 1ee857e779 Entities have a new function to determine explosion strength that they create, and implemented Item frame pickblock. 2012-10-21 10:20:39 -07:00
LexManos 6ffaa94994 BlockSnow now pretty much just passes harvestBlock to it's super. 2012-10-21 10:19:54 -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 01722c6c3c Forge spawn protection removed, now a vanilla feature. 2012-10-21 10:05:50 -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 6127c113b8 Remove final from 'villageCollectionObj' to allow for delayed setup of Map source objects. 2012-10-21 10:00:43 -07:00
LexManos 4a4166fe7e Update for new names in 1.4 2012-10-21 10:00:02 -07:00
Christian b88f2e6938 Fix RenderRegistry render ID - now at 36
Fix SpriteMaps - they're running out fast! Switch to forge if you can!
RenderBiped now has an armorlist- so armortypes add to it as well
2012-10-21 12:41:53 -04:00
LexManos bf14aefd28 Update Forge's AT for 1.4 names. 2012-10-21 05:46:23 -07:00
LexManos ae28513c98 Fix recompile call for 1.4 MCP change 2012-10-21 05:46:10 -07:00
LexManos ad1d1da435 FML Update for 1.4 2012-10-21 05:45:53 -07:00
Christian 8af47f2bb9 Fix up FML python script for forge 2012-10-21 08:19:36 -04:00
Christian bdb8a7c059 Update to MCP pre 3. Fixes some weirdnesses with explosions. 2012-10-21 07:11:09 -04:00
Christian 76be826ffb Merge branch '1.4' 2012-10-20 18:07:22 -04:00
Christian 2fcea16485 Update for MCP release 2012-10-20 18:02:26 -04:00
Christian 698f0e69eb Remove fuzz from patches for INetworkManager change 2012-10-20 17:16:50 -04:00
Christian 8ce9b05d8b Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use... 2012-10-20 17:07:59 -04:00
Christian c7002207fb Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace 2012-10-20 15:24:05 -04:00
Christian fabc324487 Update gitignore - ignore the files that will change or be deleted 2012-10-20 15:14:06 -04:00
Christian 1a3c19430c Add in "starter" image for eclipse workspace 2012-10-20 15:02:37 -04:00
Christian 6c48db441c Eclipse workspace fixup 2? 2012-10-20 14:42:25 -04:00
Christian 75fa0f2bdb Clean up eclipse workspace- part 1 2012-10-20 14:09:44 -04:00
Christian 279b5d5e23 Clean up a bit of patch fuzz 2012-10-20 12:39:40 -04:00
Christian 7da5727e3e Fix CommonHandler for rename of the server thread class 2012-10-20 12:31:35 -04:00
Christian 59738c493a Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it. 2012-10-20 12:27:30 -04:00
Christian 70c342908f Fix exception for CodecMus 2012-10-20 12:12:43 -04:00
Christian 7ac53b4772 Fix some compilation issues. Requires resolving the worldclient abstract method 2012-10-20 11:30:01 -04:00
LexManos ce847a7c53 Inital patch update to 1.4 2012-10-20 02:43:03 -07:00
LexManos 7afbc1ab93 Moved into EntityVillager 2012-10-20 02:42:34 -07:00
LexManos 2028b0aa7f Fix line ending detection during checkout. 2012-10-20 02:32:29 -07:00
LexManos f59de49682 We don't need logging here... 2012-10-20 02:27:26 -07:00
LexManos ed3f7c14e3 remove useless -Server projects 2012-10-20 00:43:02 -07:00
LexManos 528670d103 Updated the AT config and Marker config for 1.4 obf 2012-10-20 00:36:33 -07:00
LexManos c106909d91 Updae build to copy files that may decompile differently but are actually the same, and updated for 1.4 values. 2012-10-20 00:06:55 -07:00
LexManos 671892fd32 Update MCP Merge config. 2012-10-19 23:57:49 -07:00
LexManos 7fcdb47edb Pull in MCP's 1.4 conf files. 2012-10-19 23:57:05 -07:00
LexManos ecf14df030 Fix error in merging of exec's 2012-10-19 21:14:03 -07:00
LexManos 8ce75c4ab5 Bump version to 4.3, final for 1.3.2 2012-10-19 18:57:24 -07:00
LexManos 1d1251d92a Remove some test code. 2012-10-19 18:56:56 -07:00
LexManos 34ebfcd978 Added ability for mods to cleanly define and display new creative tabs. 2012-10-19 08:46:39 -07:00
Christian f3443d3e02 Fix classloading issue preventing JRockit from running forge 2012-10-19 09:30:31 -04:00
Christian 2687a67e73 Forge build change: the universal jar, if installed alongside a server jar file, can be executed to load forge. No server side merging required!
Update FML: 989ab3e
989ab3e Update build.xml - add a classpath to the manifest. This means the universal jar is now a server side launche
88f1dc9 Typos!
2012-10-18 21:31:39 -04:00
Christian 9b1375f536 Update build.xml - add a classpath to the manifest. This means the universal jar is now a server side launcher. 2012-10-18 21:07:33 -04:00
Christian ce138ec571 Typos! 2012-10-18 21:00:58 -04:00
Christian c440c4b0c1 Update FML: 470a185
470a185 Try and avoid an NPE in crash reports
0029518 Fix logging problems- log death messages and re-route the server through FML logs properly.
fe7a832 Fix the test mod
a2bc30b Coremods can be specified via the command line: fml.coreMod.load=<listofcommaseparatedclasses> This will help with developing coremods
bae1f74 Fix classpath for server
887aa27 Add in the ability for a client to throw a custom exception that displays a custom gui instead of the default error message.
e17f267 Update FML internal classpath. Helpful for coremod devs
3b9972a Don't use File to separate the last element of the path. It's a URL, they're always separated by '/'
5c96afe Changed RelauchLibraryManager so that files with different paths on the same baseURL can be implemented in one ILibrarySet.
1bca393 FML as a whole is now subject to transformers.
27cf731 Bonus extra character. thanks randomitter!
94c84cd Merge pull request #116 from Vazkii/patch-1
c2d3195 Add Null check to FMLClientHandler.sendPacket
2012-10-18 20:17:23 -04:00
LexManos 30f74ac44c Make Item.createEntity only call when its specifically a EntityItem, not a subclass of it. 2012-10-18 16:55:35 -07:00
Christian 5b4de7b2b5 Try and avoid an NPE in crash reports 2012-10-18 14:41:32 -04:00
Christian 3599c11599 Fix logging problems- log death messages and re-route the server through FML logs properly. 2012-10-17 18:05:23 -04:00
Christian 4af51b0cad Fix the test mod 2012-10-16 13:24:29 -04:00
Christian 4c39831d2b Coremods can be specified via the command line: fml.coreMod.load=<listofcommaseparatedclasses> This will help with developing coremods 2012-10-16 13:21:10 -04:00
Christian 4aced4ae02 Fix classpath for server 2012-10-16 12:40:01 -04:00
Christian 7327ea75f7 Add in the ability for a client to throw a custom exception that displays a custom gui instead of the default error message. 2012-10-16 12:39:04 -04:00
Christian a82285964f Update FML internal classpath. Helpful for coremod devs 2012-10-16 09:47:06 -04:00
Christian e770c87084 Don't use File to separate the last element of the path. It's a URL, they're always separated by '/' 2012-10-16 09:46:08 -04:00
keepcalm 924425074f Changed RelauchLibraryManager so that files with different paths on the
same baseURL can be implemented in one ILibrarySet.
2012-10-16 09:46:08 -04:00
Christian c0795e9bee FML as a whole is now subject to transformers. 2012-10-16 09:20:30 -04:00
Christian 4f0ddca554 Bonus extra character. thanks randomitter! 2012-10-16 09:06:13 -04:00
LexManos 192fb0f10e Dll files are binary as well. 2012-10-15 15:32:25 -07:00
LexManos f10073dc45 Ship forgeversion.properties with release zips. Same format as fmlversion.properties. 2012-10-15 15:32:12 -07:00
LexManos 006a27dcd6 New Block hook to determine if it can be destroied by the ender dragon, for PR 199 2012-10-14 20:17:07 -07:00
LexManos 91e88afdbe Allow hook into GuiSlot for background rendering for PR #203 2012-10-14 20:00:30 -07:00
LexManos 2a749bee2c Change the Crafting damage check to be the same as the usage damage check. (>= -> >) 2012-10-14 19:59:50 -07:00
LexManos 731107a865 Fill out the .gitattributes to help with line endings how they should be. 2012-10-14 19:59:07 -07:00
Christian 8d5b8a81fe Reorganize the forced chunks a bit- offload the cost of immutable map building to the mods, rather than the chunk tick 2012-10-14 12:30:33 -04:00
Christian b89467d101 Remove @SideOnly from removePotionEffect. Hi RichardG! 2012-10-12 14:01:16 +01:00
LexManos 5514bd39c9 Add some accessors to teh ChunkLoader tickets. 2012-10-11 18:27:51 -07:00
LexManos cd01c30ae2 Merge pull request #198 from iChun/patch-1
Fix not passing right render pass to Item class.
2012-10-07 18:10:58 -07:00
cpw abc651d618 Merge pull request #116 from Vazkii/patch-1
Add Null check to FMLClientHandler.sendPacket
2012-10-07 10:45:22 -07:00
Christian 2c8517f4d7 Fix bounds checking on chunkcache. Should fix a bunch of rp2 and maybe other extended tile entity code 2012-10-07 00:28:42 -04:00
Christian 8e92472409 Use weak references to the worlds in our maps. WorldClient would otherwise
leak all over the show.
2012-10-06 21:32:41 -04:00
Vazkii f2e4e20f35 Add Null check to FMLClientHandler.sendPacket 2012-10-05 17:36:52 +02:00
Christian 72c19f335b Expose RenderGlobal.field_72738_E (breakingBlocks) and fire OnBreak for items broken in itemUseFirst on the server. Both for Elo 2012-10-04 18:05:58 -04:00
Christian 641a7b033f Fix problem with spawning custom entities in hotloaded dimensions. 2012-10-04 17:35:22 -04: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 c5f74a8ba0 Update forge to 4.2 2012-10-03 02:00:19 -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
Christian 0162519347 Remove dead WorldInfo patch. Tweak dimension code a bit for better naming, and use the new FML world loading facilities
Update FML: d0e7c9e
d0e7c9e Update patches *sigh*
f3e1cac Add in a savehandler strategy for reading and writing data to the world save. This service is only available to coremods via the WorldAccessConta
51fb513 Add in some bukkit supporting code. Most of this is unimplemented until the bukkit coremod is complete.
65c9fdd New stuff on the ModLoader! Risu has been busy. Closes #114
c1d4458 Mods can now declare a range of minecraft versions they will run against
2012-10-03 01:54:40 -04:00
Christian 124f47f55c Update patches *sigh* 2012-10-02 22:04:25 -04:00
Christian 550e622bc7 Add in a savehandler strategy for reading and writing data to the
world save. This service is only available to coremods via the
WorldAccessContainer interface on the mod wrapper. This is deliberate
and will not change.
2012-10-02 21:54:47 -04:00
Christian a554846e57 Add in some bukkit supporting code. Most of this is unimplemented
until the bukkit coremod is complete.
2012-10-02 20:26:47 -04:00
Christian b7febbbff7 Merge branch 'XCompWiz-mystcraft'
Merge in mystcraft base edits for a base clean mystcraft. Adds in a lot of extra capabilities
2012-10-02 20:13:52 -04:00
XCompWiz a50abc514f Server player concurrency fix
Fixes an issue where the server can move a player while the player is
moving, process the player's last move (putting the player back where
they were before the teleport), and then complain about the player
moving too fast when the client catches up to it's new position.  Also
fixes this issue while riding an entity.  Only affects player
client/server movement sync.
2012-10-03 02:45:36 +03:00
XCompWiz e53595f1f5 Lighting Time fix
score_under's lighting fix that limits and fairly distributes the amount
of time spent on recalculating lighting
2012-10-03 02:42:40 +03: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
XCompWiz bbc5673ad8 Adds world unloading and hotloading calls
Adds world unloaded message to MinecraftServer on save.
Adds world unloading calls to chunk provider/manager when all chunks are
unloaded.
Adds call in MinecraftServer getWorld to hotload world if it isn't
loaded.
2012-10-03 02:37:27 +03:00
XCompWiz 32ca2b4fb0 Improves DimensionManager
Adds handling for unloading and hotloading of worlds, fixes some typos,
allows for dimensions to be unregistered (allowing save specific
dimension registrations), general changes to match these features.
2012-10-03 02:34:50 +03:00
Christian 0ed0d284b5 New stuff on the ModLoader! Risu has been busy. Closes #114 2012-10-02 08:29:12 -04:00
Christian 9a8a38d345 Mods can now declare a range of minecraft versions they will run against 2012-10-02 01:29:46 -04:00
LexManos 154124acd8 Fix issue where mushrooms would not check the proper soil block. 2012-10-01 18:51:35 -07:00
LexManos eda74ffac2 Fix issue where light would not properly recalculate. 2012-10-01 18:51:11 -07: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 92923a3521 Expanded DungeonHooks to allow for adding of custom DungeonLoot values directly, allowing for better control over the generated items. 2012-09-30 01:01:00 -07:00
LexManos 33a6ec9a70 Made PlayerEvent.BreakSpeed fire when a player cannot harvest the block. Issues #191 and #188 2012-09-30 00:48:22 -07:00
Christian 27d6841579 Update FML: ca1ca4f
ca1ca4f Fix maps supporting greater than byte() dimension sizing
15ee8bf Fix language registry additions, closes #113
a08b5b1 Merge pull request #112 from pahimar/master
8dac58f Added ability to query the Language Registry by key and language for specific localized text, as well as loading in localization text f
2012-09-29 00:35:26 -04:00
Christian 7cd5ae04f7 Fix maps supporting greater than byte() dimension sizing 2012-09-29 00:21:42 -04:00
Christian 639039dd18 Fix language registry additions, closes #113 2012-09-28 22:12:23 -04:00
Christian b227d7ce73 Dormant chunk cache might actually work now, and not mix chunks across worlds 2012-09-28 17:04:26 -04:00
LexManos b41626cf78 Forgot comment, you see nothing... 2012-09-28 00:02:21 -07:00
LexManos d373632275 Fix vanilla bug where the player would load chunks outside its range that would be 'abandoned' and never unloaded. 2012-09-27 23:58:40 -07:00
LexManos 49f263eb63 Fix buckets, need to rethink for bukkit compatibility. 2012-09-27 23:56:39 -07:00
Christian fbae118a2f A few requested features of ForgeChunkManager. Mods can specify a
chunkloading config directly in the config file, including chunk
loading overrides if they wish (and the config allows them).
Also added "player" tied tickets that bind to the player and not the
mod's quota.
2012-09-27 23:38:27 -04:00
LexManos 520550dab9 Location aware version og Block.lightOpacity for PR #169 2012-09-26 22:12:47 -07:00
LexManos 6ec887b34f Missing updates from last commit 2012-09-26 22:12:01 -07:00
cpw 52da67717f Merge pull request #112 from pahimar/master
Additonal Language Registry functionality
2012-09-26 21:57:53 -07:00
LexManos 0e5c0be23e Added preliminarty Player Interact event heavily based on the bukkit event. 2012-09-26 21:18:18 -07:00
LexManos a421e51805 Fix bug in last commit that caused block to not break. 2012-09-26 21:17:26 -07:00
LexManos 63aa706dcf Add PlayerEvent.HarvestCheck and PlayerEvent.BreakSpeed for dealing with things related to a player harvesting a block. 2012-09-26 17:54:15 -07:00
pahimar df7d2b7161 Added ability to query the Language Registry by key and language for specific localized text, as well as loading in localization text from a specific file/URL 2012-09-26 15:41:58 -04: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 5fb999fa22 Add in an "EntityEvent.EnteringChunk" event. Useful for your entity chunkloading stuff. 2012-09-26 08:52:40 -04:00
LexManos 1df9b144cd Merge remote-tracking branch 'origin/master' 2012-09-26 01:45:26 -07:00
LexManos 34ac4f5cec Support for no BOM. 2012-09-26 01:30:22 -07:00
Christian 60b260b40c Update FML: f083707
f083707 Extreme headless mode is back!
2012-09-25 23:04:15 -04:00
Christian 7dbda77f10 Extreme headless mode is back! 2012-09-25 22:46:47 -04: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 4dd3d2cfd7 Update FML: dd39ae5
dd7502a Fix parent child counts showing properly. Closes #107 thanks scott!
b36d447 It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110
efb1066 Fix random shuffling when manipulating biomes by using a LinkedHashSet to preserve iteration order. Closes #111
2012-09-25 19:10:15 -04:00
Christian eb034416ae Fix parent child counts showing properly. Closes #107 thanks scott! 2012-09-25 19:00:36 -04:00
Christian d21bc1085c It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110 2012-09-25 18:57:42 -04:00
Christian 2bee777740 Fix random shuffling when manipulating biomes by using a LinkedHashSet to preserve iteration order. Closes #111 2012-09-25 18:54:46 -04:00
LexManos 5285e1d918 > != >= 2012-09-25 06:33:01 -07:00
LexManos 5d3371ab3b Fix Configuration.getItem to return pre-shifted values suitible to pass into Item constructors. 2012-09-25 05:04:56 -07:00
LexManos c20b71eb20 Fire off PlayerDestroyItemEvent for crafting contianer items that get damaged to much. PR #183 2012-09-24 22:44:42 -07:00
LexManos 27e4c3c3d5 Changed Configuration to use overloaded methods, and changed the order of arguments to be Category, Key, Value instead of Key, Category, Value to hopefully help cleanup some peopels code.
Added function to get a free Item id. Will only accept values that are not in the block space. Needs testing.
Marked all the old getOrCreate* functions as deprecated.
2012-09-24 22:33:56 -07:00
LexManos 1804f22182 Configuration will now attempt to detect the encoding of the file using the Byte Order Mark. 2012-09-24 20:56:52 -07:00
Christian 8c74d81103 Fix up some config file handling to be even more resilient. 2012-09-24 23:15:36 -04:00
Christian 93e7ac7b55 Support quoting in property and category names for almost all possible characters allowed 2012-09-24 23:15:22 -04:00
Christian 76f3b26aa3 Fix some errors if the config is unparseable. It should log an exception and carry on with defaults. 2012-09-24 23:03:31 -04:00
Christian a776afe1bf More modifications to the ticket callback handling system. There are up to two callbacks during world loading now. One to allow
selective preference for ticket types. The other to actually allow the mod to force chunks.
2012-09-24 22:07:39 -04:00
Christian 595d3e9e79 Some changes to the ForgeChunkManager.
Null modData is allowed now.
The entity id is actually properly persisted in the ticket now.
There is a new "orderedLoadingCallback" that allows you to provide a preferred ticket loading order in case of "excess tickets". Also, tickets
that are not in the returned list are now unregistered.
There is a way to resort the chunks in the forced chunklist on a ticket now.
Log the dormant cache configuration
2012-09-24 17:38:41 -04:00
Christian 021bbad2b5 Update FML: dd39ae5
dd39ae5 Try and fix the newline capture so consoles show on the server on windows again
b39f808 Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN.
2012-09-24 17:30:40 -04:00
Christian b29aebf338 Try and fix the newline capture so consoles show on the server on windows again 2012-09-24 17:22:39 -04:00
Christian 37340b0f80 Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN. 2012-09-24 17:22:16 -04:00
Christian 0610af28cd Update FML: a2c059e
a2c059e Fix missing import. Thanks ichun :(
19316a0 Version file searching should work for directories too
fbc7a5c Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed
e9cfd10 Merge pull request #103 from iChun/patch-2
1424883 Fixed ModTextureAnimation not updating and not binding to correct image.
2012-09-23 23:08:39 -04:00
Christian 0fd2b137ac Some more fixes for chunkloading code. Works very reliably now. 2012-09-23 23:08:38 -04:00
Christian 3022d556a8 Delete some debug code 2012-09-23 23:08:38 -04:00
Christian 56a87604f6 Simple chunk caching capability for the chunkloader. This will store "dormant" chunks in a
configurable cache, potentially saving the cost of reloading them from disk.
2012-09-23 23:08:38 -04:00
Christian 0b68cf93ff And a concurrentmodificationexception in the same code 2012-09-23 23:08:38 -04:00
Christian 0ac8d6ad3e Fix NPE in ForgeChunkManager 2012-09-23 23:08:38 -04:00
Christian 4c61f1d202 Remove @SideOnly flag for function now required on the server 2012-09-23 23:08:38 -04:00
Christian 9640c5dcf9 A lot of tweaks to the chunkloading for entity behaviour. Entities are now bound by a new
persistent id they *all* have, on the server side.
2012-09-23 23:08:38 -04:00
Christian c684360f51 Working cross dimensional implementation of chunkloading for Forge. 2012-09-23 23:08:38 -04:00
Christian d21e3ae218 Simple chunkloading implementation 2012-09-23 23:08:38 -04:00
LexManos a9e3a4dbb9 Fix patch errors in merge of last PR -.- 2012-09-23 16:53:20 -07:00
LexManos 0d0ba4b2d5 Merge pull request #181 from micdoodle8/patch-1
Fixed WorldProvider.setDimension() setting the wrong variable.
2012-09-23 16:33:36 -07:00
micdoodle8 d00f6f52bb Update patches/common/net/minecraft/src/WorldProvider.java.patch
Fixed WorldProvider.setDimension() setting the wrong variable.
2012-09-23 03:07:48 -03:00
Christian 98151df96b Fix missing import. Thanks ichun :( 2012-09-21 18:17:56 -04:00
Christian f73d283341 Version file searching should work for directories too 2012-09-21 17:39:52 -04:00
Christian cb2535fa95 Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed 2012-09-21 10:12:39 -04:00
LexManos b06829e26a Fix accedental doubling of shift, Fixes saplings/flowers planting a space above where they should 2012-09-21 05:35:46 -07:00
LexManos 28d2460611 New Plant API that allows for custom plants/soils. 2012-09-20 19:53:43 -07:00
LexManos c3f9fed484 Added new hooks for modifying the items generated in chests during world gen. 2012-09-20 18:45:33 -07:00
cpw d1458c594e Merge pull request #103 from iChun/patch-2
Fixed ModTextureAnimation not updating and not binding to correct image.
2012-09-19 05:12:04 -07: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 6b78512a48 Merge pull request #173 from CovertJaguar/patch-5
Fixed Entity Item render helper
2012-09-18 19:50:36 -07:00
LexManos 8c76914ef2 Merge pull request #175 from iChun/patch-2
Fix pick block key giving invalid spawn eggs
2012-09-18 19:47:15 -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
iChun cbf88adc98 Logic derp (again) 2012-09-18 22:55:11 +08:00
iChun 3188218a37 Logic derped 2012-09-18 22:53:28 +08:00
iChun 8940b13512 Fix pick block key giving invalid spawn eggs 2012-09-18 21:37:48 +08:00
iChun efb0e73df9 Fixed ModTextureAnimation not updating and not binding to correct image. 2012-09-17 23:46:09 +08:00
LexManos de24eea885 Fix potential NPE in Custom item entity span code caused by item id misconfigurations. 2012-09-17 04:56:26 -07:00
LexManos 61c21218e2 Fix recursion issue with new special item entity code. 2012-09-17 04:40:46 -07:00
CovertJaguar eb897fa9a9 Fixed Entity Item render helper 2012-09-17 00:25:26 -07:00
Christian e1c2a20e98 Update FML: 6c746ec
6c746ec Tidy code
aacbfeb Change version.properties search slightly, allow access to found file from the preinit event
1513b36 Add in the capability to read an internal version as <modid>.version from a file in the zip call versi
35852a6 Fix up reversed assignment for version fallback
2012-09-16 21:49:54 -04:00
Christian a837d82e68 Tidy code 2012-09-16 21:44:11 -04:00
Christian 9b081b9d46 Change version.properties search slightly, allow access to found file from the preinit event 2012-09-16 21:42:59 -04:00
Christian 83a57f5259 Add in the capability to read an internal version as <modid>.version from a file
in the zip call version.properties. Handy for autobuilding scripts.
2012-09-16 21:05:56 -04:00
Christian e619e00079 Fix up reversed assignment for version fallback 2012-09-16 21:05:56 -04:00
LexManos 8948a00d60 Readd reverted EntityLiving patch 2012-09-15 19:40:58 -07:00
LexManos 04c149fa11 Merge remote-tracking branch 'origin/master' 2012-09-15 19:39:54 -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 8f0b7c05fe Fixup Item in hand rendering of textures > 16x 2012-09-15 18:24:27 -07:00
LexManos b404f294c5 Make the exception print for headless servers if the Downloader cant initalize. 2012-09-15 18:06:59 -07:00
LexManos 48d12444c0 Remove a bunch of warning about javadoc, not a real fix, but no more warning. 2012-09-15 18:04:56 -07:00
LexManos 82fba4bfaa Update MCP Mapings 2012-09-15 17:09:45 -07:00
LexManos ec2a59bde8 Makes GetModSrc check the common folder when attempting to extract source files 2012-09-15 17:09:34 -07:00
Christian 149a626e5a Tie parent/child containers together again. Should close #96 2012-09-15 15:58:20 -04:00
Christian 9cd4ed0c91 Village mating produces added villagers, and the egg should place
added villagers too. Closes #97.
2012-09-15 15:49:08 -04:00
Christian 09558e9e15 Clean up stale references to the Player stored in the NetworkRegistry,
closes #100
2012-09-15 15:36:26 -04:00
cpw 23c89ec054 Merge pull request #99 from CovertJaguar/patch-1
More readable state event logs
2012-09-15 12:20:26 -07:00
CovertJaguar 13756b6f2c More readable init logs 2012-09-14 00:47:48 -07:00
LexManos bb2ac4c448 Package all of paulscode/ with the universal jar to help mac users who cant understand how to merge folders -.- 2012-09-12 14:58:46 -07:00
LexManos 12d4e39bdd Bump version to 4.1.2 to mark the end of todays changes. 2012-09-11 19:16:54 -07:00
LexManos a44181a192 Move spawn fuzz to WorldProvider/WorldType, useful for VoidWorld types. 2012-09-11 18:30:09 -07:00
LexManos af6b8820d4 Allow for respawning in different dimensions. 2012-09-11 18:28:55 -07:00
LexManos 72bba82150 Read/Write config files as UTF-8 instead of ANSII, should fix issue with Turkish people. 2012-09-11 18:00:51 -07:00
LexManos de47895e02 Fix potential issue with custom events where the constructor is not visible from the EventBus class, Should never arise but meh. 2012-09-11 17:49:21 -07:00
LexManos aeebb6e9f9 Add ability for Items to create custom Entities for themselves when added to the world, PR: #151 2012-09-11 17:35:53 -07:00
LexManos 96be8c4f19 Move Forge init message to MinecraftForge.initalize 2012-09-11 17:34:58 -07:00
LexManos 65ddfd49af Make EntityJoinWorldEvent Cancelable properly 2012-09-11 17:34:37 -07:00
LexManos 96c13d9049 Merge pull request #146 from dries007/Fly
Allow flight permissions to be player sensitive
2012-09-11 16:09:49 -07:00
LexManos 769f18ee61 Implemented isBlockFoliage for pull #141 2012-09-11 15:52:04 -07:00
LexManos 4524435e25 Fix a few patch fuzzes 2012-09-11 15:51:26 -07:00
LexManos 03d1e51764 New EntityItem related events
Fixed player death event in SMP
Added Player specific drops event
Added generic EntityJoinWorldEvent
2012-09-11 15:27:34 -07:00
LexManos da501613ac Clean up some javadoc warnings. 2012-09-11 13:11:17 -07:00
LexManos 848837bd5c EntityLiving variation of drawBlockDamageTexture to allow for Non-player viewports. 2012-09-11 12:46:40 -07:00
LexManos 8882388902 Fix FillBucketEvent to work with stacked buckets. New change in 1.3 2012-09-11 12:45:29 -07:00
Christian 2b9a80bfdd Update FML: 89b8236
89b8236 Fix onConnectionClosed not being called on the client side of a connection
2012-09-09 13:34:20 -04:00
Christian 0de240c4fe Fix onConnectionClosed not being called on the client side of a connection 2012-09-09 11:29:08 -04:00
Christian 66b60bc85e Remove all references to ModLoader 2012-09-09 10:02:21 -04:00
LexManos 03b3017e51 Bump version to 4.1.1 2012-09-08 21:47:14 -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
Christian 74343a0cff Add in exclusion list for IFMLLoadingPlugin. 2012-09-08 12:19:03 -04:00
Christian 3461c12d95 Remove debug cruft 2012-09-07 23:14:54 -04:00
Christian 67d8b3b475 To properly align with packet9respawn, make packet1login's dimension an int as well 2012-09-07 22:57:01 -04:00
Christian ab34f2d2cf Attempt to build some protocol negotiation, and fix packet1login so that the dimension is a short, matching packet9respawn 2012-09-07 22:46:31 -04:00
Christian c4d5c89f85 Compatibility level is now passed from server to client - and
the client tracks it. This means certain packet changes can be made
without breaking comms, hopefully
2012-09-07 19:32:36 -04:00
Christian 67b9fbe363 Fix dependency checking: you can depend on specific versions of FML 2012-09-07 19:08:28 -04:00
Christian 400cb07626 Update FML: 290a3c9
290a3c9 Merge pull request #94 from iChun/patch-1
9485dc5 Fix handleTinyPacket using short instead of int.
2012-09-07 11:37:56 -04:00
cpw 75c0e65092 Merge pull request #94 from iChun/patch-1
Fix handleTinyPacket using short instead of int.
2012-09-07 05:43:39 -07:00
iChun 7a0ab7e563 Fix handleTinyPacket using short instead of int.
Silly cpw :P
2012-09-07 18:35:26 +08:00
Christian 6b65fe9747 Update FML: e6abb69
e6abb69 Fix up tiny packet handler to actually work
e862052 Allow javax to be shipped by mods. Should allow some more modloader mods to work unaltered
4071ad1 Add in a little bit of protocol cleanup. Start work on allowing multiple protocol versions
6061964 Give a way to build the packet131mapdata packet correctly populated
b818769 Capture and leverage Packet131MapData
2012-09-06 23:04:55 -04:00
Christian e564610b54 Fix up tiny packet handler to actually work 2012-09-06 22:59:38 -04:00
Christian 94d076a14a Allow javax to be shipped by mods. Should allow some more modloader mods to work
unaltered
2012-09-06 22:03:02 -04:00
Christian d2e99c3443 Add in a little bit of protocol cleanup. Start work on allowing multiple
protocol versions
2012-09-06 21:54:43 -04:00
Christian 45bbdd14d6 Give a way to build the packet131mapdata packet correctly populated 2012-09-06 10:12:37 -04:00
Christian 8b8d9a58f6 Capture and leverage Packet131MapData 2012-09-06 10:03:30 -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 50c74f93bd Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff 2012-09-04 19:11:45 -04:00
Christian 6d9b9fde47 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom
chat messages rather than anything else. Hi Superior enchanting!
2012-09-04 12:37:59 -04:00
Christian 7a58542fb8 Rescan mod packages where there was a possible mod identified to try and make sure we load it. Fixes Matmos r16 2012-09-04 11:39:51 -04:00
Christian 793579f4f2 Update FML: 9d812f1
9d812f1 And handle the other way to globally register an entity
869cf78 Fix up mods trying to register entities outside of modloading. Now you'll get a big fat warning for doing such a de
186680c Fix CJB mod compatibilty for real. Gui container registration can now happen in the constructor. YUK!
5aed6d9 Fix compatibility with ModLoader dispenser hook. Fixes a bug with IDispenseHandler too - though it means that inter
3d7a665 Fix headless operation, hopefully
2012-09-03 22:25:58 -04:00
Christian 61153abf7b And handle the other way to globally register an entity 2012-09-03 21:37:20 -04:00
Christian 788d1c9925 Fix up mods trying to register entities outside of modloading. Now you'll get a big fat warning for doing such a derpy thing. 2012-09-03 21:32:21 -04:00
Christian 6de655df47 Fix CJB mod compatibilty for real. Gui container registration can now happen in the constructor. YUK! 2012-09-03 21:14:11 -04:00
Christian 2af15b3a95 Fix compatibility with ModLoader dispenser hook. Fixes a bug with
IDispenseHandler too - though it means that interface is now
deprecated
2012-09-03 11:37:17 -04:00
Christian 5bea2a0bbd Fix headless operation, hopefully 2012-09-02 13:29:46 -04:00
Christian 7bc8024ae3 Update FML: 10a7169
10a7169 Fix up trying to re-add stuff to the classpath when it's already there
0eb7180 Fix out of range entity id handling for ModLoader mods a bit more. Thanks Herobrine mod!
b1b4c61 Expose GuiMerchantButton
359cfb5 Log a big fat warning for the developer in the case the network version is not acceptable to the mod itself. (This can happen because of a bad range specifier for example)
2012-09-02 13:09:47 -04:00
Christian 599476d587 Fix up trying to re-add stuff to the classpath when it's already there 2012-09-02 12:56:08 -04:00
Christian d538dcf06f Fix out of range entity id handling for ModLoader mods a bit more. Thanks Herobrine mod! 2012-09-02 12:39:06 -04:00
Christian 6072420a02 Expose GuiMerchantButton 2012-09-02 12:15:13 -04:00
Christian 6056c760d4 Log a big fat warning for the developer in the case the network version
is not acceptable to the mod itself. (This can happen because of a bad range
specifier for example)
2012-08-31 23:41:29 -04:00
Christian 7828ff9ef9 Update FML: 8656fd5
8656fd5 Also, make missing entity not blow things up
25a4dcb Fix entity tracker "update" packet not computing correctly. Should work now..
2012-08-31 17:32:20 -04:00
Christian 8f70ed5f33 Also, make missing entity not blow things up 2012-08-31 16:49:35 -04:00
Christian 17cbb9d3b7 Fix entity tracker "update" packet not computing correctly. Should work now.. 2012-08-31 16:41:05 -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 bd137b7f06 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 changes made.
2012-08-31 11:18:17 -04:00
Christian befe8f5f47 Change download location for FML libraries to files.minecraftforge.net, add an encoding param to the javac command line to force utf 8 2012-08-31 11:18:17 -04:00
Christian 74d6437856 Add in random jar/zip files to the classpath. UGH this is so fucking ugly it's not funny. 2012-08-30 20:10:53 -04:00
dries kennes 15a3e76fc1 Allow flight,player sensitive 2012-08-30 20:16:20 +02:00
Christian 93f9cc45f9 Use a null socket and try to prefer the result of getLocalHost in the broadcast data. 2012-08-29 16:12:40 -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
Christian ece5483ad7 Add in an ItemRenderer null check so FML can run render adding mods 2012-08-29 13:58:56 -04:00
Christian 8df9a051d6 Inverted boolean logic. Grrr. 2012-08-29 13:44:40 -04:00
Christian 81a8e94c79 ModLoader mob spawns use packet 24- build a bypass system so that
they can still use it
2012-08-29 12:58:16 -04:00
Christian 3415dbfd0d Remove debug statements 2012-08-28 23:07:37 -04:00
Christian 4bf6b35ee7 Update FML: 9dd9b6e
9dd9b6e Fix keybindings not loading properly from gamesettings file after restart
2012-08-28 22:36:23 -04:00
Christian 3b0c0fcecf Fix keybindings not loading properly from gamesettings file after restart 2012-08-28 22:15:18 -04:00
LexManos 895365d9b9 Fix silk touch on Ender Chests. 2012-08-28 16:36:19 -07:00
LexManos 18f3d41a5b Merge pull request #142 from ShetiPhian/movecheck_override
Server mods can now use noClip to push players through solid blocks without is being an invalid move and resetting the players position. Useful for creating semi-solid blocks like quicksand.
2012-08-28 00:06:37 -07:00
LexManos 1a2ce02a7f Fix Issue #140: Custom items not properly having texture applied for partical effects. 2012-08-27 23:55:14 -07:00
Christian e50050a175 Update FML: acb0b21
acb0b21 Fix so we always send received packets to handlers. Renders 250 filtering useless unless i can figure a way to intercept
2012-08-27 23:43:13 -04:00
Christian 62a7d347e7 Fix so we always send received packets to handlers.
Renders 250 filtering useless unless i can figure a way to intercept *outbound* packets that isn't as messy as I'm
contemplating
2012-08-27 17:46:08 -04:00
Christian 29e41f6096 Update FML: b17dd3c
b17dd3c Some tests
fa66ffa Fix trying to load the client side packet handler, when on the server, hopefully?
b106420 Fix up network negotiation - now it will disconnect with a nice error screen if there are missing mods on the client vs se
2012-08-26 22:27:12 -04:00
Christian d105213aed Some tests 2012-08-26 22:23:05 -04:00
Christian 870214000f Fix trying to load the client side packet handler, when on the server, hopefully? 2012-08-26 22:18:57 -04:00
Christian 5a6275f0e1 Fix up network negotiation - now it will disconnect with a nice
error screen if there are missing mods on the client vs server
2012-08-26 22:13:43 -04:00
Christian 0cba5a5c4a Update FML: c971adb
c971adb Fix missing addCommand call: thanks "spawnwolf test command"
d6326de Fix a couple of modloader mods. Thanks!
483667c Some functionality fixes for @Instance injection.
8bef512 Versions now have two flavours: the @Mod(version) which is the "programmatic version" and is used for all version relationship calculatio
501009c Always for ML mods into "public" class accessibility - we don't call from the default package like ML does.
d3d4308 Add in a convenience method for getting a class instance based on existence of another Mod. Useful for soft dependencies.
2012-08-26 13:29:21 -04:00
Christian b32dea398b Fix missing addCommand call: thanks "spawnwolf test command" 2012-08-26 13:07:35 -04:00
Christian 4b371d8d5b Fix a couple of modloader mods. Thanks! 2012-08-26 12:52:50 -04:00
Christian 85a585725b Some functionality fixes for @Instance injection. 2012-08-26 10:55:55 -04:00
Christian fe73f11443 Versions now have two flavours: the @Mod(version) which is the "programmatic version" and
is used for all version relationship calculation. The "display version" as sourced from
mcmod.info is used for display purposes only and can be literally anything. Note: they fall back
to one another when they're missing, and to "1.0" if both are absent.

Also, changed @Instance. Now, you can inject *other* mods using @Instance as long as you depend
on them as a "before" or "dependency" relationship. Classes containing @Instance will only be
loaded if the Mod the @Instance refers is present. So you don't have to worry about runtime class
resolution.
2012-08-26 10:45:00 -04:00
ShetiPhian 050ca0bde9 Update patches/common/net/minecraft/src/NetServerHandler.java.patch
Update patches/common/net/minecraft/src/NetServerHandler.java.patch

Server mods can now use noClip to push players through solid blocks without is being an invalid move and resetting the players position.

Useful for creating semi-solid blocks like quicksand.
2012-08-26 06:14:51 -03:00
Christian a0302861cf Always for ML mods into "public" class accessibility - we don't call from the default package like ML does. 2012-08-25 21:57:25 -04:00
Christian 1da6a1fc6c Add in a convenience method for getting a class instance based on
existence of another Mod. Useful for soft dependencies.
2012-08-25 21:26:41 -04:00
Christian 350583c7f0 Update FML: 2d9b88b
2d9b88b And more mod sorting fixes.
93d5934 Actually *use* the sorted mod list
2012-08-25 09:11:46 -04:00
LexManos 58fc45619f Fix FillBucketEvent to actually fire. 2012-08-25 00:30:32 -07:00
LexManos 8fc05c399a Fix call to createTileEntity on blocks that extend BlockContainer. 2012-08-24 14:06:02 -07:00
Christian b308be04e7 And more mod sorting fixes. 2012-08-24 12:10:43 -04:00
Christian 67fa435dd4 Actually *use* the sorted mod list 2012-08-24 11:58:18 -04:00
Christian 0ae277b13e Update FML: 180a279
180a279 Merge pull request #82 from Chicken-Bones/master
cf38461 The access transformer will now handle classes in packages.
2c85539 Reverse the meaning of state in fml.modStates system property and fmlModState.properties - it was very derpy before. Now: true is enabled, false is disabled, as you would expect
d651189 Actually fix the corrupt JSON problem
f6a8cd5 Fix isModLoaded for "disabled" mods, and the toposort as well
3bde961 A bit more information for dependency handling
6396bea Fix up handing corrupt mcmod.info
6bc6def Fix a problem with network ids
7328610 Fix up version handling properly. Hopefully, and the error screen.
9fcc452 Only active mods should have dependencies checked, and be sorted
26302a6 Fix oddity with Screen, print a version out in the sorted list!
2012-08-23 19:52:01 -04:00
cpw 82551503bd Merge pull request #82 from Chicken-Bones/master
The access transformer will now handle classes in packages.
2012-08-23 16:47:13 -07:00
Chicken Bones 542219112a The access transformer will now handle classes in packages.
Eg.

public net/minecraft/client/Minecraft.T #timer
2012-08-24 08:09:10 +10:00
Christian 6657b6561b Reverse the meaning of state in fml.modStates system property and fmlModState.properties - it was very
derpy before. Now: true is enabled, false is disabled, as you would expect
2012-08-23 17:37:44 -04:00
Christian 02792c45e6 Actually fix the corrupt JSON problem 2012-08-23 17:27:53 -04:00
Christian 4f6861ee50 Fix isModLoaded for "disabled" mods, and the toposort as well 2012-08-23 17:08:18 -04:00
Christian 1870b7d793 A bit more information for dependency handling 2012-08-23 16:46:23 -04:00
Christian c465b17afe Fix up handing corrupt mcmod.info 2012-08-23 16:43:28 -04:00
Christian 72097d5bf5 Fix a problem with network ids 2012-08-23 16:38:34 -04:00
Christian 87fa59b0f7 Fix up version handling properly. Hopefully, and the error screen. 2012-08-23 15:29:17 -04:00
Christian 675f4115aa Only active mods should have dependencies checked, and be sorted 2012-08-23 14:33:54 -04:00
Christian e7c6a47951 Fix oddity with Screen, print a version out in the sorted list! 2012-08-23 14:28:49 -04:00
Christian e46b3de1ed Update FML: 62dbfb3
62dbfb3 Fix metadata
2012-08-23 14:09:42 -04:00
Christian 9974f7a6d5 Fix metadata 2012-08-23 14:05:17 -04:00
Christian c3df53f222 Update FML: b91cbe9
b91cbe9 Fix up versioned dependencies so they work a lot better, also add in a missing mods screen
2012-08-23 13:53:46 -04:00
Christian 4b6b090712 Fix up versioned dependencies so they work a lot better, also add in a missing mods screen 2012-08-23 13:43:25 -04:00
Christian 2da95d3f96 Update FML: 93b8ba9
93b8ba9 Fix missing serverSendPacket
23fdbbd Trading support for ModLoader - thanks Herblore!
d7a74d8 Close the jar, for cleanliness sake
58e6dd9 Fix authors - it'll read both "authors" and "authorList" from the json now
907cf2d More ML compatibility - fix up dragon mounts, thanks!
ee48a36 Fix up loading mods that are grandchildren of BaseMod
c6f362b Fix entity handling for ModLoader mods, thanks parachute mod!
2012-08-23 09:20:31 -04:00
Christian e6dce6cdbc Fix missing serverSendPacket 2012-08-23 09:02:12 -04:00
Christian e37b40dac9 Trading support for ModLoader - thanks Herblore! 2012-08-23 01:40:03 -04:00
Christian 4e8668c922 Close the jar, for cleanliness sake 2012-08-23 01:39:35 -04:00
Christian 12f66bdc86 Fix authors - it'll read both "authors" and "authorList" from the json now 2012-08-23 01:17:47 -04:00
Christian 346661cc6b More ML compatibility - fix up dragon mounts, thanks! 2012-08-23 00:37:45 -04:00
Christian fe0d081eec Fix up loading mods that are grandchildren of BaseMod 2012-08-23 00:04:34 -04:00
Christian 0ae888e8f8 Fix entity handling for ModLoader mods, thanks parachute mod! 2012-08-22 23:46:16 -04:00
LexManos 7b8914b24f Fix lighting issue for air related to 4096 fix. 2012-08-22 18:34:53 -07:00
LexManos 3a604ac0fa Merge remote-tracking branch 'origin/master' 2012-08-22 18:04:06 -07:00
LexManos 6f89cf54b8 Removed deprecated ISpawnHandler, that never worked in 1.3.2 so noone should be using it. See FML's replacement. 2012-08-22 18:03:10 -07:00
LexManos 0b1997a9e6 Made helper hooks for EntityLiving and EntityRenderer hooks for Optifine 2012-08-22 18:02:14 -07:00
Christian 25aef3543b Update FML: 6e01c59
6e01c59 Merge ChickenBones pull into FML - adds player trackers
a0cbd37 More precise error handling when an invalid class is present
12323e2 Fix textures not applying properly
789a4a3 Fix up entity spawning - hopefully they won't warp anymore.
a87d045 Add in a helper on the server start event for adding commands to the server.
82e9309 Move villager trading hook up a bit. thanks sengir.
8deaa37 Fix LAN to try hard to find a real network interface, not just localhost most of the time
b5363e3 Update build to not bother building client jar. Universal is everything now.
2012-08-22 18:13:11 -04:00
Christian 213cc63eca Merge ChickenBones pull into FML - adds player trackers 2012-08-22 18:00:55 -04:00
Christian 908a57f3c4 Fix formatting 2012-08-22 18:00:38 -04:00
Christian 8f6883da8e Tweak patches and hooks slightly 2012-08-22 17:58:46 -04:00
Christian 9bfa7acf0d More precise error handling when an invalid class is present 2012-08-22 17:50:07 -04:00
Christian af104b81f2 Fix textures not applying properly 2012-08-22 17:50:07 -04:00
Christian 5233ae520d Fix up entity spawning - hopefully they won't warp anymore. 2012-08-22 17:50:07 -04:00
Christian d544e56ec3 Add in a helper on the server start event for adding commands to
the server.
2012-08-22 17:50:07 -04:00
Christian be7b413bec Move villager trading hook up a bit. thanks sengir. 2012-08-22 17:50:07 -04:00
Christian 550c206997 Fix LAN to try hard to find a real network interface, not just localhost
most of the time
2012-08-22 17:50:07 -04:00
Christian 5330afb78e Update build to not bother building client jar. Universal is everything
now.
2012-08-22 17:50:07 -04:00
Christian ebc1aea5d2 Null protection for ticks() -- probably should uses EnumSet.noneOf() but
you can also use null now to stop ticking. closes #77
2012-08-22 17:50:07 -04:00
Christian f0d5732477 More precise error handling when an invalid class is present 2012-08-22 17:36:26 -04:00
Christian 4d44836bb3 Fix textures not applying properly 2012-08-22 17:27:06 -04:00
LexManos 0680e211fc Pickblock now replaces the currently selected item if it could not find a empty space. 2012-08-22 13:46:01 -07:00
LexManos a8191d0dae Merge pull request #135 from dvrabel/minecart-drag
Use original minecart drag co-efficients for regular carts.
2012-08-22 13:41:05 -07:00
Chicken Bones fe263206e2 FML will now search '<mcpdir>/forge/accesstransformers' for user defined access transformer config files to be applied during forge setup 2012-08-23 06:31:00 +10:00
Chicken Bones 0806bc7b22 Added IPlayerTracker hooks 2012-08-23 06:28:53 +10:00
Christian e713f7b1c2 Fix up entity spawning - hopefully they won't warp anymore. 2012-08-22 15:11:59 -04:00
Christian 252f3a5a92 Add in a helper on the server start event for adding commands to
the server.
2012-08-22 15:11:43 -04:00
Christian 1720382475 Move villager trading hook up a bit. thanks sengir. 2012-08-22 11:50:03 -04:00
Christian 7ff1e60af9 Fix LAN to try hard to find a real network interface, not just localhost
most of the time
2012-08-22 11:48:30 -04:00
Christian 09fe35d43c Update build to not bother building client jar. Universal is everything
now.
2012-08-22 11:12:26 -04:00
Christian 8e1a4cd6e0 Update FML: 28a10ac
28a10ac Null protection for ticks() -- probably should uses EnumSet.noneOf() but you can also use null now to stop ticking. closes #77
c349d51 Automatic mod entity registration into the global entity list. This might break entity code out there, sorry, but this way for most entities you no longer need to manage the global mod entity stuff at all. just remove it. FML will take care of the rest (note, worlds won't load the old entities)
ef01745 Add in a utility function that *might* tell you the context you're running in on either client or server: FMLCommonHandler.getEffectiveSide
c97d6a6 Try and stop sendPacketToAllAround from being crashy
2062273 Mods can add mod specific crash information to the crash report now Forge needs to implement MinecraftForge.getCrashCallable
6e6436e Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry
38f4a22 Fix up MLProp handling for null info
3a8b047 GUIs working in FML for ML mods
52483ee Support gui opening for Shelf mod
dce1cbc Updated MCPMerger to annotate unique classes with there sides, and SideTransformer to null out any class that is loaded on the wrong side.
2012-08-22 10:51:11 -04:00
Christian f9332bab3a Null protection for ticks() -- probably should uses EnumSet.noneOf() but
you can also use null now to stop ticking. closes #77
2012-08-22 09:43:32 -04:00
Christian 5d59af0cec Automatic mod entity registration into the global entity list. This might break
entity code out there, sorry, but this way for most entities you no longer
need to manage the global mod entity stuff at all. just remove it. FML will
take care of the rest (note, worlds won't load the old entities)
2012-08-21 19:34:33 -04:00
Christian d27e722903 Add in a utility function that *might* tell you the context
you're running in on either client or server: FMLCommonHandler.getEffectiveSide
2012-08-21 19:15:07 -04:00
Christian ba16217fe2 Try and stop sendPacketToAllAround from being crashy 2012-08-21 18:50:26 -04:00
Christian 63e8249040 Mods can add mod specific crash information to the crash report now
Forge needs to implement MinecraftForge.getCrashCallable
2012-08-21 18:48:12 -04: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
Christian a17396eca5 Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry 2012-08-20 21:44:54 -04:00
Christian ab90aa4d99 Fix up MLProp handling for null info 2012-08-20 21:44:47 -04:00
Christian b8a30cec94 GUIs working in FML for ML mods 2012-08-20 21:44:28 -04:00
Christian bb98ae9e28 Support gui opening for Shelf mod 2012-08-20 21:43:59 -04:00
David Vrabel 6ffe25eed6 Use original minecart drag co-efficients for regular carts.
Since the amount of speed lost is 1 - co-eff, rounding 0.997 to 0.99
makes a big difference to the distance a minecart will travel (less
than half of the distance in vanilla 1.25).
2012-08-21 00:46:09 +01:00
LexManos 85e3c330e7 Updated MCPMerger to annotate unique classes with there sides, and SideTransformer to null out any class that is loaded on the wrong side. 2012-08-19 22:26:52 -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
LexManos d3300cabb0 Added missing server side onBlockStartBreak hook, fixes Sheers. 2012-08-19 20:43:32 -07:00
LexManos 3a726c6e68 Fixed Forge's 4096 block filler initalization. 2012-08-19 17:59:06 -07:00
LexManos f341fdfd61 Fix IndexOutOfBounds exception, Major derp. 2012-08-19 17:41:21 -07:00
Christian bea2d8599f Update FML: 46c563a
46c563a Expose more of the village construction parts for building village piece
1380c2e Allow access to the type "ComponentVillage"
71a3818 Documentation and registration for villager stuff
e3a343c Fix javadoc derp
195b1a0 Villager trading, manipulation and village enhancement. Still WIP but sh
69e66c3 Fix exception based logging to actually log the exception!
2012-08-19 11:35:22 -04:00
Christian 45175c0e94 Expose more of the village construction parts for building village
pieces
2012-08-19 11:23:29 -04:00
Christian 52d3f237af Allow access to the type "ComponentVillage" 2012-08-19 10:35:06 -04:00
Christian 09c7ea2d9d Documentation and registration for villager stuff 2012-08-19 10:30:24 -04:00
Christian 3a0ad876b5 Fix javadoc derp 2012-08-19 10:21:19 -04:00
Christian 8a521c1d32 Villager trading, manipulation and village enhancement. Still WIP but should be functional 2012-08-19 10:13:15 -04:00
Christian b07f1069b9 Fix exception based logging to actually log the exception! 2012-08-19 09:31:26 -04:00
Christian 6a166944c6 Update FML:
885637c Fix up keyboard events for modloader
90a7c8f Pickup notification
2012-08-19 02:19:10 -04:00
Christian 3e94ee2c36 Fix up keyboard events for modloader 2012-08-19 01:44:33 -04:00
Christian a1385f4797 Pickup notification 2012-08-19 00:26:55 -04:00
LexManos 87e0fced25 Changed order in which EntityItemPickupEvent is called, it will no longer be called if the 'delay' on the item is still active. Also EntityItems that are in the world with invalid item stacks will now kill themselves. 2012-08-18 21:07:29 -07:00
LexManos 9d7a6bbb2e Merge pull request #129 from heldplayer/skyRenderer
Re: Adds a SkyProvider class that can handle the rendering of the sky
2012-08-18 18:02:09 -07:00
Christian ed34de1a76 Move and add a few AT for forge: rail and leaves stuff mostly
Update FML (reorg some AT for FML vs forge):
2171c0c Update fml_at with new transforms
924a6f9 Fix derp where client sided packet handler would be created on a dedi server env
ad4cffb Add in support for "dummy" keybindings- ones that are added to the list but never do anything so the mod can handle it all themselves.
cf77ffb Don't complain about minecraft source code being in "net.minecraft.src". Derp.
b2fdcd7 Fix ModLoader add XP Smelting
094ce2a Actually register client/server packetspecs as their correct sides! fixes #71
2012-08-18 20:25:08 -04:00
Christian ce276375b2 Update fml_at with new transforms 2012-08-18 20:08:27 -04:00
Christian 9a540ef6d4 Fix derp where client sided packet handler would be created on a dedi server env 2012-08-18 19:50:46 -04:00
heldplayer 59c77d7ca4 Adds a SkyProvider class that can handle the rendering of the sky 2012-08-18 21:05:21 +02:00
Christian f86a29468e Add in support for "dummy" keybindings- ones that are added to the list but never do anything
so the mod can handle it all themselves.
2012-08-18 10:24:29 -04:00
Christian b65a38cb30 Don't complain about minecraft source code being in "net.minecraft.src". Derp. 2012-08-18 10:09:53 -04:00
Christian 298d6db6e2 Fix ModLoader add XP Smelting 2012-08-18 10:09:25 -04:00
Christian 3d87561505 Actually register client/server packetspecs as their correct sides! fixes #71 2012-08-18 09:28:36 -04:00
LexManos 7f40671ad8 Fix MC packet bugs for remote servers that use blocks with ids > 256 2012-08-18 02:16:17 -07:00
LexManos a6d703edca Fixed bug in EntityMinecart that would cause them to fall through the ground at the bottom of slopes. 2012-08-17 23:50:25 -07:00
Christian 72c494923b Update FML:
e8cb2c1 Error if channel name is invalid - either too short, or too long
9c6c56c Add a connect and read timeout for downloading libraries. This should really stop the "waiting forever" at startup screen.
0d5affe GIANT FAT WARNINGS if you use any code in net.minecraft.src or any subpackage thereof. Get it out of there, now!
13f210f Fix up ML GUI ticking. Thanks sharose!
2012-08-17 17:07:10 -04:00
Christian 1cbe058250 Error if channel name is invalid - either too short, or too long 2012-08-17 16:59:48 -04:00
LexManos e30fef15d8 Update WorldProvider.path diff. 2012-08-17 13:32:38 -07:00
LexManos 21b4525643 Added timeout to MC's download of sound resouces. 2012-08-17 13:32:20 -07:00
LexManos 20e38dca99 Fix EntityItemPickupEvent 'pop' sound spamming. 2012-08-17 13:31:47 -07:00
LexManos 912072535d Fixed EntityEvent.CanUpdate 2012-08-17 13:31:04 -07:00
Christian 8a679f6d9e Add a connect and read timeout for downloading libraries. This should really stop the "waiting forever" at startup screen. 2012-08-17 16:21:18 -04:00
Christian 0e473145b3 GIANT FAT WARNINGS if you use any code in net.minecraft.src or any subpackage thereof. Get it out of there, now! 2012-08-17 16:13:05 -04:00
Christian 73bf3a8985 Fix up ML GUI ticking. Thanks sharose! 2012-08-17 16:09:46 -04:00
Christian 1b73a8da79 Update fml:
c61ad51 Organize ALL the imports
c0842b0 Expose the server in serverstart event
2851079 Fix up directory injection of log file locations
5197524 Refer to FMLLog, not FMLRelaunchLog
78efd1a Tidy up server launch - reflection not required anymore
eee0a99 Also, log what the directory discoverer finds for mcmod.info
10c96c3 And log the exception if it has a problem reading the jar file
07cc3fb Fix jar loader failing to inject any metadata at all if mcmod.info is not found.
e31f143 Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client.
2012-08-17 09:40:33 -04:00
Christian 5ea0932e24 Organize ALL the imports 2012-08-17 09:25:04 -04:00
Christian 290f2d6781 Expose the server in serverstart event 2012-08-17 09:25:04 -04:00
Christian 94f834d5d7 Fix up directory injection of log file locations 2012-08-17 09:25:04 -04:00
Christian 30d6970e77 Refer to FMLLog, not FMLRelaunchLog 2012-08-17 09:25:04 -04:00
Christian 8408f58fb1 Tidy up server launch - reflection not required anymore 2012-08-17 09:25:04 -04:00
Christian 0fab4eca7b Also, log what the directory discoverer finds for mcmod.info 2012-08-17 09:25:04 -04:00
Christian 549969ade6 And log the exception if it has a problem reading the jar file 2012-08-17 09:25:04 -04:00
Christian 26bb005731 Fix jar loader failing to inject any metadata at all if mcmod.info is not found. 2012-08-17 09:25:04 -04:00
LexManos 8444fa6d3c Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client. 2012-08-16 22:57:11 -07:00
Christian 4297a348db Update FML to include some ML compatibility fixes. Minimap should run, assuming he
recompiles against standard ML interfaces.
This updates to official MCP 7.2, so you'll need to rebuild your workspace (some
small but important patches to MCP went in)
2012-08-16 14:30:14 -04:00
Christian 11c1cae8b0 Some compatibility fixes for Rei's minimap, and tidy up a couple of things 2012-08-16 13:55:42 -04:00
Christian 4d87779d39 Fix Forge branding string call 2012-08-16 13:01:48 -04:00
Christian 1cc6778038 Update FML for mcp 72 final, change download location for FML files, and make the stop button work.
Hello is NOT going to go away :)
2012-08-16 12:22:56 -04:00
LexManos e31b6c0be4 Allow white space in the property name. 2012-08-16 09:11:04 -07:00
Christian e4a9cf4993 Update FML, make the .sh scripts executable 2012-08-16 08:46:52 -04:00
Christian a7a1f55091 Fix critical bug in FML load controller that complains about injected mod containers 2012-08-16 08:34:12 -04:00
LexManos 4682cc2753 Update FML to 285 2012-08-16 03:13:52 -07:00
Christian e1fd0b1d7b Handle the case where a mod tries to do something stateful during constructor phase, and log a big
fat message about it. Don't do it!
2012-08-15 20:05:12 -04:00
Christian 81512c3458 Small fixes, including showing the FULL name of Forge Mod Loader 2012-08-15 19:54:56 -04:00
Christian fcf6fd57ee Fix up null array in keybinding handler 2012-08-15 19:17:21 -04:00
Christian 7988323073 Actually add in the system property for the minecraft home, should fix multimc too 2012-08-15 19:16:36 -04: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
Christian ba902537ca Add in support for setting the home dir via the applet launch, also a system property for forcing the home dir 2012-08-15 17:18:11 -04:00
LexManos 7ad090b5f1 Whops 2012-08-15 04:38:10 -07:00
LexManos bed6c410b6 Fix potential index exception in ForgeDirection 2012-08-15 04:37:45 -07:00
LexManos fc430243d1 Rename Orientation to ForgeDirection {Damn MCP naming a class Direction already} 2012-08-15 04:28:09 -07:00
LexManos 035328496c Update FML again for mod screen blending fix. 2012-08-15 03:15:41 -07:00
LexManos 96b78514a8 Cleanup fml.py a little, should fix double printing of 'patching file' 2012-08-15 03:10:45 -07:00
LexManos e0cb8cd503 Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96 2012-08-15 02:52:29 -07:00
LexManos 06aaa9e9a4 Add render distance property to TileEntity. 2012-08-15 02:18:23 -07:00
LexManos 4967683c9c Fix issue with default getContainerItemStack 2012-08-15 02:09:21 -07:00
LexManos d9423a4f25 New Command event. 2012-08-15 02:01:38 -07:00
LexManos 60a9655602 Seperated block placmenet logic in ItemBlock as immibis requested: https://github.com/MinecraftForge/MinecraftForge/pull/110 2012-08-15 01:48:34 -07:00
LexManos 57441b8678 Fix ItemBlock placement, should fix RP Deployers placing blocks 1 tile down. 2012-08-15 01:32:05 -07:00
LexManos e6b61cb33d Updated Orientation with new helper functionality. 2012-08-15 01:31:02 -07:00
LexManos 50e6b39a29 Updated FML, should fix the new included eclipse workspace. 2012-08-15 00:55:01 -07:00
LexManos 022b3e57dc Made getmodifiedsrc noop for server. 2012-08-15 00:50:40 -07:00
LexManos 9ad520cb2a Fix new eclipse workspace to load the project properly from start. 2012-08-15 00:50:16 -07:00
LexManos 393852920c Fixed bug in DimensionManager that would cause Index error for custom dimensions, also made WorldProviders aware of what dimension they are. 2012-08-14 23:59:15 -07:00
LexManos 57dcfc5dd0 Updated patches to 1.3.2 2012-08-14 23:58:32 -07:00
LexManos 9aa5d69679 Cleaned up forge scripts, and updated AT config for 1.3.2, deleted any reference to server specific code. 2012-08-14 23:57:16 -07:00
LexManos 77fd7add11 Update FML to 278, MC 1.3.2 2012-08-14 23:55:24 -07:00
LexManos 41333e001f Cleanup repo, delete old code 2012-08-14 23:19:36 -07:00
Christian c1e0cbb7f1 Merge branch 'minecraft132'
Yes, we are already on 1.3.2
2012-08-14 22:33:28 -04:00
Christian 071caee228 KeyBinding handler change: a handler now takes an array of keys and calls back with the
activated key. Sorry for the inconvenience but this improves the usability of this
API a lot
2012-08-14 22:32:19 -04:00
Christian 352df9cc30 Fix renderer's not getting the rendermanager set on them at registration time 2012-08-14 22:32:19 -04:00
LexManos eef3303dfe Finished update to MCP 7.2, MC 1.3.2 pre. 2012-08-14 19:24:49 -07:00
Christian 75fb35b240 KeyBinding handler change: a handler now takes an array of keys and calls back with the
activated key. Sorry for the inconvenience but this improves the usability of this
API a lot
2012-08-14 22:06:49 -04:00
Christian 04fc1c6c59 Fix renderer's not getting the rendermanager set on them at registration time 2012-08-14 21:59:47 -04:00
LexManos 646a0b4fc4 Fixup included workspace to have single project with client/server launches. 2012-08-14 17:42:40 -07:00
Christian 3d0bd2bc7a Start working on MC 1.3.2 2012-08-14 20:09:24 -04:00
Christian b69364e168 Add in a helper for code migrating from ML renderer stuff 2012-08-14 19:09:22 -04:00
LexManos 3b18bfae40 Readded patch to allow for use of custom teleporter for transfering dimensions. 2012-08-14 15:03:40 -07:00
Christian e856f6196a Merge pull request #62 from calclavia/patch-1
Shortcut function for addNameForObject()
2012-08-14 13:52:58 -07:00
calclavia 4c5dcb543f Shortcut function for addNameForObject()
Having that long line of code makes the code a bit ugly... Please make this shortcut function like ModLoader.addName() so I don't need to use ModLoader.addName(). :)
2012-08-15 04:45:32 +08:00
Christian a234fdf00b Handle mod duplicate detection much better. Default the name of a mod to it's id.
Fix up the block registry problem. Fix the packetsend from c->s actually being
"disconnect" :)
2012-08-14 13:36:29 -04:00
LexManos 111c5021de Update FML with entity spawning fixes 2012-08-14 05:37:54 -07:00
Christian 5f4423119a Fix entity spawn packets 2012-08-14 08:20:28 -04:00
LexManos c34a732133 Updated FML, should fix 'derp?' RuntimeError 2012-08-14 01:28:13 -07:00
LexManos d7dcbe7007 Force a Jenkins build 2012-08-14 01:21:56 -07:00
LexManos f98c252bcb Merge pull request #60 from remuladgryta/master
fixed 'derp' error on @NetworkMod
2012-08-14 01:16:29 -07:00
remuladgryta 438c8eca35 fixed java.lang.NoSuchMethodException
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03:00
LexManos de43520870 Fix PickBlock 'ghost item' bug when picking with a item selected. 2012-08-13 23:05:39 -07:00
LexManos 2a8a917fdd Update release script to create universal binary distro. 2012-08-13 22:28:23 -07:00
LexManos 75a0bf2c09 Update debug settings to use Client's internal MinecraftServer.main to debug dedi-server env. 2012-08-13 22:28:07 -07:00
LexManos de7c3b2cab Delete Forge server projects 2012-08-13 22:27:31 -07:00
LexManos 1d325c0325 Update FML, Tons of bug fixes and proper merging of client and server. 2012-08-13 22:27:10 -07:00
LexManos f1a8b2ea72 FML will skip gathering MD5s for classes in the cpw package during the the inital recompile {Make Side/SideOnly reobf properly} 2012-08-13 21:53:52 -07:00
LexManos 908227ce0c Merge remote-tracking branch 'origin/master' 2012-08-13 21:05:14 -07:00
LexManos bbcdaa7dfb Updated FML install to provide better error output, Updated commands.py patch to disable recompile of server project. 2012-08-13 21:02:55 -07:00
Christian 6f10295936 Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities 2012-08-13 23:25:08 -04:00
Christian a8f69529fd Fix up concurrent modification exception - ticks for players now occur on both sides 2012-08-13 22:55:23 -04:00
Christian 7de5191848 Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use
This means the FML-Server project is now defunct as all code is either common, client or bukkit.
2012-08-13 22:51:53 -04:00
Christian 416cac675b Actually fix the applet launch - it now launches properly *and* closes the window 2012-08-13 22:12:36 -04:00
Christian 17bf8dc363 Fix up relaunch of the applet 2012-08-13 21:44:43 -04: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
Christian 466022b402 Change language loading a bit 2012-08-13 20:28:53 -04:00
Christian df9ec4bf3f Update spritehelper bitmaps for items and terrain 2012-08-13 20:08:03 -04:00
Christian fa38c1a6b3 Tidy up some APIs, expose the addOverride mechanism. This should be pluggable by forge
but may need work to allow for each mod to have it's own override set
2012-08-13 19:57:40 -04:00
Christian 6a273dd98f Fix derp in LanguageRegistry 2012-08-13 16:45:47 -04:00
LexManos e762b58bbf Merge pull request #116 from bloodandiron/bonemeal-fix
Bonemeal handler fix
2012-08-13 13:15:25 -07:00
Christian f41391b13c FMLModcontainer should not complain about annotations it has no idea about. so stfu fmlmodcontainer 2012-08-13 16:15:11 -04:00
Christian 179ed74456 Fix derp with EntityRegistry- bimap is not the right type for the name->container list 2012-08-13 15:55:24 -04:00
Jonathan Marini 66bd2868cb Fix bug where default bonemeal behavior wouldn't trigger. Only return if the event was canceled. 2012-08-13 15:42:19 -04:00
Christian deab31fb03 Add in a sided variant of the packethandlers in the annotation - also, a bit more
explicit warning on when to register blocks - if you do it after pre-init, you'll
reset the achievements
2012-08-13 15:26:29 -04:00
Christian c393299a91 Generate channel registration for client, also, do it before the login events so you can send packets 2012-08-13 11:58:44 -04:00
Christian 80b3f0fd97 Capture server packet handling errors into the FML log file for diagnostics 2012-08-13 11:52:30 -04:00
Christian 519d2365ca one more change for the road :) 2012-08-13 01:24:02 -04:00
LexManos ede1e54c5e Update FML, new AT features, and error info. 2012-08-12 21:55:56 -07:00
Christian 71642f02f8 Don't spit debug all over the floor 2012-08-13 00:24:15 -04:00
Christian 0c3535ff26 updated conf, commands patch (missing newline?) and capturing the actual running
MC version and validating it at relaunch time is the correct MC version.
2012-08-13 00:17:34 -04:00
Christian 6f4dbd5376 Add in callableminecraftversion 2012-08-12 23:54:41 -04:00
Christian 9b74df5e62 Entity AI accessibility, also AccessTransformer can make certain classes public now 2012-08-12 23:50:27 -04:00
LexManos 6f38691efc Update AT config to expose some block functions and a few extras. 2012-08-12 20:40:57 -07:00
LexManos 1c7d20ad36 Delete dead IGuiHandler 2012-08-12 20:40:35 -07:00
LexManos 0451ea7618 Updated FML 2012-08-12 20:40:26 -07:00
LexManos 83f7a57199 Fixed ItemRenderer not grabbing custom texture files properly for block items 2012-08-12 20:40:04 -07:00
Christian 8d8f36bac0 Add in a simple packet dispatcher for sending packets around 2012-08-12 22:45:18 -04:00
Christian 8a0cfed5c6 Add in a sided packet registry so that client vs server can vary 2012-08-12 22:23:03 -04:00
Christian e229b6f6eb Fix double forge init on server 2012-08-12 20:34:23 -04:00
LexManos bef0090af0 Should fix commands.py patching not working properly first run. 2012-08-12 14:32:01 -07:00
Christian 8a74a152e5 Merge pull request #50 from Krapht/master
Fix for getNextAvailableRenderId() returning ids in use by vanilla - thanks krapht!
2012-08-12 06:55:23 -07:00
Krapht c1dccae4b8 Fixed getNextAvailableRenderId() returning ids in use by vanilla 2012-08-12 14:45:03 +02:00
LexManos a024be74e6 Updated FML, Should fix a lot of installing issues for MCP.
Made patches error and not apply if the target file is not found.
Updated Event Transformer to add a default constructor...
Fixed 4096 setup code in MinecraftForge.initalize()
2012-08-12 05:14:32 -07:00
LexManos f73e4b6169 Fix MCPMerger injecting Side/SideOnly when it already exists. 2012-08-12 04:27:36 -07:00
LexManos 9777204547 Added patch verification to commands.py patch, and made it so MCP will check the original jars for the server, to prevent it from saying modified when it started out clean. 2012-08-12 02:49:39 -07:00
LexManos 0b343c1a49 Add DEBUG constant to Access/Side Transformers to remove spam when not needed. Also AccessTransformer and MCPMerger should return a error code when it can not process causing MCP to stop decompile. 2012-08-12 01:23:10 -07:00
Christian 4f7996e361 Fix EntityRegistry - mods can specify update frequency, range and velocity data, and also
patch EntityTracker to actually track FML entities
2012-08-12 00:18:04 -04:00
Christian 20029feb88 Fix NPE with no channels - always register FML 2012-08-12 00:17:07 -04:00
LexManos da426653a8 Fix issue in install script for users with spaces in there paths. 2012-08-11 16:15:03 -07:00
LexManos c4149f7b55 Added missing quotes around compile command. 2012-08-11 16:03:33 -07:00
LexManos 6b4288d00f Updated FML, fixed custom tool hooks, and spawn protection/player reach hooks. 2012-08-11 14:45:48 -07:00
Christian f20ef77a91 Fix up the network mod issue properly. Maintain a real cache of mod objects 2012-08-11 16:21:03 -04:00
LexManos 97aae96754 Update FML, server should run now. Still issue with NPE with no mods installed. 2012-08-11 11:16:37 -07:00
Christian 6d79241652 Remove profiler stuff - it's been deeply reorged. I'll look at re-adding it later 2012-08-11 14:12:39 -04:00
Christian 4f9cc6b398 Fix up command patch to actually work 2012-08-11 14:12:23 -04:00
Christian 5a0d08b892 Fix commands.py to always include the two side classes so the fml jars are valid. 2012-08-11 14:01:27 -04:00
Christian 85f665dd1d Fix build script- put client in first 2012-08-11 13:05:37 -04:00
Christian 2d31dbba15 Put the marker on the server ML file too 2012-08-11 13:04:59 -04:00
Christian 938cecbdf7 Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable" 2012-08-11 12:34:25 -04:00
Christian 57de5c1b90 Fix up launch when obfuscated *sigh* 2012-08-11 12:24:43 -04:00
Christian 35fda10b50 Update netclienthandler patch. 2012-08-11 12:10:22 -04:00
Christian d663884aa5 Fix NPE for server relaunch 2012-08-11 12:05:13 -04:00
Christian ff18294591 Fix up Package.getPackage(), also fix up loadcontroller construction 2012-08-11 11:44:55 -04:00
Christian 3918c5e810 Add in Package.getPackage() support for sengir 2012-08-11 11:12:16 -04:00
Christian 92b7ed1182 Lost of work to try and complete ML support - probably still bits missing, but mostly there 2012-08-11 11:02:09 -04:00
LexManos ba55320462 Fixed Diemsnion API related NPEs, and updated FML to 231. 2012-08-11 03:08:09 -07:00
LexManos 185f8ddbc7 Newlines in diff file 2012-08-11 02:27:19 -07:00
LexManos 953f99787e Add special case to add Side/SideOnly to difflist 2012-08-11 02:25:40 -07:00
Christian 7e35f13f30 Fix up some network related stuff and optimize mod lookup a bit 2012-08-11 02:43:04 -04:00
Christian 2e66429b03 Fix up proxy injector to inject properly 2012-08-11 02:24:29 -04:00
LexManos 1e4d788cd0 Fix decompile 2012-08-10 20:41:59 -07:00
LexManos 55636eabab Updated FML, updated patches 2012-08-10 20:30:59 -07:00
Christian 7440cc89e9 Fix NPE on missing mods - still need to actually handle missing mods properly on client 2012-08-10 23:27:11 -04:00
Christian fde0619e9b New downloader UI and new downloader backend - should be more robust now 2012-08-10 23:18:52 -04:00
LexManos a1c14779d2 Added -no_gen_conf to jenkins build 2012-08-10 20:09:47 -07:00
LexManos 5a1f84ed5b Added some extra error prints, hopeully get something useful when installed in the client. 2012-08-10 18:54:06 -07:00
LexManos 49385961d9 Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain. 2012-08-10 18:25:11 -07:00
LexManos f374723610 Update fml, impelemnted Diemsnion API stuff. 2012-08-10 18:15:10 -07:00
Christian dd319a2938 SidedProxy should work again - anywhere. Make sure it's on a static field though 2012-08-10 17:42:43 -04:00
Christian 7b2d09844c More ticking hooks, and some other bits of clean up. Very close to "done" now. 2012-08-10 17:11:01 -04:00
Christian b5dc18ff7e Fix up modloader and clean up junk method 2012-08-10 16:42:21 -04:00
Christian 5e7cb9106d A lot of missing patches to code re-added. Almost all functionality should now
be restored.

ModLoader compatibility is not yet assured, there are some wrapper classes that
need re-writing first
2012-08-10 16:39:03 -04:00
LexManos fcd4a8e854 Readded common folder to startclient/server. 2012-08-10 12:38:59 -07:00
Christian 1c189ae762 Add in a registration method for gui handlers 2012-08-10 11:12:57 -04:00
Christian a58306abc6 Overwrote lex's command patch 2012-08-10 10:57:18 -04:00
Christian 3c1b234a61 Fix up MCP merger - it definitely works now - the game runs and runs well.
Fix up a couple of small network related issues.
Fix up the server launching fml properly.
2012-08-10 10:03:33 -04:00
LexManos 3aa13d8640 Include Forge's AT config into redist zips. 2012-08-10 02:25:48 -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 d14b1b4e1f Fix oreientation bug causing levers not being able to place. 2012-08-10 02:08:26 -07:00
LexManos 44e6fd90c9 Moved over Configuration 2012-08-10 00:31:39 -07:00
LexManos ba0cc6ec12 Added common folder support to startclient/startserver 2012-08-09 20:34:16 -07:00
LexManos 349da399ff Added some missing quotes that caused issues if your workspace had a space in it. 2012-08-09 20:01:51 -07:00
LexManos f36d410cc4 Update fml 2012-08-09 19:13:12 -07:00
LexManos dca24fd567 Add lib folder to installed eclipse 2012-08-09 19:02:28 -07:00
LexManos 69e9c31aef Copy forge files over in install. 2012-08-09 18:48:20 -07:00
LexManos a759939e13 Delete conf, server compile, update fml, and fix install script. 2012-08-09 18:37:52 -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
Christian 6eb4bceee3 Add in missing patch - also, launch FML properly from the server 2012-08-09 09:21:16 -04:00
Christian 6d0f7ace17 Entity spawn adjustment - tracker 2012-08-09 08:40:32 -04:00
LexManos ba9e3a251c Nope, unneeded patch 2012-08-09 03:11:40 -07:00
LexManos dae4a07c60 Updated Client side patches for the new Merged MCP workspace. 2012-08-09 03:06:41 -07:00
LexManos 859ebae365 Fix ModLoader compilation, and MCPmerger invocation for Forge. 2012-08-09 03:04:25 -07:00
LexManos 3d26511322 Include conf folder and merge config in source zip 2012-08-08 23:44:32 -07:00
Christian 185babbd85 Entity spawning - done 2012-08-09 01:58:14 -04:00
Christian d970f7a530 Generate a universal binary package since we can now :) 2012-08-09 01:57:42 -04:00
Christian 83fdb602e2 Merge branch 'MergingClientServer' 2012-08-08 22:58:33 -04:00
Christian c1bd11e64a Reorganized all the current patches 2012-08-08 22:57:37 -04:00
Christian c1b3bfd007 Fix up annotation parser to parse arrays and enums 2012-08-08 22:10:56 -04:00
LexManos 9b81775a2f Added SideTransformer to strip side only functions/fields out. 2012-08-08 18:53:41 -07:00
LexManos ac8945a4f8 Stage 1 of merging the client and server for MCP.
Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910

Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
2012-08-08 05:48:06 -07:00
Christian 77f4cc5bea Gui Handler ported from MC forge 2012-08-08 00:31:24 -04:00
Christian 8998d4c5e0 Revert dumb stuff with commands patch - lots of gfx patching 2012-08-07 23:11:37 -04:00
LexManos 1bd8cdcd3e Removed a lot of old files 2012-08-07 18:31:25 -07:00
Christian 0ddf61cee2 Almost finished basic network stuff now 2012-08-07 20:41:37 -04:00
Christian 84efb72e46 Update some patches- more network work 2012-08-07 20:10:36 -04: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
Christian f4b9055171 Bunch of hooks re-added : network is more complete now, lot of basemod cleanup, moving stuff into
the registry area
2012-08-06 22:30:13 -04:00
LexManos 8db1584730 Moved some files. 2012-08-06 17:52:48 -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
Christian 12927291a7 Fix location of forge in common handler - also some tweaks to modloader and other stuff 2012-08-06 17:27:21 -04:00
Christian 73bdd512c5 Network support - there's still some work to do and full id sync isn't done yet, but it has proper registration
semantics and hooks for 250 handling
2012-08-06 16:12:50 -04:00
Christian 8bda53cb77 Add in a lot of network handler stuff - also, expose the asm harvested data 2012-08-06 09:52:42 -04: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 bb0f84925e Moved in OreDictionary stuff to new system. IOreHandler is replaced by OreDictionary.OreRegisterEvent 2012-08-05 17:59:53 -07:00
LexManos bd93dd58d0 Missed a file 2012-08-05 03:23:38 -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
Christian 09098f8a0f Remove some unneeded fields from the annotations 2012-08-05 02:24:02 -04:00
LexManos 5672b783da Moved paulscode to new client folder 2012-08-04 22:53:48 -07:00
LexManos 63d5d42512 Made empty constructor for ModMetadata public 2012-08-04 22:51:57 -07:00
LexManos 247ff9b737 Updated update_patches.py, and made first patch! 2012-08-04 22:50:54 -07:00
LexManos 0d8940899c Moved logo to new client folder
Added blank Access Transformer config for Forge
Implemented version storage
Added basic dummy FML mod container to remove the need for mod metadata file
Added beggining work on Forge event system
Updated and moved EnumHelper
2012-08-04 22:45:31 -07:00
LexManos b76adcea8c Update FML 2012-08-04 22:42:50 -07:00
LexManos b1a51f3bc1 Updated build.py 2012-08-04 22:42:17 -07:00
LexManos bc757191a5 Remove eclipse files from old eclipse projects 2012-08-04 22:41:31 -07:00
LexManos 7e68b53196 Fix path trimming for copytree 2012-08-04 20:36:27 -07:00
LexManos 188d40b89a Added merging fields/methods/param csv files. And updated FML to 197 2012-08-04 19:29:54 -07:00
Christian e92be964fd Change property name to fml.modStates not fml.disabledMods- it makes more sense that way 2012-08-04 12:35:46 -04:00
Christian 969de94d8a Add in a bit of logging when events get sent to mod containers 2012-08-04 11:45:40 -04:00
Christian e39092335a Allow coremods to inject a modcontainer and run code
this will mean that FML is deliberately and very obviously incompatible with a modloader installation.

Fix up worldtype so that the server can run.
2012-08-04 11:31:06 -04:00
LexManos ae79c79447 Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts. 2012-08-04 03:34:34 -07:00
LexManos 06bd2d9d44 Helper function grab all unique searge names that are shared client and server 2012-08-04 03:17:57 -07:00
LexManos d52d58525b Add newids to that list 2012-08-04 02:40:21 -07:00
LexManos cd4efe616f Add the direct copied files from MCP conf 2012-08-04 02:35:34 -07:00
LexManos 53cf27f632 Committing inital work on generating sanitized MCP conf data. 2012-08-04 02:33:46 -07:00
LexManos 72f1f3fb0d New Start.java which allows the user to login using a legit account for testing on servers. 2012-08-04 02:32:43 -07:00
LexManos f6010fd077 Dump old mcp config 2012-08-04 02:29:24 -07:00
LexManos e59bb6679e inital push of updated setup script and cleaned up forge.py 2012-08-04 00:55:17 -07:00
LexManos a4d6d7028d Added a better eclipse workspace for deving Forge 2012-08-04 00:53:35 -07:00
LexManos c2d851cf20 Get rid of all old patches 2012-08-04 00:00:31 -07:00
LexManos fc8c2ac6e4 Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name. 2012-08-03 23:51:49 -07:00
LexManos fbc968e1b4 Change place commands.py backup is stored. 2012-08-03 23:24:58 -07:00
LexManos 08eb7c5c45 FML finish won't updatemcp automatically, easier integration with forge. 2012-08-03 17:36:16 -07:00
LexManos 18aec5b257 Fix packaging and install to not have the src/ folder, making it align better with the dev env. 2012-08-03 17:32:23 -07:00
LexManos 25e422d583 Bumped version to 3.4.9, final commit for 1.2.5. 2012-08-03 16:56:32 -07:00
LexManos 34706d6acf Moved setting up eclipse to setup_mcp 2012-08-03 16:56:00 -07:00
LexManos b572c6a038 Fixed ant script to support common folder building and add the new files to the dist archives. 2012-08-03 03:37:45 -07:00
LexManos 2fccc04903 setup_fml's decompile will result in proper md5 files now {if there is no compiler issues} 2012-08-03 03:35:38 -07:00
LexManos 7949a15226 Removed FMLRegistry, and IMinecraftRegistry.
Updated server side to use the seperated registry classes like the client does.
Updated searge name references on server
Made StatBase.statName public using AccessTransformer
Server should compile now
2012-08-03 01:50:48 -07:00
LexManos 476dfbc754 Fix MockBlock compile 2012-08-03 01:47:09 -07:00
LexManos f1717526d8 Download argo/guava source references in install, and updated eclipse workspaces to reference them. 2012-08-02 23:36:00 -07:00
LexManos 56153c43d6 Cleaned up commands.patch, removed debug print in fml.py 2012-08-02 21:14:06 -07:00
LexManos 79ed963c4a Remove clientdrop, old reference files. 2012-08-02 20:32:51 -07:00
LexManos 5f848d3d2a Delete some dead files 2012-08-02 19:42:12 -07:00
Christian 1b20de0ab6 Fix commands patch, WorldType patch and some ML compat stuff 2012-08-02 20:09:18 -02:30
Christian 6d70a76c95 More fixes 2012-08-02 16:50:30 -02:30
Christian b51c357d50 More build fixes for jenkins 2012-08-02 10:33:29 -02:30
Christian e44515304a Try and fix the jenkins build 2012-08-02 10:30:52 -02:30
Christian dab4179024 Change some event names, hook up the event code for server events for FML 2012-08-02 09:31:03 -02:30
Christian 2df9ba14d4 Merge branch 'newfmlmod' 2012-08-02 08:52:11 -02:30
LexManos 1e47f3e468 Introduced patching of runtime/commands.py to allow for usage of the src/common folder. 2012-08-02 00:51:51 -07:00
Christian 582a785fb8 Change some stuff around - begin launching the server through the wrapper too.
A lot of patches went in - the client and server both launch and start up mods.
2012-08-02 02:08:30 -02:30
LexManos 6eb4353b95 Rebase 2012-08-01 17:41:34 -07:00
LexManos b9d3497b60 Merge pull request #114 from cpw/master
Line endings
2012-08-01 17:04:16 -07:00
Christian c21dca182c Normalize the repo 2012-08-01 21:21:29 -02:30
Christian ff152479e6 More stuff 2012-08-01 21:19:11 -02:30
Christian 7f8bf56d4f Fix classpath for Client, maybe? 2012-08-01 21:19:11 -02:30
Christian 22fd1652a0 Line endings for this branch 2012-08-01 21:18:55 -02:30
Christian 5f51e63385 A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python 2012-08-01 18:59:45 -02:30
LexManos 4fb08f1660 Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other. 2012-08-01 06:54:57 -07:00
LexManos d0036dda00 Updated eclipse projects to have src-common linked resources 2012-08-01 03:52:03 -07:00
LexManos 4ca63717e5 Modified the decompiler stage to:
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common

ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
LexManos 62535863ad Add temp AccessTransformer config for FML 2012-08-01 03:18:31 -07:00
LexManos 629b384f0d Discard old setup script 2012-08-01 03:18:02 -07:00
LexManos b9982f18f5 Fixed AccessTransformer issue with trying to load files, instead of resources. 2012-08-01 03:17:36 -07:00
LexManos 3a0a329c77 Merge pull request #113 from someh4x0r/master
Fix BlockTrapDoor.disableValidation on server
2012-08-01 02:40:11 -07:00
Robert Ou 008972e448 Fix BlockTrapDoor.disableValidation on server 2012-08-01 16:36:27 +08:00
Christian 1753b28475 Commit the start of some pluggable transformers 2012-07-31 09:46:45 -04:00
Christian e7a7b3c844 XP for smelting 2012-07-30 23:07:53 -04:00
Christian 6f8b39ea09 Beginning the 1.3.1 update 2012-07-30 22:31:07 -04:00
Christian e001103ed8 Add in the ability to create versioned dependencies for mod relationships
BaseMod versions are loaded too late so will never work as a versioned
dependency requirement, but can have versioned deps of others
2012-07-30 17:01:27 -04:00
Christian d1d12e4ebd Fix up coremods with relaunch, add in a sample "coremod" 2012-07-30 11:34:30 -04:00
Christian b79ec382d7 Add in events for the method pre/init/post annotations so we can add in extra data during the event phase 2012-07-30 00:33:21 -04:00
Christian a850ea6bc0 Fix whitespace issue 2012-07-29 23:54:07 -04:00
Christian 825f1a8b50 Fix window sticking around - it doesn't anymore 2012-07-29 23:46:52 -04:00
Christian e1fc02b5b9 Add in "transform excluded" classes that we still need to take loading responsibility for 2012-07-29 23:30:37 -04:00
Christian b53ce2aa90 Added in some dialogs when things don't go so well 2012-07-29 22:55:53 -04:00
Christian ba28161f16 New logging stuff, also the early plugin api for forge 2012-07-29 22:54:59 -04:00
Christian 50ed44359d Merge branch 'minecraft1.3' into newfmlmod 2012-07-23 23:02:25 -02:30
Christian f78400711e Fix up mod classloading delegation 2012-07-23 22:54:36 -02:30
Christian 69e895e687 Some patches to go along with the other changes 2012-07-23 22:51:16 -02:30
Christian 769663466f More stuff as I roll out the changes 2012-07-23 22:50:37 -02:30
Christian 9e4131c3e8 A bunch more fixes for FML mods 2012-07-23 16:33:17 -02:30
Christian 8b5ddf1739 Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
Christian 5561f8218a New key handling 2012-07-22 20:25:18 -02:30
Christian 2a19eca517 Check in a lot of recent work 2012-07-22 11:56:38 -02:30
Christian 3115f92ee4 Check in new fml mod work so far. Lots still to do. 2012-07-14 13:58:46 -04:00
LexManos 2671641b83 Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies. 2012-07-12 18:07:58 -07:00
LexManos 0a9ee584bf Added call to clean_source to build script to fix patch fuzz on windows. 2012-07-12 18:06:39 -07:00
LexManos 48dcdca805 Fix Client-Clean project to use relative path to argo. 2012-07-12 18:06:01 -07:00
LexManos 9083be320b Should fix NPE on older ISoundHandlers EXA: http://minecraftforge.net/forum/index.php/topic,759.html 2012-07-10 17:02:13 -07:00
LexManos a628765419 Merge pull request #104 from cpw/master
Update to fml 176 - fixes a subtle tick bug
2012-07-09 21:36:57 -07:00
Christian dbfe9c020b Update fml with recent tick fix 2012-07-10 00:32:56 -04:00
LexManos 45f0c521a3 Merge pull request #102 from TrueBrain/EntityTracker
-Add: sync serverPos[XYZ] on spawning of entity
2012-07-09 16:03:10 -07:00
TrueBrain 9f6ed73b6c -Codechange: applied LexManos' request 2012-07-10 00:33:50 +02:00
TrueBrain f76827e253 -Fix: check for null where needed 2012-07-10 00:29:18 +02:00
LexManos d7ccc8619f Made WorldGenMinable metadata sensitive. 2012-07-09 13:43:39 -07:00
LexManos bf155beaad Fixed a improper rounding in EntityMinecart 2012-07-09 13:43:24 -07:00
TrueBrain 7dff7fd62d -Add: sync serverPos[XYZ] on spawning of entity
This fixes the issue that, up to 400 ticks from getting in range,
entities have a wrong offset (because server and client don't agree on
the position to calculate relative updates from)
2012-07-09 14:00:47 +02:00
Christian 2db9292ba5 Another bloody ticking fix. This should fix mods that use ML.setInGameHook(true,false) on the
server side to recieve ticks.
2012-07-08 22:06:11 -04:00
Christian 9d6266d85b Fix up mod classloading delegation 2012-07-06 15:59:16 -04:00
Christian 25fb847dc1 Fixes 2012-07-06 10:42:49 -04:00
Christian 98e31e5f03 Incorporate server patches into client 2012-07-06 10:29:17 -04:00
Christian 0ff59e7978 Remove two places that are unpatchable now 2012-07-06 09:52:21 -04:00
Christian 97cfbb990d Server repatching 2012-07-06 09:44:00 -04:00
Christian 59949849f0 Add a "checkpatches" target and check if your patches are up to date before running a repatch operation 2012-07-06 09:19:58 -04:00
Christian be59dfff54 Launch through the applet launcher too 2012-07-06 01:04:33 -04:00
Christian 32e93213f1 Some patches for the server 2012-07-05 22:31:46 -04:00
Christian b9466b8ee5 Lots of client patch fixup 2012-07-05 18:13:47 -04:00
Christian 275b78957a Update git ignore to ignore a fernflowerzip that's lying around 2012-07-05 15:38:37 -04:00
Christian 4ab2a3cb6b And we have a brand, "fml". We're definitely modded :) 2012-07-05 15:36:31 -04:00
Christian 58576c2a19 UnexpectedThrowable is now the much more awesome CrashReport! 2012-07-05 15:35:38 -04:00
Christian c0b707a9bd Merge branch 'master' into minecraft1.3
Bring some of the ticking fixes in

Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
2012-07-05 15:30:21 -04:00
Christian e8b09f4692 Got the relauncher downloading and injecting library files 2012-07-05 15:23:37 -04:00
LexManos 1012531538 Merge pull request #98 from cpw/master
Update to fml 175
2012-07-03 22:10:52 -07:00
Christian e934a57f6b Update fml to 175- fixes some weird ticking behaviours for ML mods, adds in new ticking behaviours for smart mods 2012-07-04 00:29:15 -04:00
Christian decbe8ba7c Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads.
Hopefully fixes worldload tick issue too
2012-07-04 00:16:30 -04:00
Christian 53c2b50212 FFS let this fix that bloody ticking mess that is ML compatibility. 2012-07-03 23:03:51 -04:00
Christian 3d8a5edc30 Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.
Fix Worldload being filtered from the trigger arming.
Also, improve errors going to an error screen. There should be more information now.
2012-07-03 22:39:35 -04:00
Christian 275fd394c1 Change gui ticking and world load tick. Should close issue #40 and kill it deader
than a very very dead thing. *$^*(#% Modloader ticking b#%$hit
2012-07-03 21:37:54 -04:00
Christian d1f791f94e Merge branch 'master' into minecraft1.3 2012-07-03 08:15:58 -04:00
Christian 60b50bb7f2 Tweak build xml for more cleanliness 2012-07-03 08:14:35 -04:00
Christian 9cafdf94ac Merge branch 'antscriptupdates' 2012-07-02 23:50:49 -04:00
Christian 07a1927c25 Update some stuff 2012-07-02 23:49:40 -04:00
Christian 777b4407c2 Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 23:49:06 -04:00
Christian a98ffafd71 Add in more options for ant script and clean up needing to clean every time. 2012-07-02 23:43:29 -04:00
LexManos a82498a083 Updated some remaining scripts to call there python versions. 2012-07-02 20:05:42 -07:00
LexManos b70f3820f0 Removed symlink files, shouldn't be in the repo. 2012-07-02 20:04:15 -07:00
LexManos eed01c4afc Moved licenses and credits into install folder. 2012-07-02 19:59:40 -07:00
Christian 414d59b1aa Merge branch 'testrecover' 2012-07-02 20:19:23 -04:00
Christian f0aa28162e Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 15:56:33 -04:00
Christian f0484a8941 Merge branch 'antscriptupdates' 2012-07-02 15:55:24 -04:00
Christian 2090264599 Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of
setup and added an updatepatches call too
2012-07-02 15:54:25 -04:00
Christian ecaa158981 Merge branch 'antscriptupdates' into minecraft1.3
Conflicts:
	build.xml
2012-07-02 15:21:15 -04:00
Christian 33517d2b8d Merge branch 'antscriptupdates' 2012-07-02 15:17:32 -04:00
Christian 6c99b80b73 Add in a setupenvironment ant target specifically for setting up an FML environment from scratch 2012-07-02 15:16:40 -04:00
Christian 0418f01886 Harvest MC version from MCP 2012-07-02 13:31:45 -04:00
Christian 6f8409a2ce fix sided proxy bukkit test (not used so not a biggie) 2012-07-02 12:32:41 -04:00
Christian a8f599983e Harvest MC version from MCP 2012-07-02 12:24:37 -04:00
LexManos 9e6c49d9d9 Fix furnaces not smelting the proper number of results after the first one. Damn you tahg, fix this! Keeps falling through my cracks. 2012-07-01 06:52:38 -07:00
Christian b51ce21b70 Initial checkin. Some patches are probably missing, but client compiles. 2012-06-29 20:18:04 -04:00
LexManos 74d5cdcb9d Merge pull request #94 from cpw/hastileentitybugfix
Fix server check "blockHasTileEntity" used to determine if getDescriptionPacket
2012-06-29 14:02:34 -07:00
Christian 9100172867 Fix server check "blockHasTileEntity" used to determine if getDescriptionPacket
is sent for the block to be metadata sensitive. Thanks iChun!
2012-06-29 09:47:10 -04:00
Christian 731dbf5175 Working simple scheduled ticking, Player ticks 2012-06-28 23:37:30 -04:00
Christian d3b48f0c21 Support tick spacing through new IScheduledTickHandler 2012-06-28 17:10:35 -04:00
LexManos dd5d3256d4 Merge pull request #93 from cpw/fixghost4096
Fix ghost players who appear if they don't have the 4096 fix installed
2012-06-28 12:45:01 -07:00
Christian ce9be2864c Change TickType.WORLD to send the world as arg[0] to match the server. 2012-06-28 14:24:34 -04:00
Christian 59a783e8b9 Fix ghost players who appear if they don't have the 4096 fix installed 2012-06-28 13:44:07 -04:00
Christian 541951416e And there are not 1000 seconds in a second 2012-06-28 08:31:32 -04:00
Christian 4f8d71e289 Seconds are 1000 milliseconds long. Not 1 millisecond long. 2012-06-28 08:27:21 -04:00
Christian 7098d613a0 Tweak profiler command on bukkit 2012-06-28 08:21:24 -04:00
Christian e688e04446 Fix up a derp in the timing command 2012-06-27 22:13:55 -04:00
LexManos 7f832b4504 Fix container creative to not add Blocks above 256 unless it's told to. 2012-06-27 17:20:25 -07:00
LexManos 0e6e8b87aa Merge pull request #91 from cpw/multiversefix
Fix world provider behaviour: WorldProvider.byDimension should always return a new instance- otherwise you can end up with worlds overwriting one another
2012-06-27 14:37:01 -07:00
Christian 43e4ed7872 Fix world provider behaviour: WorldProvider.byDimension should always return
a new instance- otherwise you can end up with worlds overwriting one another
2012-06-27 17:21:41 -04:00
Christian 0878bd1fcf Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10! 2012-06-27 08:23:53 -04:00
Christian 1c7bcf8077 Tweak for end profiling 2012-06-26 23:37:54 -04:00
Christian 81d4d77202 Add in simple profiler for bukkit 2012-06-26 23:16:23 -04:00
Christian 5a5ff97f39 Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed 2012-06-26 16:24:50 -04:00
Christian a7caad10ba Add in bukkit support for recipe change 2012-06-26 15:40:30 -04:00
Christian 64dab3c8d7 Add in a new recipe handler registry method for ease of adding recipes to MC 2012-06-26 15:29:34 -04:00
LexManos f174cb3948 Merge remote-tracking branch 'origin/master' 2012-06-26 12:10:57 -07:00
LexManos 9efdca3aab Fixed isBlockReplaceable and placing ItemBlocks' 2012-06-26 12:10:42 -07:00
LexManos 84613d5a92 Fucking spelling nazis 2012-06-24 14:48:09 -07:00
LexManos 61e8b92a78 Updated FML to build 153 2012-06-22 18:49:30 -07:00
LexManos 62078cdd46 Fix bitmask bug related to 4096 in multi-block change. 2012-06-22 18:49:05 -07:00
LexManos 3d48b69d4f Added configuration option to disable the darkroom mechanic. For servers who wish to not risk destruction at one broken pipe. 2012-06-22 17:44:04 -07:00
LexManos f0f7e0e139 Add option to randomize potential spawn locations to have a more randomly dispersed spawn patern, useful for games like FTB vs. 2012-06-22 17:13:32 -07:00
LexManos 53fc30d29d Fix NPE related to server/client not having block ids synced properly. 2012-06-22 17:12:27 -07:00
Christian 5d4fdd1337 Update tester mod 2012-06-22 09:30:47 -04:00
Christian 77479d8b74 Fix ticking for GUI ticks too! 2012-06-22 09:30:27 -04:00
Christian dd7ee6e268 Fix dependency string processing error 2012-06-22 06:21:04 -04:00
Christian 1236abf679 ModSorting test case 2012-06-21 21:56:16 -04:00
LexManos caebbafabd FML 150, more tick related work. 2012-06-21 15:28:44 -07:00
Christian 64d1b29c43 Fix ticking properly - ML world ticks now fire once, properly 2012-06-21 18:11:40 -04:00
LexManos e9c66f63fd Close inputstream 2012-06-21 06:11:17 -07:00
LexManos d7817aef39 More bugfixes related to portal generation. Should be all now. 2012-06-21 05:09:25 -07:00
LexManos 6547556280 Fix Vanilla bug where nether portals would not work above 127 2012-06-21 04:06:44 -07:00
LexManos 2d434dd84f Updated to FML 149, should fix all ticking issues with ModLoader mods 2012-06-21 04:06:15 -07:00
LexManos acf70e1047 Some 4096 I missed in custom renderers. 2012-06-21 04:05:50 -07:00
LexManos 262c68a81d Added stupididty exception for common issue with getMinecraftLogger. 2012-06-21 03:17:33 -07:00
Christian 21042e6913 Rename unused ML prop config files if they exist (to .bak) and
skip generating if not needed
2012-06-20 21:17:32 -04:00
Christian 58d6e58b93 Update bukkit with changes 2012-06-20 12:36:48 -04:00
Christian 6ba65d047f Revert "Test failing build"
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
Christian 63be4cb88f Revert "Revert "Fail the build when recompilation fails""
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian acbc8d9a1b Revert "Fail the build when recompilation fails"
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
Christian e8db35228b Test failing build 2012-06-20 08:35:47 -04:00
Christian 198dd807fd Fail the build when recompilation fails 2012-06-20 08:35:14 -04:00
Christian 02f9578b52 Fix huge bug/typo in basemodticker that stopped ticks getting sent 2012-06-20 08:03:57 -04:00
LexManos c74c5ba2d2 Updated to FML build #142, fixed FML compilation issue causing missing files when reobfing. 2012-06-20 02:24:11 -07:00
LexManos 308525987d Fix compilation error, Protip: Don't use java7 things when compiling for java6, and Don't report successful build on compilation errors cpw. 2012-06-20 02:14:07 -07:00
LexManos 969518c475 Updated release script to automatically inject version info into .info file. 2012-06-19 21:32:19 -07:00
LexManos 09762da617 Updated to FML 141, should fix ticking issues with certian mods, and crash issue with TropiCraft 2012-06-19 20:46:28 -07:00
LexManos ef7514288b Remove cr's from modinfo descriptions, they print oddly in Minecraft. 2012-06-19 19:58:48 -07:00
LexManos 8a7b91fb1c Print mod metadata info errors if we are in MCP. 2012-06-19 19:55:28 -07:00
LexManos 07bebf187c Should fix concurent modification exceptions when using removeSpawns 2012-06-19 19:44:52 -07:00
LexManos 5ee3a057a2 Remove some eclipse preference files 2012-06-19 19:44:07 -07:00
LexManos 9495094a48 Update gitignore to ignore some eclipse preference files. 2012-06-19 19:43:46 -07:00
LexManos c0dffcbcec Merge pull request #29 from ScottKillen/master
Fixed WorldType to allow custom WorldTypes
2012-06-19 19:22:06 -07:00
LexManos 52647e0607 Bumped version number for new IEntityLiving interface. 2012-06-19 14:30:01 -07:00
LexManos af8d8ef4e6 Merge pull request #88 from pahimar/master
Fixes typo in the new EntityLivingHandler code
2012-06-19 13:51:16 -07:00
pahimar 8986458c82 Typo in the new EntityLivingHandler code 2012-06-19 10:44:29 -04:00
LexManos a7ea760097 Implemented enchanced EntityLiving events. Thanks Atomic for parts of it. 2012-06-18 20:16:48 -07:00
LexManos 86d7b7b7b8 Made setFailsafeFieldValue public for Rob 2012-06-18 20:15:33 -07:00
LexManos 06fffe54b1 Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance. 2012-06-17 19:30:10 -07:00
Christian 944fd02fca More ticking cleanup 2012-06-17 18:53:49 -04:00
Christian 4385704172 Remove WorldLoad tick from modloader mods- too early. *sigh* 2012-06-17 18:49:19 -04:00
Christian 6d46fefd83 Make sure to reset the clock trigger 2012-06-17 18:41:54 -04:00
Christian ce71f85095 Force all client modloader ticks to occur at render end 2012-06-17 18:41:05 -04:00
Scott Killen 83fa5ffa5e Client
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
2012-06-17 15:05:16 -04:00
Scott Killen f85c7a48ca **Client**
* Delegated World.func_46068_G() (getHorizon), which depends on WorldType, to the WorldType class per LexManos' suggestion
2012-06-17 00:04:50 -04:00
Scott Killen efc8d1bb37 Client
======
- Fixed WorldType to allow custom WorldTypes in world creation GUI.
- Deprecated client WorldType.getSeaLevel() and renamed it with the more accurate name of getMinimumSpawnHeight.
- Changed related reference WorldProvider.

Server
======
- Fixed WorldType to allow custom WorldTypes
- Added methods to WorldType giving it the exact abilities of client WorldType
- Adjusted WorldProvider so that it relies on WorldType the same way it does on client.
2012-06-16 23:31:17 -04:00
LexManos 8f861c24d8 Few more cases for 4096, thanks TrueBrain 2012-06-16 13:27:00 -07:00
LexManos 76bdabbfc4 Forgot Configuration in 4096 change. 2012-06-16 01:27:10 -07:00
LexManos c3bdc6e583 Initial 4096 fix based of mDiyo's work. 2012-06-15 21:10:37 -07:00
LexManos 7aaf3e98d2 Configurable kick message when you don't have forge. 2012-06-15 14:03:47 -07:00
Christian aec5bbb50f Merge pull request #27 from TheNoid/master
Make FML logs use system line endings …
2012-06-14 12:06:19 -07:00
Dion Williams 64f7b219af Make FML logs use system line endings for consistency with Java stack traces in the logs. 2012-06-14 18:01:35 +01:00
LexManos 5a0f73436e Fixed bug in new entity sound hook. 2012-06-13 23:08:16 -07:00
LexManos 7d9084ddd9 Bumped version number to 3.3.7 for full release. 2012-06-13 21:51:40 -07:00
LexManos 7711505b92 New onChunkUnload event for TileEntities, for psxlover. 2012-06-13 21:19:08 -07:00
LexManos d56f0d0d55 Added new ISoundHandler.onPlaySoundAtEntity hook. Should be backwards compatible with any older ISoundHandler implementations. 2012-06-13 21:09:00 -07:00
LexManos 320d1360b8 Updated to FML #135 {Fixed ModList rendering issue, and incorrect arument on crafting hook} 2012-06-13 20:26:38 -07:00
LexManos 27f8d07e44 Server side fix for invalid parameter to onCrafting 2012-06-13 20:02:35 -07:00
LexManos c306da9d6d Proper fix for scroll list not covering all of the hidden scroll items. 2012-06-13 19:59:54 -07:00
Christian 5a24f7f0d7 Merge pull request #26 from GenuineSounds/patch-2
Incorrectly passing the IInventory of the extraction slot instead of the...
2012-06-13 18:52:46 -07:00
Christian 6826174464 Merge pull request #25 from GenuineSounds/patch-1
Having the string trimmed to 9 made most long strings show a couple of p...
2012-06-13 18:50:26 -07:00
Brian Wiegand 04917a9a8c Incorrectly passing the IInventory of the extraction slot instead of the crafting matrix, get back to me on why it's doing this instead of the default behavior of ModLoader and Forge. 2012-06-13 15:17:33 -07:00
Brian Wiegand a5b699c2ca Having the string trimmed to 9 made most long strings show a couple of pixels at the very top and very bottom. ie
https://dl.dropbox.com/u/79514/2012-06-13_13.25.35.png
2012-06-13 14:09:07 -07:00
LexManos 9bf3436be4 Fixed concurent modification exception in the ore registry. 2012-06-12 15:32:26 -07:00
LexManos 76bf4c602b Fix for potential concurancy modification exceptions 2012-06-11 15:36:15 -07:00
LexManos 1328c8c9e7 Fixed possible NPE when blocks havent fully initalized yet. 2012-06-11 14:42:30 -07:00
LexManos de85112535 Updated FML to 132, TextureFX fix, and bumped revision to 6. 2012-06-11 14:10:55 -07:00
LexManos 5115f4f1e4 Fixed KeyBinding issue with ModLoader container, if you register a KeyBinding twice it will discard the old one. And fixed issue where getVersion() could return null causing NPE. 2012-06-10 17:19:05 -07:00
LexManos b12cafb5c5 Made it so it will attempt to scale any Texture Effects that return data for smaller texture resolutions. Made the size descrepancy only a error for ITextureFX texture effects. 2012-06-10 05:56:52 -07:00
LexManos 986c6722b6 Added bouncer functions for functions we removed. Makes MagicLauncher shut up about missing functions {not actually missing}, and therefor makes users stop thinking its a life or death error. 2012-06-10 01:28:34 -07:00
LexManos 32100207e8 New Ore Dictionary recipies. Allows for simpler Ore Dictionary integration with recipies. IOreHandler should no longer be used. 2012-06-09 23:18:58 -07:00
LexManos 5127e56029 Added hackish workaround for Tessellator.textureID to provent crashing while we wait for Optifine to update. 2012-06-09 17:16:46 -07:00
LexManos f22e065187 Updated to FML 130 2012-06-09 17:16:04 -07:00
Christian ad8e9f10c3 Fix up "errored" mod states so they actually read as errors 2012-06-09 11:07:07 -04:00
Christian b8ae8664ac Fix up bukkit for biome code 2012-06-09 10:47:43 -04:00
Christian df205d7d3f Fix up biome handling for client and server 2012-06-09 10:27:24 -04:00
Scott Killen abcb583dd0 - Fixed client crash bug in add/remove Biome functionality. Arrays.asList() returns a fixed-sized list per java spec. Adding and removing biomes throws UnsupportedOperationException.
- Fixed same on server and added disabled removeBiome functionality. This touched a lot of classes as the nonWorking removeBiome seemed to be lots of places inconsistent with addBiome.
2012-06-09 07:59:35 -04:00
Christian bc72bf11ee Tweak error handling - report the exception that caused the bailout 2012-06-08 15:31:30 -04:00
Christian 4a050fbdba Fix parameter ordering in ticks 2012-06-08 15:22:40 -04:00
Christian 16ab855df5 Update bukkit for world gen tweaks 2012-06-07 19:47:11 -04:00
Christian 320503340b Change world generation to expose a mod interface 2012-06-07 19:44:03 -04:00
Christian 749cb7bcd6 Update bukkit for early load change 2012-06-07 19:28:07 -04:00
Christian 00a9cd4a5f Attempt early initialization of Minecraft Forge 2012-06-07 19:25:49 -04:00
Christian 33fc5228ce Update bukkit handler 2012-06-07 17:57:07 -04:00
Christian 0768f82522 Add in a server side WORLDLOAD tick 2012-06-07 17:54:43 -04:00
Christian 6f91209ea8 Fix ticking- need to register the basemod tickhandler *sigh* 2012-06-07 16:31:23 -04:00
Christian 110ca0f3ba Fix ticking for new name "GAME" vs "WORLD" 2012-06-07 16:21:01 -04:00
Christian Weeks 0814f177c5 Update bukkit handlers 2012-06-07 14:03:42 -04:00
Christian Weeks 856fa4f337 Reorganize basemod ticking to use ITickHandler. Introduce "GAME" tick vs "WORLD" tick for
mods that want to tick per world and "globally"
2012-06-07 13:53:16 -04:00
Christian Weeks 5acab9e790 Expose a "clean" ticking interface and fix server tick loop for world ticks 2012-06-07 11:12:51 -04:00
Christian Weeks c62c1df791 Tweak width of description 2012-06-07 08:39:22 -04:00
LexManos 7ce7dbb374 Server side of ITextureProvider for Block/Item for compilations sake. 2012-06-06 10:08:35 -07:00
LexManos ced95c5cf3 Backwards compatibility fix for ITextureProvider 2012-06-06 09:08:08 -07:00
LexManos 1d99ff301d Updated FML to 121 to fix world tick issues. 2012-06-06 08:11:53 -07:00
LexManos 779b3298bd Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR. 2012-06-06 08:01:54 -07:00
LexManos 79b0f93488 Tag each Tessellator with it's associated texture ID. 2012-06-06 07:06:43 -07:00
LexManos 1d40d87f0c All Items and Blocks now implement ITextureProvider, and have a setTextureFile(String) function, to support cleaner code in Mods and in Forge. 2012-06-06 06:49:15 -07:00
LexManos fde49241fa Updated MCP mapings. Moved the bulk of custom logic from RenderItem to ForgeHooksClient. 2012-06-06 06:00:08 -07:00
LexManos 37191a3ac8 Merge remote-tracking branch 'origin/master' 2012-06-06 01:56:58 -07:00
LexManos 50f11c0baf Added kick info to disconnect event, updated to FML 120, keybindings, better image rendering in ModList ui. 2012-06-06 01:56:25 -07:00
LexManos 5997bd3b87 Interm implementation of keyboardEvent for ModLoader. 2012-06-06 01:43:49 -07:00
LexManos c6de498904 Add static log() functions to the RenderAccessLibrary, and fixed up the logo rendering to better display the images. 2012-06-05 18:49:07 -07:00
LexManos 22a15ee85a Fix bug in cart functions where would always return null. 2012-06-05 00:22:20 -07:00
Christian bf5835566a Merge pull request #14 from crazyputje/master
onTickInGUI fix. Thanks crazyputje!
2012-06-04 14:41:59 -07:00
crazyputje 20fc9de087 removed 'if (client.theWorld != null)' so it also ticks in the main menu 2012-06-04 20:36:57 +03:00
LexManos fc5132b583 Fixed some inverted logic causing tress to not gen correctly. 2012-06-03 11:40:12 -07:00
LexManos 2d3cd792c9 Update FML to 117 2012-06-03 01:02:17 -07:00
LexManos d0aefcbde9 Also, new hook in last commit for blocks to determine if they are able to be replaced by ores, for any mod that adds new world gen. Bumped revision up. 2012-06-03 00:33:46 -07:00
LexManos 3b523d57a9 New Hooks addedf for custom tree/leaves. And better interaction with trees growing and rerplacing certain blocks. Should allow for ExtraBiomes to behave nicer, and RedPower to make there blocks un-breakable by trees. 2012-06-03 00:32:37 -07:00
Christian Weeks eae26b0562 Helps to have a retention policy 2012-06-02 22:41:50 -04:00
Christian Weeks eeeaf140a7 Helps to have a retention policy for runtime annotations 2012-06-02 22:40:45 -04:00
LexManos 63453137b3 Updated to FML 115, added Forge Logo to the client dist, and in-game ModInfo page. 2012-06-02 19:24:40 -07:00
LexManos 4642519f33 We now bundle CodexIBXM from PaulsCode. See http://paulscode.com http://www.paulscode.com/forum/index.php?topic=4.0 and the included license files for more info. 2012-06-02 19:19:32 -07:00
Christian Weeks 38978a35dc Add in bukkit proxy handler 2012-06-02 22:14:25 -04:00
Christian Weeks 1f7baa09b5 More proxy code 2012-06-02 22:12:15 -04:00
Christian Weeks f15d9c507f Introduce a proxy side loader for mod use 2012-06-02 22:12:15 -04:00
LexManos b56b01571c Fixed GuiModList Logo rendering to allow for logos of different sizes to be rendered properly. Logos will render themselves full underneath the text, It is the modder's job to make it look good. 2012-06-02 18:05:57 -07:00
LexManos 0c0cb7d14d Updated to FML build 114 2012-06-02 17:00:52 -07:00
Christian Weeks 202933c409 Update credits information 2012-06-02 11:45:47 -04:00
Christian Weeks 8baf435a4a Update readme for the client side 2012-06-02 11:44:26 -04:00
Christian Weeks 446faad048 Update bukkit handler to inject names at startup 2012-06-02 11:03:20 -04:00
Christian Weeks 716b32c8ab Merge remote-tracking branch 'origin/master' 2012-06-01 23:25:18 -04:00
Christian Weeks c9731ed7e3 Fix up optifine detection properly 2012-06-01 23:23:50 -04:00
Christian Weeks 0e6ccd81ed Update bukkit handler 2012-06-01 23:10:38 -04:00
Christian Weeks de8a5cfc8b Slight reorganization of texture ticking - accomodate optifine 2012-06-01 23:07:32 -04:00
Christian Weeks 174d6691bd Add in optifine visibility for the mod list. Will search for an "optifine_mod.info" file on the
class path if sp614x wants to add one to optifine.
2012-06-01 14:55:49 -04:00
Christian Weeks 7d07a752d8 Fix ticking on bukkit server 2012-06-01 11:08:32 -04:00
Christian Weeks ad5dc783d8 Fix ticking on the server 2012-06-01 11:07:14 -04:00
Christian Weeks ed08c425af Implement missing language load hook for server 2012-06-01 10:22:08 -04:00
Christian Weeks 2f09a048d6 Tweaks to basemod setup 2012-06-01 00:33:51 -04:00
Christian Weeks 4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -04:00
Christian Weeks 51701d09fd Merge branch 'bukkitreorg' 2012-05-31 23:07:16 -04:00
Christian Weeks 72ad8bcde1 Merge branch 'bukkit'
Conflicts:
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/net/minecraft/server/CommonRegistry.java
	common/net/minecraft/server/IMinecraftRegistry.java
	common/net/minecraft/src/CommonRegistry.java
	common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 23:00:06 -04:00
Christian Weeks cfb99b01c8 Fix copied code. Derpbag. 2012-05-31 22:48:44 -04:00
Christian Weeks e35d31e50d Update FML with recent mainline changes 2012-05-31 22:48:44 -04:00
Christian Weeks c4ad78ab87 Update bukkit with new mod fixes 2012-05-31 22:48:44 -04:00
Christian Weeks ac779739aa Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-05-31 22:48:44 -04:00
Christian Weeks 09d5bf95ae Fix chunk generators for bukkit 2012-05-31 22:48:44 -04:00
Christian Weeks b2e01d8f2a Bukkit version 2012-05-31 22:48:44 -04:00
Christian Weeks 2521e5b390 Merge branch 'bukkit' - massive code reorganization for fml 2.0
Conflicts:
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/net/minecraft/server/CommonRegistry.java
	common/net/minecraft/server/IMinecraftRegistry.java
	common/net/minecraft/src/CommonRegistry.java
	common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 22:45:19 -04:00
Christian Weeks ae6621bfdd More tweaks for proper API 2012-05-31 22:42:23 -04:00
Christian Weeks dfd15acb6d Reorganize for bukkit integration 2012-05-31 22:09:45 -04:00
Christian Weeks 660521e6f2 Fix project, new gui layout with screenshot, thanks Sengir! 2012-05-30 09:25:04 -04:00
LexManos d27c3d7006 Included fmlversion.properties in the release zips. 2012-05-27 06:16:19 -07:00
LexManos cbab8188c2 Added FML ReadMe, Credits, and License to release zips 2012-05-27 05:47:58 -07:00
LexManos b65c1f01ec Updated to FML Build 95 2012-05-27 05:08:22 -07:00
LexManos c708b83425 Updated patches for FML, moved some extranious code to Forge classes instead of patches. 2012-05-27 04:27:15 -07:00
LexManos ce2a9f270a Updated MCP Mapings and patches. 2012-05-27 04:26:38 -07:00
LexManos cbf70c165a Added FML mod info file 2012-05-27 04:23:23 -07:00
Christian Weeks b5a10c0153 Add in missing hooks, add branding information to the crash report 2012-05-27 07:14:35 -04:00
LexManos 888e036c7d Cleaned up names for Minecraft Forge's text files so they dont clash with other mods. Fixed up the release script to include the license text, and executable permissions for install.sh. 2012-05-27 02:27:42 -07:00
LexManos d952a7be49 Added new source clean step to fix linux vs windows astyle issues. 2012-05-27 01:52:02 -07:00
LexManos 2898457766 Update FML to 92, this include full client side support, ModLoader nolonger needed. 2012-05-27 01:51:38 -07:00
LexManos d4fd21dcbc Fixed regex issue in last push. 2012-05-27 01:40:22 -07:00
LexManos 379c5b2888 Fixed up for newline before case bodies. 2012-05-27 01:24:45 -07:00
LexManos 51a959f8a4 Should fix windows {me} generating different patches then linux {cpw} 2012-05-27 00:22:27 -07:00
LexManos eee81351d4 Bump version number for official release. 2012-05-26 20:28:24 -07:00
Christian Weeks 7d7c395ff3 Move first tick to the real first tick 2012-05-26 02:30:21 -04:00
Christian Weeks 7c590e62c6 Merge in the mod texture changes from Lex 2012-05-26 02:29:35 -04:00
LexManos 6191ed61e0 Fixed location refs to fmlversion.properties 2012-05-25 23:25:05 -07:00
Christian Weeks 96b442e3cc Add in a static render access class for optifine and other render editing mods to use 2012-05-25 22:13:51 -04:00
Christian Weeks 3454b43daa Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire. 2012-05-25 17:21:30 -04:00
Christian Weeks f3b15940ee Changing up the mod list data 2012-05-25 15:25:35 -04:00
LexManos 7667df0caf Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly. 2012-05-24 22:48:15 -07:00
Christian Weeks d45134eb9a Fix up two stupid overwrites in my mergeup from lex 2012-05-24 23:18:04 -04:00
Christian Weeks fe710a9245 Fix derp in MTS 2012-05-24 22:13:33 -04:00
Christian Weeks 46b7dc0fec Patch fixing 2012-05-24 21:40:34 -04:00
Christian Weeks f5598573a2 Update some stuff for updated tweaks 2012-05-24 21:39:16 -04:00
Christian Weeks d7c9010c92 Update FMLClient with my changes 2012-05-24 21:33:43 -04:00
Christian Weeks 012c378427 my tweaks 2012-05-24 21:06:27 -04:00
LexManos 00ca4ead44 difflist should include server and client now. 2012-05-24 03:48:59 -07:00
LexManos 2927be6247 Some patch cleanup. 2012-05-24 02:18:20 -07:00
LexManos a9b317c941 Rewrote how HD Texture support worked, to make it easier for Optifine to integrate.
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
2012-05-24 01:35:37 -07:00
LexManos 1727ce69ed Line number changed.. 2012-05-24 01:33:50 -07:00
Christian Weeks 0d5ab57fa0 Fix up the watch 2012-05-18 20:42:12 -04:00
Christian Weeks 2dcd1c4065 And some tweaks to the texture handling 2012-05-18 20:17:07 -04:00
Christian Weeks a40ba43957 Fix up some fubars in MTS and MTA 2012-05-18 20:16:41 -04:00
Christian Weeks 88f3c4f9bd Lots of error handling. 2012-05-18 10:38:40 -04:00
Christian Weeks dd94427f22 Missed a patch *sigh* 2012-05-17 21:57:24 -04:00
Christian Weeks cc4641b0d9 Add simple API to allow mods to let their textures be overriden by other mods 2012-05-17 21:47:12 -04:00
Christian Weeks a9e17048e6 Because, of course, I broke the first build... 2012-05-17 20:27:24 -04:00
Christian Weeks abee6d2507 Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass. 2012-05-17 15:39:04 -04:00
Christian Weeks 1004a3236a Derpy exceptions derpy exception handling 2012-05-17 15:19:25 -04:00
Christian Weeks 8aacd2d127 Remove the dependency in RenderEngine, decided on the simple API for texture FX 2012-05-17 15:11:21 -04:00
Christian Weeks bc3790e3ca Tweak the render patch- we won't fail if the updateTexture call fails 2012-05-16 00:34:50 -04:00
Christian Weeks 77d6ae8ffa Update patches: add in a setup for most of the texturefx classes 2012-05-16 00:01:12 -04:00
Christian Weeks a220fb34e2 Tweaking texture loading 2012-05-16 00:00:52 -04:00
Christian Weeks ddb1085064 Fix tileSize -> iconTileSize. Stupid MCP 2012-05-15 22:34:17 -04:00
Christian Weeks 319758bd33 Catch throwable (NoClassDefFoundError) and don't abort loading- it's probably a badly named class file. 2012-05-15 22:23:00 -04:00
Christian Weeks 1b299b4ff4 Fix some derpy 2012-05-15 22:18:41 -04:00
Christian Weeks 25ced3f321 Update patches for hd textures 2012-05-15 22:10:38 -04:00
Christian Weeks 0e3dcc4eda Change hd texture handling 2012-05-15 22:05:24 -04:00
Christian Weeks 6903deb69d Refresh the renderengine patch- catch and log some texture pack reload errors 2012-05-15 16:21:40 -04:00
Christian Weeks 5412be2d76 More mod list fixes 2012-05-15 16:19:46 -04:00
Christian Weeks a77aeedee2 Lots of cleanup on the mod list, pretend we're the mcpatcher for mod HD detection. 2012-05-15 15:52:19 -04:00
Christian Weeks bc23e7a657 Fix up fubar in worldprovider. Add in obfuscation detection. Capture the exception that crashes minecraft in the log file. 2012-05-14 18:21:35 -04:00
Christian Weeks 6b23024f11 ModLoader worldtype hackery compatibility 2012-05-14 16:21:05 -04:00
Christian Weeks c2264c97aa Fix derp 2012-05-14 14:16:50 -04:00
Christian Weeks 828ada8aa6 Only log the warning once per texture 2012-05-14 13:20:50 -04:00
Christian Weeks 5c48a3c146 push patches 2012-05-14 12:22:46 -04:00
Christian Weeks 028fc2505b Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff. 2012-05-14 11:38:54 -04:00
Christian Weeks 6f6c3ee939 Fix the serverside. FUUUUUUUU! 2012-05-14 01:45:56 -04:00
Christian Weeks a01711361d HD patching complete? Clean up mod info data, Dummy field for dummy mods 2012-05-14 01:39:21 -04:00
Christian Weeks d48213b444 Improving the scroll list, HD texture patches 2012-05-13 02:46:39 -04:00
Christian Weeks 00aee5b8e1 Actually pass in the mod name 2012-05-12 02:25:15 -04:00
Christian Weeks b26b3fda1b Fix up incorrect dependency handling 2012-05-12 02:10:50 -04:00
Christian Weeks ff26096a0f Fix stupid problem with braces 2012-05-12 01:06:58 -04:00
Christian Weeks fdd80dad80 Tick only when there's a world 2012-05-12 01:03:36 -04:00
Christian Weeks caa5384552 Fix nulls in the mod list, start building the gui screen 2012-05-12 00:47:04 -04:00
Christian Weeks 053fd64bde Gui related ticking 2012-05-12 00:00:33 -04:00
Christian Weeks c689991986 Try always loading the language data 2012-05-11 23:37:58 -04:00
Christian Weeks 1146642dec Always load the "en_US" langpack into the translation table first, then the actual language. 2012-05-11 22:20:09 -04:00
Christian Weeks 658f018404 Derpy derp- fix stupid pointless cast 2012-05-11 17:41:33 -04:00
Christian Weeks 394b046220 Fix missing ml.sendpacket, call in renderers 2012-05-11 17:31:28 -04:00
Christian Weeks c032e39fed Actually mark the sprite as used when you allocate it! 2012-05-11 16:49:21 -04:00
Christian Weeks a6da168420 Helps to add the new hook! 2012-05-11 16:30:23 -04:00
Christian Weeks 0cd0d69ec4 Hook texture pack changes and loads so we can register override textures 2012-05-11 16:23:26 -04:00
Christian Weeks f1453839b4 Fix problem with nulls in getModList
Work on the meta information file
2012-05-11 15:18:26 -04:00
Christian Weeks 7735567ce0 More tweaks to stuff: mod list, branding, more hooks 2012-05-11 01:45:36 -04:00
Christian Weeks abc7b3f2a6 Tidying up and more hooks 2012-05-10 21:30:06 -04:00
Christian Weeks b7861ec04c Tweak block rendering organization. Add in worldgen for client. 2012-05-10 19:51:15 -04:00
Christian Weeks 813ad71f13 Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side 2012-05-10 18:54:25 -04:00
Christian Weeks bb2af1d883 Tweak ordering for sorting- should be a stable sort now 2012-05-10 15:48:26 -04:00
Christian Weeks 7b5ad64378 Update git version capture 2012-05-10 13:01:39 -04:00
Christian Weeks be9557b8ef Ignore jenkins tags 2012-05-10 12:53:27 -04:00
Christian Weeks 57af97858b Tweak some build stuff for versioning 2012-05-10 12:24:17 -04:00
Christian Weeks 89a6790222 Update build to actually put Loader in... 2012-05-10 11:16:58 -04:00
Christian Weeks 4c9ca1ffc1 tweak location of build properties in src jar 2012-05-10 10:09:56 -04:00
Christian Weeks 5a93998097 Lots of tweaks to mod output pretty printing. new versioning scheme. 2012-05-10 09:42:31 -04:00
LexManos ef6bb505b9 Inventroy rendering 2012-05-10 01:25:56 -07:00
LexManos 8d0a9b770d Fixed up the ModLoader render block hook, RP's blocks now render. 2012-05-10 01:00:07 -07:00
LexManos 2afed48993 Should fix colliding model ids with MC's internal IDs 2012-05-09 23:38:01 -07:00
Christian Weeks f4862dc40d Fixes 2012-05-10 02:01:23 -04:00
Christian Weeks 311ca8866e Fix up build script a bit, all modloader is public, and fix tile entity renderer 2012-05-10 00:07:46 -04:00
Christian Weeks 7846f10c74 Add in some more stuff for handling key bindings, rendering 2012-05-07 17:44:49 -04:00
Christian Weeks 0438fbd47e Reorganize ticking a bit 2012-05-07 01:39:55 -04:00
Christian Weeks 56e7270dee Separate sprite handling, fix worldtype 2012-05-07 01:26:21 -04:00
Christian Weeks b6b5955404 Working on the ticking stuff 2012-05-07 00:54:18 -04:00
LexManos 55d252b657 more client side hooks and Texture overrides/animations. 2012-05-06 16:32:59 -07:00
Christian Weeks 49be023eab Halfway through ticking- won't compile 2012-05-06 00:58:40 -04:00
LexManos b27b365273 Fixed AudioMod compatibility with MultiMC style launchers. 2012-05-05 21:43:53 -07:00
LexManos fd2fa90bb2 Bit masked the entity ID to change the range from -127-127 to 0-255 2012-05-05 21:20:34 -07:00
Christian Weeks 8c79b9b946 ModLoader moves forwards 2012-05-05 20:33:40 -04:00
Christian Weeks bca823c421 Let's get hooking! 2012-05-05 19:52:53 -04:00
Christian Weeks e0e77a6bb5 API is restored for client side. Implementation starting. 2012-05-05 14:42:46 -04:00
Christian Weeks 50a3543de0 And some patches for that 2012-05-04 17:04:18 -04:00
Christian Weeks 816b0738e4 The beginning 2012-05-04 17:02:12 -04:00
Christian Weeks 4b4ad6781e Introduce the client side FML 2012-05-03 19:40:55 -04:00
Christian Weeks 071d54feaf Implement addBiome, hopefully. Pushes biome list to the WorldType field. Sorry Bioxx. 2012-05-03 14:05:13 -04:00
Christian Weeks db1f432dbf Check in some eclipse crapola. 2012-05-03 14:04:16 -04:00
LexManos 9f3ab1e601 Updated MCP Mapings 2012-05-02 11:12:45 -07:00
LexManos f32956fe58 Added forge identifier to statistics collection. 2012-05-02 10:37:52 -07:00
LexManos 7a60c7deb0 Fix for furnaces not smelting the final item in full stacks. 2012-05-01 17:21:55 -07:00
LexManos 0e97f1adaf Merge pull request #55 from CovertJaguar/patch-1
Added getters for version vars.
2012-04-29 03:09:41 -07:00
LexManos 7f01af7e1d Fixed Levers droping off the backs of stairs client side. 2012-04-29 03:09:28 -07:00
CovertJaguar 80a9bc9c6d static final vars are inlined during the compile step, making the version variables useless at runtime. 2012-04-29 00:26:29 -07:00
Christian Weeks 6ae8a2d5b9 Fix copied code. Derpbag. 2012-04-28 16:47:04 -04:00
Christian Weeks f1168856bd Update FML with recent mainline changes 2012-04-28 16:40:25 -04:00
Christian Weeks c3b0dca9b2 Merge branch 'master' into bukkit 2012-04-28 16:35:15 -04:00
LexManos 7e06c9d13d New block hooks for creating custom beds. 2012-04-26 19:11:16 -07:00
LexManos 0d15f9b072 Merge pull request #54 from cpw/master
Update to fml 74- fix a problem with MLProp and primitives
2012-04-26 14:48:41 -07:00
Christian Weeks 54c3bfeae1 Update to FML 74: fixes an important issue with MLProp 2012-04-26 17:45:31 -04:00
Christian Weeks 12a928536a Fix a small issue with the build output script
Fix a significant issue with MLProp handling and primitives- they work now
2012-04-26 17:38:31 -04:00
LexManos 55ca4628a2 Bumped revision to 3 2012-04-25 01:38:39 -07:00
LexManos cbc9d73a9a Fixed Vinella mob spawning bug that prevented mobs from spawning on the top most chunk. Added new Block function to determine if a Mob can naturally spawn on the block. Add new hook to allow for special case handeling on natural entity spawn. 2012-04-25 01:37:06 -07:00
LexManos 33a3f67225 Fix for loading Minecart Entities in worlds that were last accessed before Forge was installed. 2012-04-23 19:14:08 -07:00
LexManos 4bdba7400b Moved MLMP compatibility functions to ModCompatibilityClient, and fixed issue where no vehicles would be spawned. 2012-04-23 10:17:14 -07:00
LexManos 796d4fea70 New ISoundHandler interface, useful for adding custom sounds and dealign with sound based events.
Includes basuic AudioMod compatibility.
2012-04-22 19:52:09 -07:00
LexManos d6b387f39b Fixed vinella bugs when trying to access chunk information with a y < 0 2012-04-20 12:07:45 -07:00
LexManos 3ea2e2582b Added MLMP hook invocation for vehicle spawn and opening GUI's to provide compatibility for clients that have both ModLoaderMP and forge installed. 2012-04-19 22:05:31 -07:00
LexManos cf9878d241 Updated to FML build #73 2012-04-19 22:04:10 -07:00
Christian Weeks ef88519637 More text fixup 2012-04-19 23:07:07 -04:00
Christian Weeks e6a9eb7b91 Typos 2012-04-19 22:54:10 -04:00
Christian Weeks cf351c6118 Add in detection for MLMP and try to fail with a graceful message. 2012-04-19 22:40:59 -04:00
LexManos bb7eaf867f Exposed TileEntityData packet to TileEntities. And added helper sender function. 2012-04-19 15:41:11 -07:00
LexManos 722fe597b8 Added metadata sensitive Chunk constructor for Bioxx 2012-04-19 10:25:10 -07:00
LexManos 2f89f566cf Added MinecraftApplet.clas to the force output list because users cant understand the concept of only replacing files they are told to. And bumped version to 3.1.2 2012-04-18 21:18:18 -07:00
LexManos 86fd9e0b9c Implemented a 'small' packet system for those mods that need to send rapid, small data packets and who are concered about the overhead of the 250 payload packet. It uses packet 131. 2012-04-18 19:40:48 -07:00
LexManos f4fc50b3c5 Fixed shift-clicking issue with items that utilized the new ItemStack sensitive smelting system. 2012-04-18 19:34:08 -07:00
LexManos 23ffbb774f Added generic packet sending function to MinecraftForge class. 2012-04-18 19:17:04 -07:00
LexManos ddd4b6eb48 made the ID in PacketEntitySpawn unsigned. 2012-04-18 19:11:09 -07:00
Christian Weeks e510cca030 Update bukkit with new mod fixes 2012-04-18 14:06:54 -04:00
Christian Weeks a6d6b739bd Merge branch 'master', remote-tracking branch 'origin' into bukkit 2012-04-18 14:04:39 -04:00
Christian Weeks e261ad1295 Tweak the loader a little bit to just use file names, not fully qualified directories when referring
to mods.
2012-04-18 14:03:30 -04:00
LexManos 2eb63c07de Implemented RichardG's Paged Achivement list GUI modifications. 2012-04-17 11:46:07 -07:00
LexManos f13ed01532 Merge pull request #51 from ShetiPhian/patch-1
Edits enable use of EntityPlayer.canHarvestBlock (for PlayerAPI)
2012-04-17 10:26:55 -07:00
LexManos 75a40177ec Respawning in dimensions should now properly set the dimension ID for the new player instance. 2012-04-17 08:47:22 -07:00
LexManos e462ecb9b9 MAX_ENTITY_RADIUS Now works on the Y axis 2012-04-17 08:46:25 -07:00
ShetiPhian 8ffd66f27f Edits enable use of EntityPlayer.canHarvestBlock (for PlayerAPI) when the ToolClass has no rules for the block. 2012-04-16 23:01:40 -03:00
LexManos 36c7a35db9 Fix for vanilla crash for chunk generation with block ID's above 127. 2012-04-16 15:17:21 -07:00
Christian Weeks b2b4551df8 Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-04-16 01:00:06 -04:00
Christian Weeks 8800abf06c Fix chunk generators for bukkit 2012-04-15 22:42:06 -04:00
Christian Weeks 9fb72398b5 Merge branch 'master' into bukkit 2012-04-15 21:58:18 -04:00
LexManos 70623843cc Merge pull request #49 from cpw/master
Update to fml 68: fixes a ticking issue and soft vs hard dependencies
2012-04-15 08:36:06 -07:00
Christian Weeks 1a997219b4 Update fml to build 68: fixes a ticking issue and soft vs hard dependencies 2012-04-15 11:29:54 -04:00
LexManos cdf9361d07 Changed entity Forge spawning code works to be more in line with normal spawning:
(World, double, double double) constructor is nolonger called, normal (World) constructor, and setPositionAndRotation is called afterwords.
yaw, pitch, and yawHead is sent (if the entity isn't a EntityLiving yawHead isn't used)
The datawatcher data is also sent like a normal Entity.
2012-04-15 07:36:17 -07:00
Christian Weeks a08eefa261 Bukkit version 2012-04-14 23:01:03 -04:00
LexManos bda94ce522 Added variable entity radius to World, to be used if a mod make really large entities. 2012-04-14 13:07:01 -07:00
LexManos ff54e8279a Fixed bug in BlockFire's old fields. 2012-04-14 13:06:04 -07:00
Christian Weeks 0ec65b4b3a Fix "soft" dependencies so they can exist properly 2012-04-14 10:01:55 -04:00
LexManos 9b66ce034a Fixed TileEntity bug that was causing Ghost tile entities. 2012-04-13 10:24:22 -07:00
LexManos 5898a6e18b Multi-pass item rendering now uese proper render pass number. 2012-04-13 09:54:01 -07:00
LexManos 8ac1fe53f6 Added slope velocity hook for Covert 2012-04-12 23:37:25 -07:00
LexManos d54857e4de Fixed bugs in the Dimension transfer code, Now displays proper join message, and respawning in dimensions other then 0 works. 2012-04-12 21:47:11 -07:00
LexManos 334a28d144 Try to fix jenkins build. 2012-04-12 00:45:52 -07:00
LexManos 849df24f80 Merge pull request #42 from CovertJaguar/patch-2
Added a function for checking block harvest levels.
2012-04-12 00:24:17 -07:00
CovertJaguar 1aa80ed1c6 Added a function for checking block harvest levels without having to resort to reflection. 2012-04-11 21:16:56 -07:00
Christian e78688acdc Fix server patch 2012-04-10 23:05:22 -04:00
Christian 62b400c499 Merge in fixes from chickenbones for tick related problem
and straighten out variable naming in ModLoaderModContainer
2012-04-10 22:22:13 -04:00
LexManos 57b277c9d7 Added ItemStack sensitive burn time hook. 2012-04-10 01:04:00 -07:00
LexManos 0abb4e289a Added new Item function to allow for multiple rendering passes.
Fixed a vinella bug where item layters would not line up for EntityItem's
Added new IItemRendere helper flag for 3d block translations.
2012-04-10 00:43:21 -07:00
LexManos 20e264f9ee Rewrote IItemRenderer to be a more generic and expandable version, Breaks previous interfaces, but this should be the last time the interface changes.
Implemented the MapRender hook ChickenBones requested.
2012-04-09 22:57:52 -07:00
LexManos e400b2df4e Merge pull request #39 from cpw/master
Update to fml 62: adds in a couple of fixes
2012-04-09 21:04:04 -07:00
Christian Weeks e5911d9678 Update FML for new hooks: onPlayerLogout and onPlayerDimensionChanged 2012-04-09 10:45:53 -04:00
Christian Weeks 44a5b7b929 Push the patched file, as well 2012-04-09 10:24:58 -04:00
Christian Weeks 2ae31bddd2 Add in more "Player" related events. Fix up some MLProp stuff 2012-04-09 10:18:24 -04:00
Christian Weeks f92149aef5 Fix regular expressions, thanks ChickenBones! 2012-04-09 09:19:20 -04:00
Christian Weeks 19ecdf1a87 Update fml to 62- provision a server console command and fix mod loading order 2012-04-08 10:14:50 -04:00
Christian Weeks 597b6f0d2c Tweak Console handler patch so we're more friendly to forge 2012-04-08 10:04:28 -04:00
Christian Weeks 33f1e26df4 A proper console command handler, also fix ordering of loaded mods 2012-04-08 09:55:56 -04:00
LexManos 83e5bac8f7 Merge pull request #36 from cpw/master
Update to fml 58, separate the "register" and "announce to mods" phases of login
2012-04-08 04:30:49 -07:00
Christian Weeks 07437b95ae Add in a console command handler so you can access the command console 2012-04-08 02:00:57 -04:00
Christian Weeks 2926a40715 FML 59: don't send a zero length register packet, add mod channels 2012-04-08 01:17:42 -04:00
Christian Weeks 8fa4c1645c Don't send a register unless I have channels. Add the channel to the mod channels list. 2012-04-08 01:11:32 -04:00
Christian Weeks 96ff4ce8e3 Fix separated login/announce handler 2012-04-08 00:45:56 -04:00
Christian Weeks 83730ee9ec Split the packet salutation in two so we can work with or without forge 2012-04-08 00:18:37 -04:00
LexManos bc3fa299ef Merge pull request #35 from cpw/master
Update to fml 57, fixes the fact FML wasn't calling it's onlogin hook
2012-04-07 21:12:26 -07:00
Christian Weeks 6f3c41cc6f Update to FML 57: fixes FML not calling it's login handler code 2012-04-07 22:49:29 -04:00
Christian Weeks 42aee9032f Add the player object to the onLogin event so you don't need to dive internals for it during login 2012-04-07 22:38:29 -04:00
Christian Weeks 331768b272 Call my handleLogin hook from NetLoginHandler, tweak output in server gui and log file. 2012-04-07 22:11:01 -04:00
LexManos 6e31fc0185 Changed IGuiHandler's signature to be compatible with both sides. Took out ModLoaderMp reference in README. 2012-04-07 08:08:14 -07:00
LexManos ea41a93de3 Couple of output fixups and added script to be executed by Jenkins during the build. First test build. 2012-04-07 04:29:23 -07:00
LexManos 6e93f65ba1 Add server spawn protection config option as per someh4x0r's request. 2012-04-06 23:15:46 -07:00
LexManos 82ef183b5b Implemented ISaveEventHandler as ChickenBones's requested. 2012-04-06 23:02:43 -07:00
LexManos 9629d5b4f4 Updated patch for mapings 2012-04-06 23:02:00 -07:00
LexManos 421f31cce5 Added ChickenBones's request ITextureLoadHandler hook 2012-04-06 23:01:19 -07:00
LexManos 4e575f353f Rewrote the login code to delay full login untill forge fnishes negotiating network IDs. Should fix entities not having proper ID mapings. 2012-04-06 22:59:58 -07:00
LexManos f27a85c511 Merge pull request #33 from cpw/master
FML tweaks and a fix to release.py
2012-04-06 20:24:11 -07:00
Christian Weeks 1463e17385 Delete the old one too 2012-04-06 19:10:31 -04:00
Christian Weeks 8990b20a4d Add in recent fml with fixes 2012-04-06 19:01:39 -04:00
Christian Weeks b0d697c5bc Fix release script to import "inject_version" 2012-04-06 19:00:10 -04:00
Christian Weeks 0ae4c2e4a9 Fix subdirectory loading properly: mods will load inside eclipse.. 2012-04-06 16:14:01 -04:00
Christian Weeks 38094093b3 Actually figure out the path for directory class loading 2012-04-06 15:24:28 -04:00
Christian Weeks cd2be85575 regular expressions in java==fail 2012-04-06 15:03:41 -04:00
Christian Weeks b26bf5ab96 Recurse into subdirectories found 2012-04-06 14:43:12 -04:00
Christian Weeks 040a1d8cf7 Try multiple "jar" sources- for eclipse testing 2012-04-06 14:23:14 -04:00
Christian Weeks a858478b92 it's addURL not addUrl dumbo 2012-04-06 13:57:40 -04:00
Christian Weeks 9304420a2c it's getdeclaredmethod, dipstick 2012-04-06 13:47:01 -04:00
Christian Weeks 71a9bf9f70 Fix package private resolution of fields/methods from base minecraft by loading into minecraft's class loader not our own 2012-04-06 13:27:50 -04:00
Christian Weeks 21d11f431f Add in a missing client side method to modloader stubbed for the server 2012-04-06 12:24:52 -04:00
Christian Weeks 1ad6fa9a73 Update patches for FML fix. 2012-04-06 12:02:15 -04:00
Christian Weeks 47a15f4c77 Add the hooks for crafting and smelting 2012-04-06 10:34:44 -04:00
LexManos 35750681eb Finished up converting the source dist install scripts to python. Fixed a couple issues with the other scripts. 2012-04-06 07:16:14 -07:00
Christian Weeks 765194e8db Should load from whatever minecraft comes from now... 2012-04-06 09:59:58 -04:00
LexManos 9f327fd392 Updated repo scripts to python, allowing more flexability and less code duplication. 2012-04-06 06:10:11 -07:00
LexManos cf0ce3b086 Fixed update_patches.py to now delete old patch files that have no working src relation 2012-04-06 02:04:02 -07:00
LexManos b94ad38ec3 Deleted patches 2012-04-06 02:03:08 -07:00
LexManos ab927fce55 Initial patch update to FML and MC 1.2.5 2012-04-06 02:02:53 -07:00
LexManos 7c148ffa60 MCP Conf update for 1.2.5 2012-04-06 01:57:50 -07:00
Christian Weeks 55fe1aa1e3 Build should work now. Fix a stupid javadoc import. 2012-04-05 21:44:06 -04:00
Christian Weeks 09d37f87b0 New build script- version the src dist as well 2012-04-05 21:40:16 -04:00
Christian Weeks fc1dfa9cca Documentation: lots
Some eclipse workspace settings that might help?
2012-04-05 16:22:47 -04:00
Christian Weeks 8b1f984c53 Handle the minecraft object registry better- now the client compiles too
Also a quickie astyle run over the code..
2012-04-05 12:36:54 -04:00
Christian Weeks ae927a3cf8 Update the patches and fix the shell script 2012-04-05 11:42:33 -04:00
Christian Weeks 3b19792a12 Reorganize the code a little bit- move some stuff that was on FMLHandler to the common handler. Add a delegate
into the common handler that delegates to the right sided handler
2012-04-05 11:34:57 -04:00
Christian Weeks ebc532e3a9 Clean up extraneous print statements from the build 2012-04-05 10:42:15 -04:00
Christian Weeks 4470a808b1 Fix INSTALL-fml.txt file location in the server zip 2012-04-05 10:37:05 -04:00
Christian Weeks ba7f0a8429 Append a .class to the diff file list. Now you should just be able to iterate it and read every file in it directly. 2012-04-05 10:16:23 -04:00
Christian Weeks e828c1793d Run Astyle over the FML code. Happy lex? 2012-04-05 10:07:52 -04:00
Christian Weeks 011dd869de OK. Now the script works 2012-04-05 08:42:10 -04:00
Christian Weeks 21e55dc4c9 Crap at writing good python apparently 2012-04-05 08:29:07 -04:00
Christian Weeks 2ca5ccb861 Tweak file list script to print obf names 2012-04-05 08:25:04 -04:00
LexManos 6b4e73911b Merge remote-tracking branch 'origin/master' 2012-04-05 00:10:36 -07:00
LexManos 3478efe0d4 Rebuilt patches with new scripts. 2012-04-05 00:10:13 -07:00
LexManos 3a5c176af4 Cleaned up update_patches to fix a few bugs. Updated applypatches to normalize the patch file's line endings to make them work cross platform. Added download_firnflower and setup script. As well as added the GnuWin32's diff binary, so windows can create patches as well. http://gnuwin32.sourceforge.net/ 2012-04-05 00:09:29 -07:00
LexManos 9220174dbc Created eclipse workspace, should allow simple and quick access to working on FML 2012-04-05 00:06:11 -07:00
Christian Weeks 2489469aba Missed a couple of wording tweaks 2012-04-05 00:58:17 -04:00
Christian Weeks 11c3817779 Tweak the build a bit, add some more data and generate the
touched file list for forge
2012-04-04 11:05:31 -04:00
Christian Weeks 371d69f89c Tidy up some of the installation media 2012-04-04 09:48:36 -04:00
Christian Weeks b2555e4a50 links to implementation 2012-04-03 23:09:22 -04:00
Christian Weeks 3b0126d197 Channel validation 2012-04-03 22:45:27 -04:00
Christian Weeks 053552cdcc NetworkHandler doesn't care about channel ownership 2012-04-03 17:06:02 -04:00
Christian Weeks 5bd4f750bb Update patches for network handler 2012-04-03 17:04:57 -04:00
Christian Weeks 09efd147e1 Modloader complete 2012-04-03 17:04:26 -04:00
Christian Weeks cd255f4d6a Generic container 2012-04-03 16:12:19 -04:00
Christian Weeks 1e3cd7ca97 Config dir handling 2012-04-03 15:53:59 -04:00
Christian Weeks e243ffd1ce MLProp 2012-04-03 15:41:25 -04:00
Christian Weeks 35ece09cfa Mod sorting 2012-04-03 12:03:21 -04:00
Christian Weeks 971de1c2b4 Everything except ordering 2012-04-02 23:06:30 -04:00
Christian Weeks 9e404a48c5 Fix build script for generating md5s 2012-04-02 18:12:49 -04:00
Christian Weeks 63dbdd8db3 Update to 1.2.5 and hopefully forge compatibility 2012-04-02 18:09:06 -04:00
LexManos f327dd5d7f Implemented a chat event handler system to allow for manipulating and handeling the various chat/command events. 2012-04-02 02:26:13 -07:00
LexManos 1a024e5656 Add IChunkLoadHandler.canEntityUpdate() function to allow entities to update while in custom loaded chunks. 2012-04-02 01:14:31 -07:00
LexManos 21afe2a2aa Some cleanups to update_patches, should run properly on any system now. 2012-04-02 01:09:00 -07:00
LexManos 719e436caa Fix some shadowing warnings. 2012-04-02 01:08:37 -07:00
Christian Weeks 8e1f51d792 Forge support 2012-04-01 02:14:14 -04:00
Christian Weeks a8351a0e84 Initial attempts to support forge stuff 2012-03-31 02:28:14 -04:00
Christian Weeks ebf945f2bd Fix NPE 2012-03-31 01:04:29 -04:00
Christian Weeks e27f1c3a70 More logging and maybe fix default package mods 2012-03-31 00:59:43 -04:00
Christian Weeks 8091d8bdaf Logging fun. Whee! 2012-03-31 00:52:50 -04:00
Christian Weeks 281c455b5d Fail 2012-03-31 00:46:47 -04:00
Christian Weeks 44779a56b1 More logging 2012-03-31 00:43:54 -04:00
Christian Weeks f37c8ae4d7 Tweak class loader 2012-03-31 00:22:08 -04:00
Christian Weeks 41f469f495 Add more patches 2012-03-30 22:28:12 -04:00
Christian Weeks 28ac773c0a Some implementation 2012-03-30 22:26:16 -04:00
Christian Weeks 376d3995b4 tweak MC server hook 2012-03-30 21:23:04 -04:00
Christian Weeks cec16187c1 some build and logging tweaks 2012-03-30 21:21:43 -04:00
Christian Weeks f075e613e3 Fix build 2012-03-30 21:10:43 -04:00
Christian Weeks 7f985856ec Fix derpy 2012-03-30 21:07:42 -04:00
Christian Weeks d8580c2d02 Tweak loader a bit 2012-03-30 21:03:25 -04:00
Christian Weeks 12c23deee9 Fix patching 2012-03-30 20:43:58 -04:00
Christian Weeks e5b4d1e953 More build stuff 2012-03-30 20:38:31 -04:00
Christian Weeks 18069778d9 More building fun 2012-03-30 17:36:50 -04:00
Christian Weeks ba46c2e3bc fix build script 2012-03-30 17:00:49 -04:00
Christian Weeks c521479962 Add in more ignore stuff and a sample "fmlbuild.properties" file 2012-03-30 16:42:11 -04:00
Christian Weeks 620764f315 More build stuff, adding in readme etc copied from forge 2012-03-30 16:40:54 -04:00
Christian Weeks d97aaa4e82 Move more stuff around 2012-03-30 16:25:49 -04:00
Christian Weeks c7437f3a3b Build system 2012-03-30 16:22:10 -04:00
Christian Weeks cc65a26a89 Start patching fun 2012-03-30 13:33:29 -04:00
Christian Weeks 3afd52ac9d Ignore stuff 2012-03-30 11:35:35 -04:00
Christian Weeks efa8cf41b2 We're Forge Mod Loader, not Forge ModLoader 2012-03-30 11:35:04 -04:00
Christian Weeks b71f486837 Tweak license to refer to github 2012-03-30 10:16:36 -04:00
Christian Weeks 2edeba5af4 Add licenses reorganize code 2012-03-30 10:11:13 -04:00
Christian Weeks 7b3fb203fc Starting to get somewhere 2012-03-30 01:12:59 -04:00
Christian Weeks 62cca5a4b7 Thoughts on how to do the modloading properly 2012-03-28 16:44:36 -04:00
Christian Weeks 0cc2bc1923 Tab cleanup 2012-03-28 13:29:23 -04:00
Christian Weeks 7c30c12f9f Initial commit 2012-03-28 12:53:08 -04:00
LexManos 116e078db7 Fixed camelcasing in IConnectionHandler, ment to do during first upgrade. 2012-03-27 07:27:04 -07:00
LexManos 114c534db4 Changed update_patches script to use python for the bulk, Prevents making 1800 temporary useless files. 2012-03-27 07:26:39 -07:00
LexManos aa83f571c2 Fixed typo bug in MinecraftForge.getEntityTrackerInfo 2012-03-27 01:00:43 -07:00
LexManos 66b3c827cc Updated to MC: 1.2.4 MLMP: 1.2.4 v1
Removed all code that was marked as deprecated, IE: ICustomItemRenderer, and the functions in Configuration
2012-03-27 00:39:23 -07:00
LexManos 2230ca7c54 Reworked EntityPlayerMP.openGui to hopefully be more compatible with PlayerAPI 2012-03-26 04:27:34 -07:00
LexManos dd17ebd009 Cleanup the EffectRenderer patches, Allows custom food items to have the proper particals. Cleaned up special case class in favor of basic java generics. 2012-03-26 02:48:58 -07:00
LexManos 9153ded16f Added rider sit pull request. 2012-03-25 23:28:32 -07:00
LexManos 06eb9de126 Fixed a couple of bugs in the Configuration categories pull request.
Added helper functions to Property for standard int/boolean usage.
2012-03-25 23:26:01 -07:00
LexManos dec539f6f9 Merge pull request #22 from CovertJaguar/patch-5
Added the ability to define custom categories for config files.
2012-03-25 22:24:08 -07:00
LexManos 3f0232223d Updated MCP mapings 2012-03-25 22:02:13 -07:00
CovertJaguar 353885bc94 Removed createCategory() function and changed it to create categories as they are encountered. 2012-03-23 11:41:16 -07:00
CovertJaguar 1067a66c06 Added the ability to define custom categories for config files. 2012-03-23 09:43:48 -07:00
LexManos 65b3742636 Added MinecraftForge.isClient() function that returns true if you are in the Minecraft Client, (As defined as net.minecraft.client.Minecraft existing) false otherwise.
Fixed a typo on PacketEntitySpawn that caused speed to be assigned improperly.
A little code cleanup.
2012-03-22 19:46:36 -07:00
LexManos 96b698dc85 Implemented Pheenixm pull request allowing for more control over the camera. 2012-03-22 19:44:12 -07:00
LexManos 55780422ae Changed logic in Configuration to allow for extended block ID mods easier access to change that. Just use reflection to change Configuration.configBlocks to whatever length you want. 2012-03-22 19:39:15 -07:00
LexManos be1dd4934a Fixed NPE on CustomPayload packets with 0 data 2012-03-22 19:30:59 -07:00
LexManos 43ac9d6799 Fixed a few typos that CovertJaguire found in The Forge entity handeling code. And re-wrote the connection sequance so that clients get a list of mod ids before anything else. 2012-03-20 22:04:58 -07:00
LexManos 7c7b6d8f46 Readded the deprecated interface ICustomItemRenderer. Added method to enforce deprecation cross Minecraft versions. 2012-03-20 06:43:05 -07:00
LexManos 5d057ea49a Bumped version number to 1.4.1 2012-03-19 22:36:40 -07:00
LexManos 952fb54a44 Merge pull request #15 from newthead/master
Improved Custom Item Render Interface
2012-03-19 22:19:41 -07:00
LexManos 93fa20952e Merge pull request #16 from CovertJaguar/patch-3
Fix for network code.
2012-03-19 21:21:14 -07:00
LexManos 5a0df1f17f Fixed dyes showing twice in creative list 2012-03-19 21:20:08 -07:00
newthead bd49c3dcdb Reverted vanilla texture binding to an explicit if() statement based on item ID 2012-03-19 11:52:24 -07:00
newthead be07279984 Changed render hook checks to all use ItemStack instead of itemID 2012-03-19 11:37:51 -07:00
LexManos 34ea120258 Fixed tile entities not properly being removed for blocks that do not extend BlockContainer, or override BlockContainer.onBlockRemoval 2012-03-19 10:30:21 -07:00
CovertJaguar 6a1cdc8e0c Fix for network code. 2012-03-19 08:09:00 -07:00
LexManos ff37b70e03 Fixed a class to a deprecated method to fix tool effectiveness. 2012-03-18 23:38:03 -07:00
LexManos 29a65efd77 Fixed excessive need for user interaction in the install script. 2012-03-18 23:37:32 -07:00
newthead 0597c30ac2 Merged item rendering interfaces into a single IItemRenderer 2012-03-18 10:49:23 -07:00
LexManos e883645266 Fixed IOException not found error in CovertJaguires pull request. Updated scripts so that build should now be fixed 2012-03-17 19:54:40 -07:00
LexManos e3359fdbd3 Reworked the workspace scripts so the build should fail on compile errors. This build should fail as a test. 2012-03-17 19:49:00 -07:00
newthead e2dc4d595e Modified patches to use new item render hooks 2012-03-17 11:48:54 -07:00
newthead 4cf001c644 Updated render hooks and registration to use the IItemRenderer interface 2012-03-17 11:46:15 -07:00
newthead 4366929c9b Merged item rendering interfaces into a single IItemRenderer 2012-03-17 11:21:08 -07:00
LexManos 10ee3b9e92 Merge pull request #14 from CovertJaguar/patch-2
Added throws clause to ISpawnHandler functions...
2012-03-17 01:09:33 -07:00
LexManos 230a4188f8 Fixed onTakenFromCrafting hooks to be called once per stack taken. Sadly due to how shift-click is handled, the passed in item stack is not garenteed to be the stack that the result was added to. 2012-03-17 01:08:53 -07:00
newthead 2e24491707 Added additional flag for rendering entity item bobbing 2012-03-17 00:17:57 -07:00
newthead 8e92edb4b7 Cleanup/fix item render hooks 2012-03-16 23:57:59 -07:00
newthead d7cbbfb3d2 Added render code for inventory items and entity items. 2012-03-16 21:28:08 -07:00
newthead 391fbbd42b Added remaining item render hooks, and fixed a static method access 2012-03-16 21:27:05 -07:00
newthead 7efd97399f Clarified render option for inventory items 2012-03-15 23:47:58 -07:00
newthead dc0fc67412 Added hook for rendering equipped items 2012-03-15 23:47:28 -07:00
newthead 2524cf273b Added new item render interfaces to Forge client 2012-03-15 21:26:09 -07:00
CovertJaguar a3345c6d57 Added throws clause to ISpawnHandler functions to keep the functions consistent with similar functions and increase ease of use. Exceptions are already being caught everywhere these functions are called, so no further changes required. 2012-03-15 03:34:42 -07:00
LexManos c0bf315876 Made BlockStairs, BlockFarmland, and BlockStep have proper sided-solidity. Can now place torches on any solid side of those blocks. 2012-03-14 16:50:43 -07:00
LexManos dda4d3c93c Proper fix for SDK's invalid bit shifts of parameters for chunk population 2012-03-14 16:49:53 -07:00
LexManos ba285c455c Fixed type on patch conversion messing up tile entities 2012-03-14 16:49:02 -07:00
LexManos 29556e6170 Fixed sides of grass not getting biome colors 2012-03-14 16:48:33 -07:00
LexManos 0c39a7cbfd New EntityInteract hook for handeling player vs entity interaction on the global level vs the item level. 2012-03-14 16:47:15 -07:00
LexManos 09725ae326 Fixed forgotten type identifier in clean_src 2012-03-14 16:46:03 -07:00
Eloraam 2a8a89ee14 Merge pull request #12 from cpw/fixworldgen
Fix worldgen doubleshifting in ModLoaderMP until SDK fixes it.
2012-03-14 11:52:41 -07:00
Christian Weeks 8a8875a180 Fix worldgen doubleshifting in ModLoaderMP until SDK fixes it.
This means mods can generate surface and nether in SMP again.
2012-03-13 19:36:26 -04:00
LexManos 91ab9d0e1b New script to fix decompile differences between windows and linux/osx.
Removed the MLProp special case, no longer needed as MLProp decompiles fine.
Updated patches to work on all systems.
Added warning and exit if the user does not say yes to the cleanup.
2012-03-12 16:55:59 -07:00
Eloraam 9acdb5b620 Fixed a merge error. 2012-03-12 15:51:11 -04:00
Eloraam 340eede26c MCP Update. Fixed a few small bugs in the linux scripts. 2012-03-12 15:46:18 -04:00
LexManos 249ba1248d Custom dimensions should now honor the canRespawnHere function for respawning. 2012-03-12 12:19:20 -07:00
LexManos 02b3c0042d Fixed a wrong argument for dimensions, should fix entity tracking. 2012-03-12 12:18:42 -07:00
LexManos 6c6d4a7ed9 Fixed the inverted logic in the missing mod check. 2012-03-12 12:18:16 -07:00
LexManos b23798f67a Fix up Configuration ids to only work for 256 ids until Jeb finishes the 4096 conversion. 2012-03-10 17:08:34 -08:00
LexManos b56e414b98 Merge remote-tracking branch 'origin/master' 2012-03-09 18:55:13 -08:00
LexManos e32cb4eeb6 Fixed a bug where vines were not shearable. 2012-03-09 18:54:39 -08:00
LexManos cea259fab0 Merge pull request #11 from CovertJaguar/patch-1
Fixed a minor bug with the Minecart Dictionary.
2012-03-09 17:22:26 -08:00
CovertJaguar 3847292ef7 Fixed a minor bug with the Minecart Dictionary. 2012-03-09 17:10:50 -08:00
LexManos 7db6897fa3 1.4.0 official release. 2012-03-09 13:54:50 -08:00
LexManos e49564d0e8 Updated to MLMPv3 2012-03-09 10:42:39 -08:00
LexManos 5946d70ebf Implemented ChickenBone's Chunk handler 2012-03-08 22:21:38 -08:00
LexManos c3d7bb6b7d Hack-fix for players getting stuck during logins. Detailed fix when bug is actually tracked down. 2012-03-08 22:21:06 -08:00
LexManos 168fd92099 Updated to latest MCP 2012-03-07 09:45:31 -08:00
LexManos 924cc290dd Fixed client side bonemeal on grass only making flowers 2012-03-07 09:45:13 -08:00
LexManos e5d2de03ab Removed improper tile entity negation 2012-03-06 22:44:29 -08:00
LexManos 45910043c3 Fixed a generic tile entity line i missed on the server side. 2012-03-06 22:44:04 -08:00
LexManos e3c149c246 Fixed MLMP thinking Network mods need a client side when they dont. 2012-03-06 22:43:35 -08:00
LexManos 50390a305d Updated to SDK MLMP v2 2012-03-06 18:47:54 -08:00
LexManos b69e492343 Fixed missing double array in MLMP's packet server side. Also, fixed the creative code again, brain failed. 2012-03-06 15:04:40 -08:00
LexManos 7cfd984093 Updated to SDK's 1.2.3 MLMP, Mush cleaner, no longer supporting Flan's. 2012-03-06 14:12:55 -08:00
LexManos 74a33759fd Got my comparitor turned around 2012-03-06 14:12:20 -08:00
LexManos eb06a63222 Updated gitignore, fixed digging particles, fixed creative container showing to many blocks, fixed wrong argument for custom renderers. 2012-03-06 12:11:24 -08:00
LexManos 885484f75f ItemBlock now implements ITextureProvider so that blocks with custom textures will showup properly when being held. 2012-03-06 00:28:12 -08:00
LexManos f847e37119 Updated MCP's patch files. Fixes hangs on running MC as applet. 2012-03-06 00:26:51 -08:00
LexManos 72357310ae Cleanup of ModLoaderMP and proper update to the latest version of ModLoader 2012-03-05 20:02:07 -08:00
LexManos 1c77b62704 Fixed directory issues in the setup script 2012-03-05 20:01:04 -08:00
LexManos 66cac8ea7d Fixed NPE in the login handler 2012-03-05 19:57:50 -08:00
LexManos d1acfd94a6 Updated MCP mapings files 2012-03-05 15:07:33 -08:00
LexManos b77075367e No longer mark forge packets as chunk packets. 2012-03-05 15:07:18 -08:00
LexManos 2405761461 Fixed missing space in linux scripts 2012-03-05 15:06:54 -08:00
LexManos 3d53e59d73 Updated for MLMP 1.2.3 v1 2012-03-05 13:20:03 -08:00
LexManos 5f7d00e6ba Made the scripts forge updating md5s/mcp/names 2012-03-05 12:44:00 -08:00
LexManos bef2f96597 Missed damageCarryover on the server 2012-03-04 20:59:10 -08:00
LexManos 5f1d4524f9 Small imports cleanup 2012-03-04 20:46:50 -08:00
LexManos 5a0e798102 First push of server side patch updates for 1.2.3. MLMP is still not updated so it does not include those changes, and will not compile. 2012-03-04 20:46:15 -08:00
LexManos 70388dd607 Deleted unneeded server side patches, Packet250 bug was fixed. And the others got moved to AnvilSaveHandler 2012-03-04 20:45:15 -08:00
LexManos 9d626d9e5e Couple of things I missed client side 2012-03-04 20:43:30 -08:00
LexManos 5257986d76 Bit of a cleanup of the client patches 2012-03-04 20:43:11 -08:00
LexManos 650f92e858 Client side initial patch update to Fernflower and MC 1.2.3 2012-03-04 03:09:45 -08:00
LexManos c8fa2639aa No longer needed, bug was fixed 2012-03-04 03:08:43 -08:00
LexManos e96e496e05 Same patch diff, files. 2012-03-04 03:08:22 -08:00
LexManos 0599b29eb9 Conf for 1.2.3 2012-03-04 03:06:56 -08:00
LexManos 8478ff83aa Deleted EntityPigZombie patches, Who needed these? Why could you not do this via reflection? 2012-03-03 23:07:58 -08:00
LexManos d4c12596c9 removed unneeded import, and fixed casing of args in IShearable 2012-03-03 20:43:36 -08:00
LexManos 1633cce166 Fixed unneeded imports in ForgePacket 2012-03-03 18:37:40 -08:00
LexManos 2b40928113 Made mod_MinecraftForge extend NetworkMod, and changed NetworkMod to extend BaseModMP server side. 2012-03-03 18:17:23 -08:00
LexManos b2305b9d62 Updated The Json enum helper to point to the new packaged names. And fixed a casing change in ModLoader 2012-03-03 18:16:43 -08:00
LexManos 25e57d950a Updated eclipse project for MCP 1.2.3's inclusion of the Start folder in the src folder. 2012-03-03 18:09:05 -08:00
LexManos 7285b150e3 Deleted modLoaderMP.patch, unneeded now that we use Fernflower 2012-03-03 18:08:26 -08:00
LexManos a7c0026022 Updated scripts so that we use Fernflower now. Added a small python script to download fernflower for the user. And the scripts exit out if it fails. 2012-03-03 17:56:15 -08:00
LexManos cdbf0b21e7 Bumped version to 1.3.4, final commit for Minecraft v1.1 2012-03-01 09:39:22 -08:00
LexManos fcc1e1b9fb Fixed bug in build script that caused the Minecraft/MinecraftServer classes to not be included. 2012-02-29 02:30:05 -08:00
LexManos fcaddfd0fa Client side of the new Dimension support. 2012-02-28 18:52:52 -08:00
LexManos cfc68427ef Fixed compile error for the spelling pull request. 2012-02-25 15:41:56 -08:00
LexManos 041fb1e1da Fixed ITextureprovider for multi-textured items when rendering on the GUI. 2012-02-25 15:30:14 -08:00
MinecraftForge b99f14d72a Merge pull request #4 from Deveducer/master
Fix spelling error
2012-02-25 15:28:15 -08:00
Deveducer 431288f404 Fixed spelling mistake ('Frequancy') 2012-02-25 18:48:05 -08:00
LexManos 3c5ccfcad6 Merge commit 2012-02-24 22:13:03 -08:00
LexManos c44aac2b39 Ran AStyle over forge code for uniform code formatting, and refactored old code a bit to have cleaner names. 2012-02-24 22:07:58 -08:00
LexManos f160e90738 Deleted Deprecated interfaces. 2012-02-24 21:55:52 -08:00
LexManos fbc9fe73d7 Fixed line endings in windows update_patches 2012-02-24 20:29:49 -08:00
LexManos a50f2a094d Fixed up Shearable blocks to play nicer with sub-classes. 2012-02-24 20:28:59 -08:00
MinecraftForge 2946e50ca5 Merge pull request #3 from Deveducer/patch-1
People may think the server needs the mods to continue and not the clien...
2012-02-24 12:45:41 -08:00
Deveducer 7590705b71 People may think the server needs the mods to continue and not the client. 2012-02-24 12:26:36 -08:00
LexManos 964b33f2c7 Fixed a bug in update_patches that caused apostrphies to be removed. Causing the last patch to be generated incorrectly. 2012-02-24 10:47:25 -08:00
LexManos d2c7a856c1 Initial attempt at server side extra dimensions support.
Mods must register there dimensions on load, by calling DimensionManager.registerDimension(uniqueID, WorldProvier, boolean)
Mods are resposible for writing there own transporter blocks.
Initial commit, needs some more testing and design thoughts.
2012-02-24 02:38:16 -08:00
LexManos 08b908acea Implemented a response to Methuselah96's Arrow hook request. See IArrowNockHandler and IArrowLooseHandler 2012-02-22 16:51:14 -08:00
LexManos a5e209952e Added new Item.getIconIndex context sensitive version. 2012-02-22 16:49:57 -08:00
LexManos 76830e7fe2 Moved Client side EntityPlayer.openGui work code to EntityPlayer for compatibility between player API. 2012-02-22 12:39:11 -08:00
LexManos f8ad250cc7 Introduced some debugging info into Forge packets. And a debug flag in the client and server packet handlers. 2012-02-22 12:01:38 -08:00
LexManos 86adb815e6 Marked forge packets as 'chunk' packets. Giving them a higher priority making the initial mod list check more reliable. 2012-02-22 11:59:36 -08:00
LexManos 745539626d Changed the layout of the missing mods gui a little. Still needs a lot of work to look good. 2012-02-22 11:58:05 -08:00
Eloraam 7c66376a3b Fixed linux scripts, fixed TE bug. 2012-02-21 03:53:33 -05:00
Eloraam 56c165800b Merge branch 'master' of github.com:MinecraftForge/MinecraftForge 2012-02-21 03:43:13 -05:00
Eloraam 24a8d129b5 Linux scripts fixed, TE bug fix. 2012-02-21 03:39:47 -05:00
LexManos 54ec1567b2 Implemented a generic EntityPlayer.openGui system, and the network backend for it to work on server and client. 2012-02-20 23:56:01 -08:00
LexManos a6f93ed528 Expanded the Mod check to test for missing mods and display a GUI screen for the client if it is missing any.
The client now downloads NetworkMod ID's from the server upon connecting.
2012-02-20 23:54:11 -08:00
LexManos 70fbe4f403 Introuduced NetworkMod, a BaseMod extension and replacement for BaseModMP. All mods that are designed to work in the server environment should extend this.
NetworkMods will be assigned unique ModIDs by the server, and those IDs will be sent to the client upon connection.
Refactored Forge packets to the net.minecraft.src.forge.packets package. And introduced the base ForgePacket class.
Added initial ModList request/response.
2012-02-20 23:50:26 -08:00
LexManos 546a0fce41 Exposed getters for NetServerHandler.playerEntity and NetworkManager.netHandler 2012-02-20 23:42:26 -08:00
LexManos 87524cfa31 Fixed up the install scripts. The linux script no longer needs sed. Should fix some issues on OSX's without gsed.
Also forge sources will only be copied to sides that were downloaded.
Also, install scripts now prompt for input to cleanup.
2012-02-18 10:47:45 -08:00
LexManos 67a49ccdd2 Split mod_MinecraftForge so that Clients arnt required to have MLMP installed if they don't use a MP mod. 2012-02-16 20:04:40 -08:00
LexManos 4c7814c603 Bumped version to 1.3.3 2012-02-15 06:41:36 -08:00
LexManos f73d0e33c7 Small update to update_patches.bat, to skip patch reject files. 2012-02-15 06:41:12 -08:00
LexManos 9440767e22 Update MCP Mapings 2012-02-15 06:40:41 -08:00
LexManos c54ed32d2a Refactored so that ISpecialArmor items do not see the factor of 25 on the damage.
The value returned form ISpecialArmor.getProperties is now copied, so mod items are free to re-use there return values.
2012-02-14 11:12:16 -08:00
LexManos d230b379f9 Reworked ISpecialArmor to provide better functionality as requested by IC2 devs.
Armor can now be prioritized over other armor.
It can deal with damaging it's own itemstacks.
Also impkemented the ISpecialArmor.getArmorDisplay
2012-02-14 10:37:31 -08:00
LexManos f2b973e48a Implimented a new IShearable system. This allows mods to create both new shear-like items/blocks. As well as new Entities/Blocks that work with other mod's shear-like items. 2012-02-13 04:13:02 -08:00
LexManos 5163a30002 Implemented item.onBlockStartBreak call for creative single player. 2012-02-13 04:11:39 -08:00
LexManos d8fa9a8497 Added Item.onLeftClickEntity hook. Used to intercept and cancel the 'attack' action within items. 2012-02-13 04:04:55 -08:00
LexManos d977c1bfc5 Fixed ITextureProvider support for items that have multiple colored overlays. 2012-02-13 04:03:04 -08:00
LexManos 1242aade3c Lowered the amount of build log spam, and fixed the inject_version script for use on other systems. 2012-02-13 04:01:54 -08:00
LexManos 6a8d84470a Missed a caluse, ISpecialArmor should work as intended now. And not destroy Armor instanatly. 2012-02-10 07:10:39 -08:00
LexManos 14ccf7834b Implmented Sengir's IPickupHandler.
http://www.mod-buildcraft.com/forums/topic/hook-intercept-item-pickups-by-player-entities/?view=all
2012-02-10 06:56:28 -08:00
LexManos 408d2a9d62 Merged in the change to ISpecialArmor to introduce the DamageSource argument.
As well as the concept of damage absorption vs reduction.
2012-02-10 04:02:32 -08:00
LexManos 2ea1775224 Created a Entity tracking ans spawning system.
Mod creators should call MinecraftForge.registerEntity to register a entity.
All entity ID numbers are Mod Unique. Meaning two mods can have Entity #1.
Added client and server side packet handlers for the 'Forge' channel. For use in internal packets such as the new Spawn packet.
Updated the build scripts to copy over unique server source files now that there actually are some.
For modders:
  If you have a entity that used MLMP's 'owner' system, you should have your entity implement IThrowableEntity
  If you have a entity that implments MLMLP's ISpawnable, you should implement ISpawnHandler.
They provide the same functionality, just in a cleaner, more orginized way and will be the method used when we eventually drop MLMP.
2012-02-10 03:06:08 -08:00
LexManos fcc781b100 Fixed return value for un/registerChannel. Now returns properly indicate when un/register commands should be sent. 2012-02-07 05:13:19 -08:00
LexManos ebdc9b9464 Setup .gitignore for eclipse bin dirs.
Fixed line endings in install.sh
Added mod_MinecraftForge for simpler logging of minecraft version in crash reports
Added new hooks for connection events, See IConnectionHandler for more details.
Added Packet250CustomPayload handeling and channel registraction management, see MessageManager and IPacketHandler for more details.
Forge now uses unsed fields in C->S Packet1Login to identify itself. None Forge clients will get a graceful disconnect message instead of the 'Unknown packet 230'
2012-02-07 03:16:57 -08:00
LexManos 9265b690ab First official commit for GitHub. Using to test build automation system firing from final configuration. 2012-02-03 03:30:49 -08:00
LexManos 02088ea278 New parameter for setup script to skip the initial decompile. Used in the build system to speed things up. 2012-02-03 10:46:49 +00:00
Space Toad e3b3920661 bumbed version number 2012-01-29 13:27:26 +00:00
LexManos 61dc035977 Potions are not armor. 2012-01-28 07:34:39 +00:00
LexManos 7a6193e8f5 Reorganized SpecialArmor code to work properly. 2012-01-28 07:09:55 +00:00
LexManos 92b2a3666e Some typo fixes 2012-01-28 06:16:58 +00:00
LexManos c6121b5676 Updated for MCP Mappings 2012-01-25 13:08:09 +00:00
LexManos 08195cfc03 Streamlined the Setup, Build and Package scripts:
On windows they no longer need the user to press enter every step
Moved version info out to version.txt, This will only effect the svn. If you update the version do it in version.txt not in ForgeHooks.java.
Introduced the build number into the version string.
Cleaned up some extra echos in scripts.
2012-01-25 07:00:31 +00:00
LexManos fa564fb3c5 Reach and Rail bugfix 2012-01-23 20:44:10 +00:00
Space Toad 224597aa3a bumped version number 2012-01-22 01:28:22 +00:00
LexManos 9f31de24aa Install.cmd now tries to add the system folder to the current path. 2012-01-21 19:45:03 +00:00
LexManos 86a5cfd48b Disabled updatenames int he isntall scripts till MCP fixes the reobf issue.
Updated to MLMP 1.1v2, Which says it fixes bugs it doesn't But it does fix the packet bug.
Fixed a bug in Packet 250.
2012-01-20 18:44:00 +00:00
LexManos 52a18ab02b Updated MCP mappings 2012-01-19 19:21:48 +00:00
LexManos a560c7bf9a Fixed the Minecart Drop bug 2012-01-19 00:53:18 +00:00
Eloraam b767ce84ab Fixed a bug that caused snowballs to drop incorrectly. 2012-01-18 03:03:34 +00:00
LexManos 3bb04f70ca Small update to ContainerCreative hook for better compatibility with mods that extend block IDs. 2012-01-17 21:03:08 +00:00
LexManos 2319eec68b Fixed getCartClassForItem and getCartTypeForItem 2012-01-17 16:48:09 +00:00
LexManos 3b5b9c5d1e Bug Fix for Chests staying open on MP Servers
Implemented reach distance variable
2012-01-17 03:44:52 +00:00
LexManos 43a89e61e9 Fixed a few accessors I missed:
Server RailLogic.getNAdjacentTracks public
Server TileEntityFurnace.getItemBurnTime static

New GUIControls change, Made it into a scroll panel instead of a static position window.
This just makes things look better when multiple mods with KeyBindings are installed
2012-01-17 02:03:29 +00:00
LexManos 078d3c2750 Fixed a mapping issue with client side TileEntityFurnace patch 2012-01-16 02:13:08 +00:00
Space Toad 0be5c34f01 added missing files 2012-01-15 23:40:23 +00:00
Space Toad 779d34372b removed files from previous version 2012-01-15 23:39:28 +00:00
Space Toad 5190e0c927 bumped version number 2012-01-15 19:28:53 +00:00
Space Toad bfd0cfe506 merged with 1.1 branch 2012-01-15 19:16:08 +00:00
LexManos 87d4c2134c Bumped version number
Added initialization to ModLoader's log
2012-01-14 03:57:01 +00:00
Eloraam dda5880360 Fixed an unroll from the MCL merge. Updated MCP mappings. 2012-01-13 19:21:01 +00:00
LexManos 2309163d92 Fixed NPE on some JVM's 2012-01-12 07:43:55 +00:00
LexManos e5a16e25df Merged in MCL branch 2012-01-12 07:38:23 +00:00
Eloraam ad378151cf Improved the ladder hook. Added a new hook for sustained-use items. 2012-01-11 19:40:04 +00:00
Eloraam bdda88d74e Fixed MCP mappings again. Fixed the Entity NBT code.
Added a new hook to support custom enchantments.
2012-01-11 18:39:42 +00:00
Eloraam 61d9b78704 Updated MCP Mappings. 2012-01-11 18:13:35 +00:00
LexManos f3e56e0273 Fixed faces for BlockFire 2012-01-01 09:30:42 +00:00
LexManos e26f1ab671 Refactored a bit of the TileEntity code so that ANY block may now have a tile entity.
This is to allow modders the ability to extend blocks other then BlockContainer, and still be able to have a TileEntity.

Also added a NBTTagCompound to the base EntityClass, this allows any entity to be given arbitrary data that will persist across world saves.
This data is NOT sent over the wire in a MP situation, to have data sent over the wire automatically use the built in data watcher.
2012-01-01 07:42:21 +00:00
Space Toad dda9f474af bumbed version number 2011-12-28 21:22:07 +00:00
LexManos df3449534f Changed Block.setBurnRate to public and Block.setBurnProperties
Re-added bounce functions to BlockFire for non-forge mods.
Should fix Optifine compatibility.
2011-12-24 05:07:55 +00:00
LexManos 906cb8ee39 Fixed a re-name that somehow missed the commit.
Serverside chanceToEncourageFire -> getFireSpreadSpeed
2011-12-24 00:35:41 +00:00
Eloraam d541e492c4 Fixed some rendering issues. 2011-12-23 00:23:01 +00:00
Eloraam d7d0f241ff Another mapping update. 2011-12-22 20:11:38 +00:00
LexManos c8fca39895 Updated mapping for last commit 2011-12-22 02:17:40 +00:00
Eloraam dd1eb6924d Mapping updates. 2011-12-21 23:09:18 +00:00
LexManos 3f8d830899 Re-added BlockFire's properties, apparently some people access this by reflection. 2011-12-21 14:10:05 +00:00
Eloraam a4475c9e9a Bumping the version number. 2011-12-21 10:22:37 +00:00
Eloraam 90a4744130 Fixed some strange behavior in snow blocks. Fixed a missing patch checkin. 2011-12-21 10:15:38 +00:00
Eloraam f4eec04eba A minimalistic hook for rendering world effect overlays or other 3D overlay
data.
2011-12-21 09:57:10 +00:00
Eloraam dbb5a37449 Major rework of the rendering core. Added support for custom render context
handling.
2011-12-21 09:01:45 +00:00
LexManos 348a6fe03c Added Item.onDroppedByPlayer hook 2011-12-21 07:44:01 +00:00
Eloraam 6e1442e8e6 Deprecated IUseItemFirst, and made onUseItemFirst work in Creative. 2011-12-21 06:34:57 +00:00
LexManos b91eb1ceac Added server side prototypes for addCreativeItems()s They are unused, but declared for compiling compatibility. 2011-12-21 04:38:59 +00:00
LexManos a38c8bd427 Added hooks to BlockFire for setting block flame interaction properties. 2011-12-21 04:30:53 +00:00
LexManos 2936697302 Replaced dropBlockAsItemWithChance in BlockNetherStalk with getBlockDropped. 2011-12-21 00:44:53 +00:00
Eloraam 52de732b8e Fixed a minor crop fortune bug. 2011-12-20 21:39:53 +00:00
LexManos c2f165f211 Commit of a hook for adding items into world dungeon generation.
Uses a weighted random selection scheme.
Also a hook for adding custom mobs to the dungeon generation list.
2011-12-20 07:00:43 +00:00
LexManos 4c6e03e4ad Updated mappings 2011-12-20 06:58:29 +00:00
LexManos c84b8740b4 Implemented ISidedInventory for Brewing Stands.
Top is input, 1 slot
All other sides are output, 3 slots.
2011-12-19 06:33:20 +00:00
LexManos 8c9762fd9a Added missing native library path to forge_client project.
Added harvest levels/effectiveness for Axes and Shovels.
2011-12-16 10:06:57 +00:00
LexManos d8a14ee928 Fixed a zLevel bug with custom item renderers. 2011-12-14 10:45:37 +00:00
Space Toad 8bb73671ba bumped version numbers 2011-12-13 19:33:37 +00:00
LexManos 46a9ba178f Fixed seeds/wheat not dropping from Crops/TallGrass.
All future Forge code should use proper annotations when Overriding.
2011-12-11 21:55:35 +00:00
LexManos 5c60c2246c Small fix to decrease the number of glBindTexture calls that are immediately overridden. 2011-12-11 11:50:55 +00:00
LexManos e79b5d1937 The install scripts will now only patch the client/server if they are there.
This allows for people to only worry about getting one side setup correctly if they don't care about the other.
2011-12-11 07:37:54 +00:00
LexManos 9bf4f67d9d Fixed a infinite recursion loop in spacetoad's commit to Block.java.patch
Added @Deprecated annotations to the 'backwards compatible' functions spacetoad re-added.

Made changes to the install scripts:
-Will overwrite the current MCP mappings and use the ones that ship with forge, this 
    should eliminate all the issues of people not being able to install it because they updated there mcp.cfg
-Will now move fernflower.jar if it is found, so that MCP will not decompile using it.
    Should fix the issues of people trying to use forge with fernflower installed.
-Will call updatemcp/updatenames so that users get the latest mappings for unmapped items.
-Also calls updatemd5s so that the forge API is skipped when spitting out reobfusicated files.

Update the readme to be more accurate.
Added my name to the credits :P
Updated the update_patches/package scripts to account for grabbing the conf folder.
Added GnuWin32's grep
2011-12-11 07:04:21 +00:00
Space Toad c726e219d7 bumped version number 2011-12-10 11:07:51 +00:00
Space Toad 707a07511f further backward compatibility fixes 2011-12-10 11:05:49 +00:00
LexManos d64c332266 Added my EnumHelper classes, this allows for dynamic creation of Enum values at runtime.
See My post for a example:
http://www.minecraftforum.net/topic/514000-api-minecraft-forge/page__view__findpost__p__10948540
2011-12-09 07:58:32 +00:00
LexManos 800bb21bc8 Missed some mappings 2011-12-09 06:51:31 +00:00
LexManos 1931d4fc09 For for updated mappings. 2011-12-09 04:40:32 +00:00
Space Toad 17c9f9bf9b added server side of the previous commit 2011-12-08 07:51:17 +00:00
Space Toad db1f438c2d fixed backwards compatibility 2011-12-07 21:30:48 +00:00
LexManos d67cda76b8 Fixed fortune enchant.
This breaks forge's quantityDropped signature, be careful when updating mods.
2011-12-06 07:41:59 +00:00
LexManos b883254220 Cleaned up a few things related to MLProp
Deleted unmaintained fernflower patch.
2011-12-05 08:30:07 +00:00
Eloraam 8a4636cba3 Added a hoe handler for advanced farming. 2011-12-02 04:32:10 +00:00
Eloraam 9c6f5bd8ee Added new tool harvest intercept hook. Removed mlprop.patch. 2011-12-02 04:08:15 +00:00
LexManos a2c606e98c Moved dye creative adds to the ItemDye class. 2011-12-02 03:57:11 +00:00
LexManos 6c578cd84d Creative Container population hook. 2011-12-02 03:37:48 +00:00
Eloraam e35435abd5 Fixed missing CraftingManager patches for the repair disable hook.
Fixed smp mlprop.
2011-12-02 02:26:15 +00:00
LexManos 5c7978d347 Added MLprop.java that ST forgot when he merged.
Fixed EntityPlayer.getPlayerStrVsBlock metadata function for 1.0.0 changes in Enchantments/Potions.
2011-12-01 07:29:06 +00:00
Space Toad 68cc1d315b bumped version number 2011-11-30 19:02:10 +00:00
Space Toad 96c05bbd25 merged with pre-1.9p5 branch, for 1.0.0 release 2011-11-30 19:00:43 +00:00
Space Toad d2cf70f8d5 fixed mapping 2011-11-15 18:46:42 +00:00
Eloraam f1a6f45353 New block destruction hook. Deprecated IOverrideReplace. 2011-10-31 20:07:31 +00:00
Eloraam 8acaaa0e53 Updated MCP mapping, backed out a useless patch. 2011-10-31 19:24:45 +00:00
Eloraam 384da1b222 Added some IC2 items. 2011-10-27 02:05:43 +00:00
Eloraam 2be3e5845a Changed a field permission for MFR. 2011-10-26 04:42:37 +00:00
Eloraam 600b2b86a6 Small TileEntity fix. 2011-10-25 19:28:47 +00:00
Eloraam 6fb7b777ce Added a few more known ingots. 2011-10-25 17:15:12 +00:00
Eloraam 28345bf839 Bugfix for numeric range of mob and window IDs. 2011-10-22 11:53:00 +00:00
Eloraam 56f612c186 Fixed TileEntity caching. 2011-10-21 21:00:44 +00:00
Eloraam 80882bec9c Patch for a small activation glitch in doors. 2011-10-19 02:45:51 +00:00
Eloraam f1f672b5fd MCP update.
Fixed a problem with TileEntity sending.
2011-10-19 02:00:50 +00:00
Eloraam bf5e706f06 Rolled in a critical MLMP fix, because MLMP is virtually unmaintained. 2011-10-18 19:11:57 +00:00
Eloraam c12b2c5b11 Added ore dictionary. 2011-10-18 18:56:10 +00:00
Eloraam a64a47b24c Fix for new MCP mappings.
Fixed the distribution of flowers with bonemeal.
Fixed accidentally making obsidian easy to mine.
2011-10-13 07:10:43 +00:00
LexManos 8a7c087e34 Fixed line endings in install.sh 2011-10-11 22:38:39 +00:00
LexManos 756c3ce812 Updated the package.sh script to include the patches, the new install.sh, and modLoaderMP/mlprop.patch 2011-10-11 22:23:39 +00:00
LexManos b8a84f2c29 Changed the windows setup to use del instead of remove.
Both update patches scripts no longer remove svn entries.
Added the forge_client\bin and forge_server\bin folders to the svn ignore.
2011-10-10 23:47:30 +00:00
Space Toad ebc09a72db bumbed forge minor version 2011-10-10 19:21:41 +00:00
Space Toad 579f4de295 reactivated special armor code 2011-10-10 19:16:11 +00:00
LexManos 9f56b1cc03 Made the windows setup script a bit more robust, also made both scripts filter out non-patch files. {Issue with svn files} 2011-10-10 00:09:48 +00:00
LexManos 141805d5bb Fixed a bug in forge_client project that had a hard link to E:/MCP/jars/bin/paul.jar now points to MCP/jars/bin/minecraft.jar {has the same paulsound libraries}
Major refactoring of the patches, now each modified file gets its own patch file.
Rewrote all the scripts to use new multi-patch system.
Added linux install.sh using new system.
Added some required libraries from GNUWin32 for the windows side of the new setup.bat/update_patches.bat http://gnuwin32.sourceforge.net/
2011-10-09 04:21:29 +00:00
Eloraam d00a837635 Changed a field permission. 2011-10-05 22:54:20 +00:00
Eloraam da695e774f Fixed another TileEntity bug. 2011-10-04 21:46:00 +00:00
Space Toad b3d605cd9d ISidedInventory is now explicitely an inventory 2011-10-02 19:14:20 +00:00
Eloraam 56438eb585 Fixed the MCP mappings. 2011-10-02 18:42:15 +00:00
Eloraam b763c73b74 - Added an ItemStack parameter to IArmorTextureProvider
- Added ISidedInventory
- Added IBonemealHandler
- Added hooks in grow-on-grass and in break tall grass.
- Fixed furnace output of multiple items.
- Added getBlockDropped().
- Bumped version number to 1.1.1.
2011-10-02 08:55:31 +00:00
Eloraam ff7055fdb2 Hopefully fixed the major TileEntity bugs. 2011-09-30 12:32:27 +00:00
Eloraam 07dfc35e0e Fixed TileEntities, bumped version number. 2011-09-28 23:35:31 +00:00
Eloraam d290970b49 Fixed digging particles. 2011-09-26 19:37:28 +00:00
Eloraam 47749d454a Added a fix for onItemUse regression. 2011-09-22 10:12:05 +00:00
Eloraam ed7c343647 More MCP mapping fixes. 2011-09-22 03:01:10 +00:00
Eloraam a386d0a8dc Undid that. Whoops. 2011-09-22 02:49:33 +00:00
Eloraam 1a8d32f7de Code to remove a single block effectiveness. 2011-09-22 02:45:47 +00:00
Eloraam 7a242e9562 Metadata-sensitive quantity dropped. 2011-09-21 08:08:58 +00:00
Eloraam afdbc4064b Fixed up a few bugs in the tool path. 2011-09-21 07:14:53 +00:00
Eloraam 0392ecd8da Fixed another bug in the furnace patch. Works now. 2011-09-21 01:05:44 +00:00
Eloraam cab70ce17a Small bugfix for furnace patch. 2011-09-21 00:59:37 +00:00
Eloraam 9fa40cb432 Metadata-sensitive smelting patch. 2011-09-21 00:55:09 +00:00
Eloraam c9b6cdef1f Fixes for MCP updates. 2011-09-19 20:40:07 +00:00
Eloraam 5ecff4e5a1 Fixed the 1.8.1 version for MLMP support. 2011-09-19 20:30:34 +00:00
Eloraam 115de819b3 A bunch of little patches to make it actually build for 1.8.1. 2011-09-19 01:44:40 +00:00
Eloraam bb6751cc59 First attempt at a 1.8.1 version. May not work. 2011-09-19 01:30:41 +00:00
Eloraam 0a874de91d Unrolled a mistaken fix. 2011-09-11 04:46:16 +00:00
Eloraam 3b61068a3c Another try for osx. 2011-09-11 04:05:39 +00:00
Eloraam cfe5a542fc A small fix to hopefully make the script work on a mac. 2011-09-11 03:49:01 +00:00
Eloraam 4f4a75d865 Redesigned TileEntity handling. 2011-09-08 21:33:03 +00:00
Space Toad 5c74f5efb9 fixed SMP bug related to BuildCraft issue #226 2011-09-07 19:57:53 +00:00
Eloraam 878cac2697 A few small patches to fix obscure piston rendering bugs. 2011-09-07 15:14:01 +00:00
Eloraam 8b5440b351 Optifine compatibility patch. 2011-09-07 14:58:08 +00:00
Space Toad 71c77d9e9a updated to latest MCP, and added custom item rendering facilities 2011-09-03 11:46:59 +00:00
Eloraam 8ced84d8d3 Improved trapdoor hook. 2011-09-01 08:01:47 +00:00
Eloraam 3e09d92cd4 New lighting hook. 2011-08-30 10:32:14 +00:00
Eloraam 17132962c9 Fixed new MCP mappings. 2011-08-30 06:18:32 +00:00
Space Toad e7ca40009e bumped forge version # to 1.0.6 2011-08-28 12:54:47 +00:00
Space Toad 62e7bdf805 added ArmorProperties constructors, remove deprecated subprograms (supposedly not used by anyone) 2011-08-28 12:33:16 +00:00
Space Toad 705e5e62a0 fixed headers, implemented new armor computation for IC2 2011-08-27 11:42:48 +00:00
Eloraam a6ed5709ef Fixed the permissions on a couple fields in ItemTool. 2011-08-27 05:49:09 +00:00
Space Toad aead41197f temporary reverted to r61 2011-08-27 01:12:20 +00:00
Space Toad e9cd63abf7 updated credits 2011-08-25 19:47:34 +00:00
Eloraam d2878faa33 Patched the installer again. 2011-08-25 17:15:02 +00:00
Eloraam 1c11f0eeb0 Fixed a typo. 2011-08-25 07:19:49 +00:00
Eloraam 33bd0947e3 Small RedPower-specific patch. 2011-08-25 07:17:10 +00:00
Eloraam 0457d8057f Added armor texture hook. 2011-08-25 00:23:31 +00:00
Eloraam b0efd106bd New install script for Windows. 2011-08-24 04:18:57 +00:00
Eloraam 9d22e76927 Fixed the version number. 2011-08-21 07:50:09 +00:00
Eloraam 6ac2161f36 Changed some field permissions. 2011-08-20 22:23:29 +00:00
Eloraam 4cdb1cb3d0 Handler for custom block highlight. 2011-08-20 10:35:14 +00:00
Eloraam 651af86795 Version control logic, improved the destroy handling hook. 2011-08-20 08:59:05 +00:00
Eloraam 622f536f80 Improved BTW compatibility.
Finished the placement hook changes.
Added a sleep handler.
Added a current item destroyed handler.
2011-08-18 00:14:09 +00:00
Eloraam 231c65da06 Checking in the new crafting hook. 2011-08-17 16:05:38 +00:00
Eloraam 72864e4bc2 Added a little support for two-pass rendering. 2011-08-17 10:23:10 +00:00
Eloraam 1d19069203 Forgot the forge hooks. 2011-08-13 18:26:31 +00:00
Eloraam 12b64fa287 Updates:
- Added warning message for non-preloaded textures.
- Documentation
- Ladder fix for SMP.
- Obsoleted IBlockSecondaryProperties
- Added hooks for place-by-side.
- Fixed texture 3 and piston texture bug.
- Added new tool system.
2011-08-12 23:53:30 +00:00
FlowerChild fb5f9373c5 Added patches for decompiled by fernflower source. Client only, and not tested enough. Using is currently not recommended. 2011-08-12 13:52:53 +00:00
Eloraam 08b0913f04 Uploaded new install file. 2011-08-12 04:17:33 +00:00
Eloraam 8d9e0879d8 Fixed for the new version of MCP. 2011-08-11 21:10:52 +00:00
Eloraam adf31e33fd Uploaded install fix. 2011-08-08 19:50:09 +00:00
Eloraam 61b8107ba4 The ladder hook. 2011-08-08 16:55:50 +00:00
Eloraam cfda01b9ff Fixed a typo in isBoundingBoxBurning. 2011-08-07 21:37:05 +00:00
Space Toad 4c259ce5d5 updated list of contributers 2011-08-06 21:54:56 +00:00
Space Toad 53dd73f2a5 updated release and package script to take into account credit file 2011-08-06 21:23:38 +00:00
Space Toad 691b87e876 renamed file 2011-08-06 21:18:31 +00:00
Space Toad b813f609a6 initial revision of the credit file, to be completed 2011-08-06 21:16:53 +00:00
1014 changed files with 111306 additions and 2518 deletions

No files matched your search

+14
View File
@@ -0,0 +1,14 @@
* text eol=lf
*.bat text eol=crlf
*.patch text eol=lf
*.java text eol=lf
*.gradle text eol=crlf
*.png binary
*.exe binary
*.dll binary
*.jar binary
*.lzma binary
*.zip binary
*.pyd binary
*.cfg text eol=lf
*.py text eol=lf
+31
View File
@@ -0,0 +1,31 @@
#eclipse
/bin
/.settings
/.classpath
#In case people make their workspace in the repo
/eclipse/
#idea
/.idea
*.iml
#gradle
/build
/.gradle
#occupational hazards
/projects/
/repo/
/buildSrc
#Patch rejects
*.rej
/patches-/
# FML changelog
changelog.txt
/patches_old/
/patches_old_bak/
*.py
*.7z
+10
View File
@@ -0,0 +1,10 @@
Contributing to Forge
=====================
1) Keep patches to Minecraft classes minimal. If you need a lot of things done, you may either add to relevant forge classes or make a new class.
2) An example mod must be provided for all PRs adding events/hooks to Forge. Whether it's a full mod using your proposed hooks, or just a pastebin containing a simple example, an example mod is required. Please also explain in detail what your new hook does.
3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
+28
View File
@@ -0,0 +1,28 @@
This is Forge Mod Loader.
You can find the source code at all times at https://github.com/MinecraftForge/FML
This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
and minecraft clients.
The code is authored by cpw.
It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
http://www.minecraftforum.net/topic/75440-
This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
http://www.minecraftforge.net/
Additionally, it contains an implementation of topological sort based on that
published at http://keithschwarz.com/interesting/code/?dir=topological-sort
It also contains code from the Maven project for performing versioned dependency
resolution. http://maven.apache.org/
It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
with credit to it's authors.
Forge Mod Loader downloads components from the Minecraft Coder Pack
(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+491
View File
@@ -0,0 +1,491 @@
This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
is licensed under the GNU LGPL v2.1 or later.
Homepage: https://github.com/MinecraftForge/FML
This software includes portions from the Apache Maven project at
http://maven.apache.org/ specifically the ComparableVersion.java code. It is
included based on guidelines at
http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
with notices intact. The only change is a non-functional change of package name.
This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
authored by genman, heikok, pivot.
The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
=== MCP Data ===
This software includes data from the Minecraft Coder Pack (MCP), with kind permission
from them. The license to MCP data is not transitive - distribution of this data by
third parties requires independent licensing from the MCP team. This data is not
redistributable without permission from the MCP team.
=== Sharing ===
I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
-- Runtime patcher --
License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under
any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-- ASM transformers --
License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories)
under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
========
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
+26
View File
@@ -0,0 +1,26 @@
* Eloraam *
* FlowerChild *
* Hawkye *
* MALfunction84 *
Submitted the sleep handler code for his mod (Somnia) and others to use.
* Scokeev9 *
Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
* SpaceToad *
* LexManos *
* cpw *
* Minecraft Coder Pack (MCP) *
Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files.
This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or
remove the MCP data files and request their users to download MCP separately.
+70 -65
View File
@@ -1,65 +1,70 @@
Minecraft Forge Public Licence
==============================
Version 1.0
0. Definitions
--------------
Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
User: Anybody that interract with the software in one of the following ways:
- play
- decompile
- recompile or compile
- modify
Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
obtained in a standalone fashion or as part of a wider distribution.
Dependency: Code required to have Minecraft Forge working properly. That can
include dependencies required to compile the code as well as modifications in
the Minecraft sources that are required to have Minecraft Forge working.
1. Scope
--------
The present license is granted to any user of Minecraft Forge. As a
prerequisite, a user of Minecraft Forge must own a legally aquired copy of
Minecraft
2. Play rights
--------------
The user of Minecraft Forge is allowed to install the software on a client or
a server and to play it without restriction.
3. Modification rights
----------------------
The user has the right to decompile the source code, look at either the
decompiled version or the original source code, and to modify it.
4. Derivation rights
--------------------
The user has the rights to derive code from Minecraft Forge, that is to say to
write code that either extends Minecraft Forge class and interfaces,
instantiate the objects declared or calls the functions. This code is known as
"derived" code, and can be licensed with conditions different from Minecraft
Forge.
5. Distribution rights
----------------------
The user of Minecraft Forge is allowed to redistribute Minecraft Forge in
partially, in totallity, or included in a distribution. When distributing
binaries or class files, the user must provide means to obtain the sources of
the distributed version of Minecraft Forge at no costs. This includes the
files as well as any dependency that the code may rely on, including patches to
minecraft original sources.
Modification of Minecraft Forge as well as dependencies, including patches to
minecraft original sources, has to remain under the terms of the present
license.
Minecraft Forge Public Licence
==============================
Version 1.0
0. Definitions
--------------
Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
User: Anybody that interract with the software in one of the following ways:
- play
- decompile
- recompile or compile
- modify
Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
obtained in a standalone fashion or as part of a wider distribution.
Dependency: Code required to have Minecraft Forge working properly. That can
include dependencies required to compile the code as well as modifications in
the Minecraft sources that are required to have Minecraft Forge working.
1. Scope
--------
The present license is granted to any user of Minecraft Forge, for all files included
unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft
Forge must own a legally aquired copy of Minecraft.
2. Play rights
--------------
The user of Minecraft Forge is allowed to install the software on a client or
a server and to play it without restriction.
3. Modification rights
----------------------
The user has the right to decompile the source code, look at either the
decompiled version or the original source code, and to modify it.
4. Derivation rights
--------------------
The user has the rights to derive code from Minecraft Forge, that is to say to
write code that either extends Minecraft Forge class and interfaces,
instantiate the objects declared or calls the functions. This code is known as
"derived" code, and can be licensed with conditions different from Minecraft
Forge.
5. Distribution rights
----------------------
The user of Minecraft Forge is allowed to redistribute Minecraft Forge in
partially, in totallity, or included in a distribution. When distributing
binaries or class files, the user must provide means to obtain the sources of
the distributed version of Minecraft Forge at no costs. This includes the
files as well as any dependency that the code may rely on, including patches to
minecraft original sources.
Modification of Minecraft Forge as well as dependencies, including patches to
minecraft original sources, has to remain under the terms of the present
license.
The right to distribute Minecraft Forge does not extend to the right to distribute
MCP data files included within Minecraft Forge. These are the property of the MCP
project and should be removed from any customized distribution of Minecraft Forge
or permission sought separately from the MCP team.
+10
View File
@@ -0,0 +1,10 @@
IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -0,0 +1,40 @@
SoundSystem CodecIBXM Class License:
You are free to use this class for any purpose, commercial or otherwise.
You may modify this class or source code, and distribute it any way you
like, provided the following conditions are met:
1) You may not falsely claim to be the author of this class or any
unmodified portion of it.
2) You may not copyright this class or a modified version of it and then
sue me for copyright infringement.
3) If you modify the source code, you must clearly document the changes
made before redistributing the modified source code, so other users know
it is not the original code.
4) You are not required to give me credit for this class in any derived
work, but if you do, you must also mention my website:
http://www.paulscode.com
5) I the author will not be responsible for any damages (physical,
financial, or otherwise) caused by the use if this class or any
portion of it.
6) I the author do not guarantee, warrant, or make any representations,
either expressed or implied, regarding the use of this class or any
portion of it.
Author: Paul Lamb
http://www.paulscode.com
This software is based on or using the IBXM library available from
http://www.geocities.com/sunet2000/
IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+36
View File
@@ -0,0 +1,36 @@
*** HOW TO INSTALL ***
For Mod Users:
Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
For Mod Devs:
Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
If you have Gradle: gradle setupDevWorkspace
If you DO NOT have Gradle installed:
Windows: ./gradlew.bat setupDevWorkspace
MacOS/Linux: ./gradlew setupDevWorkspace
If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
To get the decompiled classes:
If you have Gradle: gradle setupDecompWorkspace
If you DO NOT have Gradle installed:
Windows: ./gradlew.bat setupDecompWorkspace
MacOS/Linux: ./gradlew setupDecompWorkspace
For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
Clone this repository to a folder.
Open a command prompt and navigate to the folder where you cloned this repo.
Run gradle setupForge to setup your development environment.
To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
Requirements (for both mod devs and contributors):
You must have a JDK installed and accessible.
If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
+374
View File
@@ -0,0 +1,374 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
}
}
repositories {
maven {
name = "local"
url = "file:///home/cpw/projects/repo"
}
}
apply plugin: "maven"
apply plugin: "net.minecraftforge.gradle.patcher"
apply plugin: "net.minecraftforge.gradle.launch4j"
minecraft {
version = "1.8.8"
//mappings = 'stable_16'
mappings = "snapshot_nodoc_20151122"
workspaceDir = "projects"
versionJson = "jsons/1.8.8-dev.json"
buildUserdev = true
buildInstaller = true
installerVersion = "1.4"
def common = {
patchPrefixOriginal "../src-base/minecraft"
patchPrefixChanged "../src-work/minecraft"
mainClassClient "net.minecraft.launchwrapper.Launch"
tweakClassClient "net.minecraftforge.fml.common.launcher.FMLTweaker"
mainClassServer "net.minecraft.launchwrapper.Launch"
tweakClassServer "net.minecraftforge.fml.common.launcher.FMLServerTweaker"
}
projects {
forge {
rootDir "."
patchDir "patches/minecraft"
patchAfter "clean"
genPatchesFrom "clean"
genMcpPatches = false
applyMcpPatches = false
with common
}
}
}
group = 'net.minecraftforge'
version = getVersionFromJava(file("src/main/java/net/minecraftforge/common/ForgeVersion.java"))
extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" }
genGradleProjects { addTestCompileDep "junit:junit:4.12" }
processJson {
releaseJson = "jsons/1.8.8-rel.json"
addReplacements([
"@minecraft_version@": project.minecraft.version,
"@version@": project.version,
"@project@": "forge",
"@artifact@": "net.minecraftforge:forge:${project.version}",
"@universal_jar@": { outputJar.archiveName },
"@timestamp@": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
])
}
task changelog(type: JenkinsChangelog) {
// skip if there is no forge jenkins pass
onlyIf {
project.hasProperty('forgeJenkinsPass')
// Not sure what abrar was trying to do here...
//project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
}
outputs.upToDateWhen { false } // never up to date
serverRoot = "http://ci.jenkins.minecraftforge.net/"
jobName = "minecraftforge"
targetBuild = System.env['BUILD_NUMBER'] ?: 0;
authName = "console_script"
authPassword = project.hasProperty('forgeJenkinsPass') ? project.getProperty('forgeJenkinsPass') : "";
output = "build/distributions/${project.name}-${project.version}-changelog.txt"
}
task crowdin(type: CrowdinDownload) {
output = "build/crowdin.zip"
projectId = 'minecraft-forge'
extract = false // we wanna keep it as a zip. not extract it to a folder named "crowdin.zip"
// task auomatically skips if this is null
if (project.hasProperty('crowdinKey'))
apiKey = project.crowdinKey
}
def extraTxts = [
changelog, // yeah we can do thi, because gradle and groovy are awesome
"LICENSE-fml.txt",
"CREDITS-fml.txt",
"MinecraftForge-Credits.txt",
"MinecraftForge-License.txt",
"Paulscode SoundSystem CodecIBXM License.txt",
"Paulscode IBXM Library License.txt"
]
outputJar {
classifier = 'universal'
from extraTxts
// add crowdin locales
from { crowdin.getDidWork() ? zipTree(crowdin.output) : null}
dependsOn 'crowdin'
manifest.attributes([
"Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper",
"TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker",
"Class-Path": getServerClasspath(file("jsons/${minecraft.version}-rel.json"))
])
}
installer {
classifier = 'installer'
from extraTxts
from "src/main/resources/forge_logo.png"
rename "forge_logo\\.png", "big_logo.png"
}
task signUniversal(type: SignJar, dependsOn: 'outputJar') {
onlyIf {
project.hasProperty('jarsigner')
}
def jarsigner = [:];
if (project.hasProperty('jarsigner'))
jarsigner = project.jarsigner;
alias = 'forge'
exclude "paulscode/**"
storePass = jarsigner.storepass
keyPass = jarsigner.keypass
keyStore = jarsigner.keystore
inputFile = outputJar.archivePath
outputFile = outputJar.archivePath
}
uploadArchives.dependsOn signUniversal
build.dependsOn signUniversal
// MDK package
import org.apache.tools.ant.filters.ReplaceTokens
task makeMdk(type: Zip) {
baseName = project.name
classifier = "mdk"
version = project.version
destinationDir = file('build/distributions')
from 'gradlew'
from 'gradlew.bat'
into ('gradle') {
from 'gradle'
}
into ('eclipse') {
from 'mdk/eclipse'
}
from changelog.output
from ('mdk') {
filter(ReplaceTokens, tokens: [
VERSION: project.version,
MAPPINGS: minecraft.mappings.replace('nodoc_', '')
])
exclude 'eclipse'
rename 'gitignore\\.txt', '.gitignore'
from 'MinecraftForge-Credits.txt'
from 'MinecraftForge-License.txt'
from 'Paulscode IBXM Library License.txt'
from 'Paulscode SoundSystem CodecIBXM License.txt'
from 'CREDITS-fml.txt'
from 'LICENSE-fml.txt'
}
}
tasks.build.dependsOn makeMdk
// launch4j
launch4j {
jar = installer.archivePath.canonicalPath
outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath
icon = file('icon.ico').canonicalPath
manifest = file('l4jManifest.xml').canonicalPath
jreMinVersion = '1.6.0'
initialHeapPercent = 5;
maxHeapPercent = 100;
}
tasks.generateXmlConfig.dependsOn installer
tasks.build.dependsOn 'launch4j'
// MAVEN
artifacts {
archives changelog.output
archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
archives makeMdk
}
task ciWriteBuildNumber << {
def file = file("src/main/java/net/minecraftforge/common/ForgeVersion.java");
def bn = System.getenv("BUILD_NUMBER")?:0;
def outfile = "";
def ln = System.getProperty('line.separator')
file.eachLine{ String s ->
if (s.contains("buildVersion") && s.contains("= 0;")) {
s = " public static final int buildVersion = ${bn};";
}
outfile += (s+ln);
}
file.write(outfile);
}
uploadArchives {
repositories.mavenDeployer {
dependsOn 'build'
if (project.hasProperty('forgeMavenPass'))
{
repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) // the elvis operator. look it up.
}
}
else
{
// local repo folder. Might wanna juset use gradle install if you wanans end it to maven-local
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
}
pom {
groupId = project.group
version = project.version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'Minecraft Forge API'
url 'https://github.com/MinecraftForge/MinecraftForge'
scm {
url 'https://github.com/MinecraftForge/MinecraftForge'
connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git'
developerConnection 'scm:git:[email protected]:MinecraftForge/MinecraftForge.git'
}
issueManagement {
system 'github'
url 'https://github.com/MinecraftForge/MinecraftForge/issues'
}
licenses {
license {
name 'Forge Public License'
url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
distribution 'repo'
}
}
developers {
developer {
id 'cpw'
name 'cpw'
roles { role 'developer' }
}
developer {
id 'LexManos'
name 'Lex Manos'
roles { role 'developer' }
}
developer {
id 'AbrarSyed'
name 'Abrar Syed'
roles { role 'contributor' }
}
}
}
}
}
}
// HELPER METHODS
import groovy.json.JsonSlurper;
String getServerClasspath(File file)
{
def node = new JsonSlurper().parse(file);
def out = new StringBuilder()
node.versionInfo.libraries.each { lib ->
if (lib.serverreq)
{
// group : artifact : version
def split = lib.name.split(':')
def group = split[0].replace('.', '/')
def artifact = split[1]
def version = split[2]
out += "libraries/$group/$artifact/$version/$artifact-${version}.jar "
}
}
out += "minecraft_server.${minecraft.version}.jar"
return out.toString();
}
String getVersionFromJava(File file)
{
String major = "0";
String minor = "0";
String revision = "0";
String build = "0";
String prefix = "public static final int";
file.eachLine{ String s ->
s = s.trim();
if (s.startsWith(prefix))
{
s = s.substring(prefix.length(), s.length() - 1);
s = s.replace('=', ' ').replace("Version", "").replaceAll(" +", " ").trim();
String[] pts = s.split(" ");
if (pts[0].equals("major")) major = pts[pts.length - 1];
else if (pts[0] == "minor") minor = pts[pts.length - 1];
else if (pts[0] == "revision") revision = pts[pts.length - 1];
}
}
if (System.getenv().containsKey("BUILD_NUMBER"))
{
build = System.getenv("BUILD_NUMBER");
}
String branch = null;
if (!System.getenv().containsKey("GIT_BRANCH"))
{
// TODO: use grgit
branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim()
}
else
{
branch = System.getenv("GIT_BRANCH");
branch = branch.substring(branch.lastIndexOf('/') + 1);
}
def out = "${minecraft.version.replace('-', '_')}-$major.$minor.$revision.$build"
if (branch && branch != 'master' && branch != 'HEAD')
out += "-$branch"
return out;
}
// re-add old tasks for jenkins compat
// should be remvoed, and the jenkisn fixed when no longer building with FG 1.2
task setupForge { dependsOn 'setup' }
task buildPackages { dependsOn 'build' }
-11
View File
@@ -1,11 +0,0 @@
cd ..
rmdir /S /Q src
mkdir src
xcopy /Y /E src_work\* src\
xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
xcopy /Y /E forge\forge_common\net\* src\minecraft\net
xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
cmd /C recompile.bat
-17
View File
@@ -1,17 +0,0 @@
#!/bin/bash
cd ..
rm -rf src bin src_forge
cp -a src_work src_forge
cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
cp -a forge/forge_common/net/* src_forge/minecraft/net/
cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
cp -a src_forge src
./recompile.sh
-1
View File
@@ -1 +0,0 @@
forge_client/src/net/minecraft/src/forge/
-1
View File
@@ -1 +0,0 @@
forge_common/net/minecraft/src/forge
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="forge_common"/>
<classpathentry kind="src" path="minecraft"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="../../jars/bin/jinput.jar"/>
<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar"/>
<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar"/>
<classpathentry kind="lib" path="../../jars/bin/minecraft.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
-29
View File
@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge_client</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>forge_common</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
</link>
<link>
<name>minecraft</name>
<type>2</type>
<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft</locationURI>
</link>
</linkedResources>
</projectDescription>
@@ -1,13 +0,0 @@
package net.minecraft.src.forge;
import java.util.ArrayList;
import java.util.List;
public class BlockTextureParticles {
public String texture;
public List effects;
public BlockTextureParticles(){
effects = new ArrayList();
}
}
@@ -1,131 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.ModLoader;
import net.minecraft.src.RenderBlocks;
import net.minecraft.src.Tessellator;
import org.lwjgl.opengl.GL11;
import java.util.*;
public class ForgeHooksClient {
public static boolean canRenderInPass(Block block, int pass) {
if(block instanceof IMultipassRender) {
IMultipassRender impr = (IMultipassRender) block;
return impr.canRenderInPass(pass);
}
if(pass==block.getRenderBlockPass()) return true;
return false;
}
static HashMap tessellators=new HashMap();
static HashMap textures=new HashMap();
static boolean inWorld=false;
static HashSet renderTextureTest=new HashSet();
static ArrayList<List> renderTextureList=new ArrayList();
protected static void bindTessellator(int tex, int sub) {
List key=Arrays.asList(tex,sub);
Tessellator t;
if(!tessellators.containsKey(key)) {
t=new Tessellator();
tessellators.put(key,t);
} else {
t=(Tessellator)tessellators.get(key);
}
if(inWorld && !renderTextureTest.contains(key)) {
renderTextureTest.add(key);
renderTextureList.add(key);
t.startDrawingQuads();
t.setTranslationD(Tessellator.firstInstance.xOffset,
Tessellator.firstInstance.yOffset,
Tessellator.firstInstance.zOffset);
}
Tessellator.instance=t;
}
protected static void bindTexture(String name, int sub) {
int n;
if(!textures.containsKey(name)) {
n=ModLoader.getMinecraftInstance().renderEngine
.getTexture(name);
textures.put(name,n);
} else {
n=(Integer)textures.get(name);
}
if(!inWorld) {
Tessellator.instance=Tessellator.firstInstance;
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
return;
}
bindTessellator(n,sub);
}
protected static void unbindTexture() {
Tessellator.instance=Tessellator.firstInstance;
if(!inWorld) {
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
.getMinecraftInstance().renderEngine
.getTexture("/terrain.png"));
return;
}
}
public static void beforeRenderPass(int pass) {
Tessellator.instance=Tessellator.firstInstance;
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
.getMinecraftInstance().renderEngine
.getTexture("/terrain.png"));
renderTextureTest.clear();
renderTextureList.clear();
inWorld=true;
}
public static void afterRenderPass(int pass) {
inWorld=false;
for(List l : renderTextureList) {
// TODO: call appropriate client hooks
Integer[] tn=(Integer[])l.toArray();
GL11.glBindTexture(GL11.GL_TEXTURE_2D,tn[0]);
Tessellator t=(Tessellator)tessellators.get(l);
t.draw();
}
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
.getMinecraftInstance().renderEngine
.getTexture("/terrain.png"));
Tessellator.instance=Tessellator.firstInstance;
}
public static void beforeBlockRender(Block block,
RenderBlocks renderblocks) {
if (block instanceof ITextureProvider
&& renderblocks.overrideBlockTexture == -1) {
ITextureProvider itp=(ITextureProvider)block;
bindTexture(itp.getTextureFile(),0);
}
}
public static void afterBlockRender(Block block,
RenderBlocks renderblocks) {
if (block instanceof ITextureProvider
&& renderblocks.overrideBlockTexture == -1) {
Tessellator.instance=Tessellator.firstInstance;
}
}
public static void overrideTexture (Object o) {
if (o instanceof ITextureProvider) {
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
.getMinecraftInstance().renderEngine
.getTexture(((ITextureProvider) (o))
.getTextureFile()));
}
}
}
@@ -1,31 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.ModLoader;
import net.minecraft.src.RenderBlocks;
import net.minecraft.src.Tessellator;
import org.lwjgl.opengl.GL11;
public class MinecraftForgeClient {
public static void bindTexture(String name, int sub) {
ForgeHooksClient.bindTexture(name,sub);
}
public static void bindTexture(String name) {
ForgeHooksClient.bindTexture(name,0);
}
public static void unbindTexture() {
ForgeHooksClient.unbindTexture();
}
public static void preloadTexture(String texture) {
ModLoader.getMinecraftInstance().renderEngine
.getTexture(texture);
}
}
@@ -1,313 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.text.DateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.TreeMap;
import net.minecraft.src.Block;
/**
* This class offers advanced configurations capabilities, allowing to provide
* various categories for configuration variables.
*/
public class Configuration {
private boolean configBlocks[] = null;
public static final int GENERAL_PROPERTY = 0;
public static final int BLOCK_PROPERTY = 1;
public static final int ITEM_PROPERTY = 2;
File file;
public TreeMap<String, Property> blockProperties = new TreeMap<String, Property>();
public TreeMap<String, Property> itemProperties = new TreeMap<String, Property>();
public TreeMap<String, Property> generalProperties = new TreeMap<String, Property>();
/**
* Create a configuration file for the file given in parameter.
*/
public Configuration(File file) {
this.file = file;
}
/**
* Gets or create a block id property. If the block id property key is
* already in the configuration, then it will be used. Otherwise,
* defaultId will be used, except if already taken, in which case this
* will try to determine a free default id.
*/
public Property getOrCreateBlockIdProperty(String key, int defaultId) {
if (configBlocks == null) {
configBlocks = new boolean[Block.blocksList.length];
for (int i = 0; i < configBlocks.length; ++i) {
configBlocks[i] = false;
}
}
if (blockProperties.containsKey(key)) {
Property property = getOrCreateIntProperty(key,
Configuration.BLOCK_PROPERTY, defaultId);
configBlocks[Integer.parseInt(property.value)] = true;
return property;
} else {
Property property = new Property();
blockProperties.put(key, property);
property.name = key;
if (Block.blocksList[defaultId] == null
&& !configBlocks[defaultId]) {
property.value = Integer.toString(defaultId);
configBlocks[defaultId] = true;
return property;
} else {
for (int j = Block.blocksList.length - 1; j >= 0; --j) {
if (Block.blocksList[j] == null && !configBlocks[j]) {
property.value = Integer.toString(j);
configBlocks[j] = true;
return property;
}
}
throw new RuntimeException("No more block ids available for "
+ key);
}
}
}
public Property getOrCreateIntProperty(String key, int kind,
int defaultValue) {
Property prop = getOrCreateProperty(key, kind,
Integer.toString(defaultValue));
try {
Integer.parseInt(prop.value);
return prop;
} catch (NumberFormatException e) {
prop.value = Integer.toString(defaultValue);
return prop;
}
}
public Property getOrCreateBooleanProperty(String key, int kind,
boolean defaultValue) {
Property prop = getOrCreateProperty(key, kind,
Boolean.toString(defaultValue));
if ("true".equals(prop.value.toLowerCase())
|| "false".equals(prop.value.toLowerCase())) {
return prop;
} else {
prop.value = Boolean.toString(defaultValue);
return prop;
}
}
public Property getOrCreateProperty(String key, int kind,
String defaultValue) {
TreeMap<String, Property> source = null;
switch (kind) {
case GENERAL_PROPERTY:
source = generalProperties;
break;
case BLOCK_PROPERTY:
source = blockProperties;
break;
case ITEM_PROPERTY:
source = itemProperties;
break;
}
if (source.containsKey(key)) {
return source.get(key);
} else if (defaultValue != null) {
Property property = new Property();
source.put(key, property);
property.name = key;
property.value = defaultValue;
return property;
} else {
return null;
}
}
public void load() {
try {
if (file.getParentFile() != null) {
file.getParentFile().mkdirs();
}
if (!file.exists() && !file.createNewFile()) {
return;
}
if (file.canRead()) {
FileInputStream fileinputstream = new FileInputStream(file);
BufferedReader buffer = new BufferedReader(
new InputStreamReader(fileinputstream, "8859_1"));
String line;
TreeMap<String, Property> currentMap = null;
while (true) {
line = buffer.readLine();
if (line == null) {
break;
}
int nameStart = -1, nameEnd = -1;
boolean skip = false;
for (int i = 0; i < line.length() && !skip; ++i) {
if (Character.isLetterOrDigit(line.charAt(i))
|| line.charAt(i) == '.') {
if (nameStart == -1) {
nameStart = i;
}
nameEnd = i;
} else if (Character.isWhitespace(line.charAt(i))) {
// ignore space charaters
} else {
switch (line.charAt(i)) {
case '#':
skip = true;
continue;
case '{':
String scopeName = line.substring(nameStart,
nameEnd + 1);
if (scopeName.equals("general")) {
currentMap = generalProperties;
} else if (scopeName.equals("block")) {
currentMap = blockProperties;
} else if (scopeName.equals("item")) {
currentMap = itemProperties;
} else {
throw new RuntimeException(
"unknown section " + scopeName);
}
break;
case '}':
currentMap = null;
break;
case '=':
String propertyName = line.substring(nameStart,
nameEnd + 1);
if (currentMap == null) {
throw new RuntimeException("property "
+ propertyName + " has no scope");
}
Property prop = new Property();
prop.name = propertyName;
prop.value = line.substring(i + 1);
i = line.length();
currentMap.put(propertyName, prop);
break;
default:
throw new RuntimeException("unknown character "
+ line.charAt(i));
}
}
}
}
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
public void save() {
try {
if (file.getParentFile() != null) {
file.getParentFile().mkdirs();
}
if (!file.exists() && !file.createNewFile()) {
return;
}
if (file.canWrite()) {
FileOutputStream fileoutputstream = new FileOutputStream(file);
BufferedWriter buffer = new BufferedWriter(
new OutputStreamWriter(fileoutputstream, "8859_1"));
buffer.write("# Configuration file\r\n");
buffer.write("# Generated on "
+ DateFormat.getInstance().format(new Date()) + "\r\n");
buffer.write("\r\n");
buffer.write("###########\r\n");
buffer.write("# General #\r\n");
buffer.write("###########\r\n\r\n");
buffer.write("general {\r\n");
writeProperties(buffer, generalProperties.values());
buffer.write("}\r\n\r\n");
buffer.write("#########\r\n");
buffer.write("# Block #\r\n");
buffer.write("#########\r\n\r\n");
buffer.write("block {\r\n");
writeProperties(buffer, blockProperties.values());
buffer.write("}\r\n\r\n");
buffer.write("########\r\n");
buffer.write("# Item #\r\n");
buffer.write("########\r\n\r\n");
buffer.write("item {\r\n");
writeProperties(buffer, itemProperties.values());
buffer.write("}\r\n\r\n");
buffer.close();
fileoutputstream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
private void writeProperties(BufferedWriter buffer,
Collection<Property> props) throws IOException {
for (Property property : props) {
if (property.comment != null) {
buffer.write(" # " + property.comment + "\r\n");
}
buffer.write(" " + property.name + "=" + property.value);
buffer.write("\r\n");
}
}
}
@@ -1,52 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.World;
/**
* This interface provides access to a number of secondary block properties through providing
* overrides to methods within world.class.
*/
public interface IBlockSecondaryProperties
{
/**
* Return true if this block should be treated as a normal cube by game logic
* (this is independant of rendering), false otherwise. This allows for things like secondary
* blocks (torches, rails, redstone dust, etc.) being attached to the surface of
* the block regardless of whether it is opaque, or posesses other rendering properties that
* would not normally make this possible.
*/
public boolean isBlockNormalCube( World world, int i, int j, int k );
/**
* Return true if this block can be replaced by another by the player, false otherwise. This provides
* a means of allowing blocks to not be considered when the player attempts to place another within
* their bounds, in the same way that water, lava, fire, and some other blocks behave within the game.
* Provides an override to the coresponding section in canBlockBePlacedAt() in world.class
*/
public boolean isBlockReplaceable( World world, int i, int j, int k );
/**
* Return true if this block should set fire and deal fire damage to entities coming into contact with
* it, false otherwise. Provides an override to the related test within isBoundingBoxBurning() within
* world.class
*/
public boolean isBlockBurning( World world, int i, int j, int k );
/**
* Return true if this block should be treated as an air block by the rest of the code, false
* otherwise. This method is primarily useful for creating pure logic-blocks that will be invisible
* to the player and otherwise interact as air would.
* Provides an override to isAirBlock() within world.class
*/
public boolean isAirBlock( World world, int i, int j, int k );
}
@@ -1,23 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;
public interface IBucketHandler {
/**
* This is called before Minecraft tries to fill a bucket with water or
* lava. If it returns a non-null result, then the filling process will
* be stopped and the empty bucket will be changed to the result of this
* subprogram.
*
* @see MinecraftForge#registerCustomBucketHander(IBucketHandler)
*/
public ItemStack fillCustomBucket(World w, int i, int j, int k);
}
@@ -1,27 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.IBlockAccess;
/**
* This interface is to be implemented by Block classes. It will override
* standard algorithms controlling connection between two blocks by redstone
*
* @see Block
*/
public interface IConnectRedstone {
/**
* When this returns false, the block at location i, j, k cannot make
* a redstone connection in the direction given in parameter, otherwise
* it can. Use to control which sides are inputs and outputs for redstone
* wires.
*/
public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k,
int dir);
}
@@ -1,23 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.ItemTool;
public interface IHarvestHandler {
/**
* Return true if the tool in parameter is known to be able to harvest
* the given block, false if this handler does not know of any particular
* harvesting. Other rules may activate the harvesting outside of this
* handler. This is typically used to add e.g. blocks only extracted by
* diamond pickaxe
*
* @see MinecraftForge#registerHarvestHandler(IHarvestHandler)
*/
public boolean canHarvestBlock(ItemTool item, Block block);
}
@@ -1,17 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
/** This interface is to be implemented by a Block class. Allows a block
* type to perform rendering in both render passes, in case some parts of the
* block are solid and others are transparent.
*/
public interface IMultipassRender {
/** Returns true when the block has things to render in this render
* pass.
*/
public boolean canRenderInPass(int n);
}
@@ -1,30 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.World;
/**
* This interface is to be implemented by block classes. It will allow a block
* to control how it can be replaced
*
* @see Block
*/
public interface IOverrideReplace {
/**
* Return true if this block has to take control over replacement, for
* the intended replacement given by the parameter bid. If false, then
* the block replacement will be prevented.
*/
public boolean canReplaceBlock(World world, int i, int j, int k, int bid);
/**
* Return the status of the actual replacement.
*/
public boolean getReplacedSuccess();
}
@@ -1,27 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.ItemArmor;
/**
* This interface is to be implemented by ItemArmor classes. It will allow to
* modify computation of damage and health loss. Computation will be called
* before the actual armor computation, which can then be cancelled.
*
* @see ItemArmor
*/
public interface ISpecialArmor {
/**
* This interface will adjust the amount of damage received by the entity.
*/
public int adjustArmorDamage (int damage);
/**
* When this return true, the regular armor computation will be cancelled
*/
public boolean allowRegularComputation ();
}
@@ -1,26 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.Entity;
import net.minecraft.src.World;
/**
* This interface is to be implemented by block classes. It will allow a block
* to control how it resists to explosion
*
* @see Block
*/
public interface ISpecialResistance {
/**
* Return the explosion resistance of the block located at position i, j,
* k, from an exploder explosing on src_x, src_y, src_z.
*/
public float getSpecialExplosionResistance(World world, int i, int j, int k,
double src_x, double src_y, double src_z, Entity exploder);
}
@@ -1,21 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
/**
* This interface has to be implemented either by an instance of Block or Item.
* It allow to use texture files different from terrain.png or items.png.
*/
public interface ITextureProvider {
/**
* This interface has to return the path to a file that is the same size as
* terrain.png, but not named terrain.png. It will be used instead of the
* regular terrain file to render blocks and items.
*/
public String getTextureFile();
}
@@ -1,28 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;
/**
* This interface is to be implemented by item classes. It will allow an item
* to perform a use before the block is activated.
*
* @see Item
*/
public interface IUseItemFirst {
/**
* This is called when the item is used, before the block is activated.
* Stop the computation when return true.
*/
public boolean onItemUseFirst(ItemStack ist,
EntityPlayer player, World world,
int i, int j, int k, int l);
}
@@ -1,75 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
import java.util.LinkedList;
import net.minecraft.src.BiomeGenBase;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.ItemTool;
import net.minecraft.src.World;
public class MinecraftForge {
private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
private static LinkedList<IHarvestHandler> harvestHandlers = new LinkedList<IHarvestHandler>();
/**
* Registers a new custom bucket handler.
*/
public static void registerCustomBucketHander(IBucketHandler handler) {
bucketHandlers.add(handler);
}
/**
* Registers a new harvest handler.
*/
public static void registerHarvestHandler(IHarvestHandler handler) {
harvestHandlers.add(handler);
}
/**
* This is not supposed to be called outside of Minecraft internals.
*/
public static ItemStack fillCustomBucket(World w, int i, int j, int k) {
for (IBucketHandler handler : bucketHandlers) {
ItemStack stack = handler.fillCustomBucket(w, i, j, k);
if (stack != null) {
return stack;
}
}
return null;
}
/**
* This is not supposed to be called outside of Minecraft internals.
*/
public static boolean canHarvestBlock(ItemTool item, Block block) {
for (IHarvestHandler handler : harvestHandlers) {
if (handler.canHarvestBlock(item, block)) {
return true;
}
}
return false;
}
/**
* Add a block to the list of blocks to which the pickaxe is know to be
* effective.
*/
public static void addPickaxeBlockEffectiveAgainst (Block block) {
((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block);
((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block);
((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block);
((ItemTool) Item.pickaxeGold).addBlockEffectiveAgainst(block);
((ItemTool) Item.pickaxeDiamond).addBlockEffectiveAgainst(block);
}
}
@@ -1,12 +0,0 @@
/**
* This software is provided under the terms of the Minecraft Forge Public
* License v1.0.
*/
package net.minecraft.src.forge;
public class Property {
public String name;
public String value;
public String comment;
}
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="forge_common"/>
<classpathentry kind="src" path="minecraft_server"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="../../jars/bin/jinput.jar"/>
<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar"/>
<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar"/>
<classpathentry kind="lib" path="../../jars/minecraft_server.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
-29
View File
@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge_server</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>forge_common</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
</link>
<link>
<name>minecraft_server</name>
<type>2</type>
<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft_server</locationURI>
</link>
</linkedResources>
</projectDescription>
-10
View File
@@ -1,10 +0,0 @@
*** HOW TO INSTALL ***
The forge directory should have been uncompacted right under your MCP root
directory.
You should a a fresh minecraft and minecraft_server.jar freshly decompiled
with ModLoader and ModLoaderMP.
Just run the script install.bat. It will copy the Minecraft Forge source on your
src directory, and modify the Minecraft source files.
-8
View File
@@ -1,8 +0,0 @@
set HOME=%CD%
set MCP=%HOME%\..
xcopy /Y /E src\* ..\src
cd %MCP%\src
%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch
%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch
pause
-8
View File
@@ -1,8 +0,0 @@
#! /usr/bin/env python
import sys, re, os
data = open(sys.argv[1], "rb").read()
newdata = re.sub("\r?\n", "\r\n", data)
f = open(sys.argv[2], "wb")
f.write(newdata)
f.close()
File diff suppressed because it is too large. Load diff
-70
View File
@@ -1,70 +0,0 @@
diff -ru src/minecraft/net/minecraft/src/MLProp.java src_fix/minecraft/net/minecraft/src/MLProp.java
--- src/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400
+++ src_fix/minecraft/net/minecraft/src/MLProp.java 2011-08-04 20:12:55.000000000 -0400
@@ -1,20 +1,11 @@
-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces deadcode
-
-package net.minecraft.src;
-
-import java.lang.annotation.Annotation;
-
-public interface MLProp
- extends Annotation
-{
-
- public abstract String name();
-
- public abstract String info();
-
- public abstract double min();
-
- public abstract double max();
-}
+package net.minecraft.src;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface MLProp {
+ String name() default "";
+ String info() default "";
+ double min() default Double.NEGATIVE_INFINITY;
+ double max() default Double.POSITIVE_INFINITY;
+}
diff -ru src/minecraft_server/net/minecraft/src/MLProp.java src_fix/minecraft_server/net/minecraft/src/MLProp.java
--- src/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:10:17.000000000 -0400
+++ src_fix/minecraft_server/net/minecraft/src/MLProp.java 2011-08-04 20:13:00.000000000 -0400
@@ -1,20 +1,11 @@
-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces deadcode
-
-package net.minecraft.src;
-
-import java.lang.annotation.Annotation;
-
-public interface MLProp
- extends Annotation
-{
-
- public abstract String name();
-
- public abstract String info();
-
- public abstract double min();
-
- public abstract double max();
-}
+package net.minecraft.src;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface MLProp {
+ String name() default "";
+ String info() default "";
+ double min() default Double.NEGATIVE_INFINITY;
+ double max() default Double.POSITIVE_INFINITY;
+}
-59
View File
@@ -1,59 +0,0 @@
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:07.755771900 +0200
+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:09.485870900 +0200
@@ -333,41 +333,22 @@
}
finally
{
- System.exit(0);
+ try
+ {
+ stopServer();
+ serverStopped = true;
+ }
+ catch(Throwable throwable2)
+ {
+ throwable2.printStackTrace();
+ }
+ finally
+ {
+ System.exit(0);
+ }
}
- break MISSING_BLOCK_LABEL_350;
- }
- try
- {
- stopServer();
- serverStopped = true;
- }
- catch(Throwable throwable)
- {
- throwable.printStackTrace();
- }
- finally
- {
- System.exit(0);
- }
- break MISSING_BLOCK_LABEL_350;
- Exception exception2;
- exception2;
- try
- {
- stopServer();
- serverStopped = true;
- }
- catch(Throwable throwable3)
- {
- throwable3.printStackTrace();
- }
- finally
- {
- System.exit(0);
- }
- throw exception2;
}
+}
private void doTick()
{
-71
View File
@@ -1,71 +0,0 @@
version=$1
build_dir=`pwd`
dir=`pwd`/../forge-$version
function remove_svn () {
(
cd $1
if [ -d .svn ]; then
rm -rf .svn
fi
for j in `ls`
do
if [ -d $j ]; then
remove_svn $j
fi
done
)
}
function package_all () {
qual=$1
zip -r $dir/minecraftforge$qual-$version.zip \
*.class \
forge
}
cd ../reobf
remove_svn .
rm -rf $dir
mkdir $dir
cd minecraft
package_all "-client"
cd ../minecraft_server
package_all "-server"
cd ../..
rm -rf reobf
cd $build_dir
mkdir forge
cd forge
mkdir src
mkdir src/minecraft
mkdir src/minecraft_server
cp -r ../forge_client/src/* src/minecraft
cp -r ../forge_server/src/* src/minecraft_server
cp -r ../forge_common/* src/minecraft
cp -r ../forge_common/* src/minecraft_server
cp ../minecraft.patch .
cp ../lfcr.py .
cp ../install/install.cmd .
cp ../install/README.txt .
cp -r ../doc .
cd src
remove_svn .
cd ..
cd ..
zip -r $dir/minecraftforge-src-$version.zip forge
rm -rf forge
-13
View File
@@ -1,13 +0,0 @@
cmd /C build.bat
cd ..
cmd /C reobfuscate.bat
set PATH=E:\cygwin\bin;%PATH%
cd forge
sh package.sh 1.0.3
pause
-25
View File
@@ -1,25 +0,0 @@
cd ..
rmdir /S /Q src
IF EXIST src_base (
move src_base src
rmdir /S /Q src_work
) ELSE (
cmd /C decompile.bat
cd src
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch
..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch
cd ..
cmd /C recompile.bat
cmd /C updatemd5.bat
)
mkdir src_base
mkdir src_work
xcopy /Y /E src\* src_base
xcopy /Y /E src\* src_work
cd src_work
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch
..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch
pause
-49
View File
@@ -1,49 +0,0 @@
#!/bin/bash
echo "MinecraftForge Linux Setup Program"
echo
pushd .. > /dev/null
if [ -d src ] ; then
echo "!!! WARNING !!!"
echo
echo "This setup will erase your src directory. Make sure to back up"
echo "any changes before continuing."
echo
read -p "Continue (y/n)? " var
if [ "$var" != "y" ]; then exit ; fi
fi
rm -rf src src_work src_forge
if [ ! -d src_base ] ; then
./decompile.sh
pushd src > /dev/null
find -name *.java -exec sed -i 's/\r//g' \{\} \;
patch -p2 -i ../forge/modLoaderMP.patch
patch -p1 -i ../forge/mlprop.patch
popd > /dev/null
mv src src_base
fi
cp -a src_base src_work
pushd src_work > /dev/null
patch -p2 -i ../forge/minecraft.patch
popd > /dev/null
cp -a src_work src_forge
cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
cp -a forge/forge_common/net/* src_forge/minecraft/net/
cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
cp -a src_forge src
./updatemd5.sh
-5
View File
@@ -1,5 +0,0 @@
rm minecraft.patch
touch minecraft.patch
diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \
>> minecraft.patch
Binary file not shown.
+6
View File
@@ -0,0 +1,6 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
Vendored Executable
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Vendored
+90
View File
@@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

+125
View File
@@ -0,0 +1,125 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 2,
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.3",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "net.sourceforge.argo:argo:2.25",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.guava:guava:14.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.apache.commons:commons-lang3:3.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "commons-io:commons-io:2.4",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jinput:jinput:2.0.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jutils:jutils:1.0.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.gson:gson:2.2.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+93
View File
@@ -0,0 +1,93 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 2,
"libraries": [
{
"name": "cpw.mods:fml:{version}",
"devdl" : "false"
},
{
"name": "net.minecraft:launchwrapper:1.3"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+137
View File
@@ -0,0 +1,137 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 2,
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.3",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "net.sourceforge.argo:argo:2.25",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.guava:guava:14.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.apache.commons:commons-lang3:3.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "commons-io:commons-io:2.4",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jinput:jinput:2.0.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jutils:jutils:1.0.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.gson:gson:2.2.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+127
View File
@@ -0,0 +1,127 @@
{
"install": {
"profileName": "FML",
"target":"FML@version@",
"path":"cpw.mods:fml:@version@",
"version":"FML @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple FML installer.",
"minecraft":"@minecraft_version@",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "FML@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 2,
"libraries": [
{
"name": "cpw.mods:fml:@version@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.3",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://repo.maven.apache.org/maven2/",
"comment" : "Important for FML, we add this",
"serverreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://repo.maven.apache.org/maven2/",
"comment" : "Important for FML, we add this",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
}
+137
View File
@@ -0,0 +1,137 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 2,
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.3",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "net.sourceforge.argo:argo:2.25",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.guava:guava:14.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.apache.commons:commons-lang3:3.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "commons-io:commons-io:2.4",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jinput:jinput:2.0.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jutils:jutils:1.0.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.gson:gson:2.2.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+220
View File
@@ -0,0 +1,220 @@
{
"install": {
"profileName": "FML",
"target":"@minecraft_version@-FML@version@",
"path":"cpw.mods:fml:@version@",
"version":"FML @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple FML installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-FML@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 4,
"libraries": [
{
"name": "cpw.mods:fml:@version@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.3",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
}
+137
View File
@@ -0,0 +1,137 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 4,
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.7",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "net.sourceforge.argo:argo:2.25",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.guava:guava:14.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.apache.commons:commons-lang3:3.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "commons-io:commons-io:2.4",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jinput:jinput:2.0.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jutils:jutils:1.0.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.gson:gson:2.2.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+214
View File
@@ -0,0 +1,214 @@
{
"install": {
"profileName": "FML",
"target":"@minecraft_version@-FML@version@",
"path":"cpw.mods:fml:@version@",
"version":"FML @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple FML installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-FML@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 4,
"libraries": [
{
"name": "cpw.mods:fml:@version@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.7",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
}
+137
View File
@@ -0,0 +1,137 @@
{
"id": "FML{version}",
"time": "{timestamp}",
"releaseTime": "{timestamp}",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 4,
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.8",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "net.sourceforge.argo:argo:2.25",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.guava:guava:14.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.apache.commons:commons-lang3:3.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "commons-io:commons-io:2.4",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jinput:jinput:2.0.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.java.jutils:jutils:1.0.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.gson:gson:2.2.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+214
View File
@@ -0,0 +1,214 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 4,
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.8",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
}
+238
View File
@@ -0,0 +1,238 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 13,
"assets": "1.7.10",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.12"
},
{
"name": "com.google.code.findbugs:jsr305:1.3.9",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.ow2.asm:asm-debug-all:5.0.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe:config:1.2.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.mojang:realms:1.3.5"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:17.0"
},
{
"name": "org.apache.commons:commons-lang3:3.3.2"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.16"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+195
View File
@@ -0,0 +1,195 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.9",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.mojang:realms:1.2"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 13,
"assets": "1.7.4"
}
+165
View File
@@ -0,0 +1,165 @@
{
"id": "1.7.10-pre3",
"time": "2014-05-14T17:29:23+02:00",
"releaseTime": "2014-05-14T17:29:23+02:00",
"type": "snapshot",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"minimumLauncherVersion": 13,
"assets": "1.7.4",
"libraries": [
{
"name": "com.mojang:realms:1.2.1"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+188
View File
@@ -0,0 +1,188 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 13,
"assets": "1.7.10",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.9"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.mojang:realms:1.2.3"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:16.0"
},
{
"name": "org.apache.commons:commons-lang3:3.2.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
+209
View File
@@ -0,0 +1,209 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minimumLauncherVersion": 13,
"assets": "1.7.10",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.9",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
"serverreq":true,
"clientreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "com.mojang:realms:1.2.4"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:16.0"
},
{
"name": "org.apache.commons:commons-lang3:3.2.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch"
}
}
+165
View File
@@ -0,0 +1,165 @@
{
"id": "1.7.10-pre4",
"time": "2014-05-14T18:29:23+02:00",
"releaseTime": "2014-05-14T18:29:23+02:00",
"type": "snapshot",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"minimumLauncherVersion": 13,
"assets": "1.7.10",
"libraries": [
{
"name": "com.mojang:realms:1.2.4"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+132
View File
@@ -0,0 +1,132 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "@minecraft_version@",
"inheritsFrom": "@minecraft_version@",
"jar": "@minecraft_version@",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.12",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:5.0.3",
"serverreq":true
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
"serverreq":true,
"clientreq":true
},
{
"name": "com.typesafe:config:1.2.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "com.google.guava:guava:17.0",
"serverreq":true
},
{
"name": "org.apache.commons:commons-lang3:3.3.2",
"serverreq":true
}
]
}
}
+165
View File
@@ -0,0 +1,165 @@
{
"id": "1.7.10",
"time": "2014-05-14T19:29:23+02:00",
"releaseTime": "2014-05-14T19:29:23+02:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"minimumLauncherVersion": 13,
"assets": "1.7.10",
"libraries": [
{
"name": "com.mojang:realms:1.3.5"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.21"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+203
View File
@@ -0,0 +1,203 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.9",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.3"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 9
}
+219
View File
@@ -0,0 +1,219 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.9",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.3"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 9
}
}
+173
View File
@@ -0,0 +1,173 @@
{
"id": "1.7.2",
"time": "2014-04-02T12:00:00+02:00",
"releaseTime": "2013-10-25T15:00:00+02:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token}",
"minimumLauncherVersion": 9,
"libraries": [
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.3"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows"
},
"extract": {
"exclude": [
"META-INF/"
]
},
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
"natives": {
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
},
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+179
View File
@@ -0,0 +1,179 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.9",
"comment" : "Important for FML, we add this"
},
{
"name": "org.ow2.asm:asm-debug-all:4.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2",
"comment" : "Important for FML, we add this"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 9
}
+219
View File
@@ -0,0 +1,219 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.9",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq":true
},
{
"name": "org.scala-lang:scala-library:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.10.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
"comment" : "Important for FML, we add this",
"serverreq":true,
"clientreq":true
},
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.3"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 9
}
}
+150
View File
@@ -0,0 +1,150 @@
{
"id": "1.7.9",
"time": "2014-04-14T15:29:23+02:00",
"releaseTime": "2014-04-14T15:29:23+02:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"minimumLauncherVersion": 13,
"assets": "1.7.4",
"libraries": [
{
"name": "java3d:vecmath:1.3.1"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.10.Final"
},
{
"name": "com.google.guava:guava:15.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.13"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:5.16"
},
{
"name": "tv.twitch:twitch-platform:5.16",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
+319
View File
@@ -0,0 +1,319 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.12"
},
{
"name": "jline:jline:2.13",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.findbugs:jsr305:1.3.9",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.ow2.asm:asm-debug-all:5.0.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe:config:1.2.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "java3d:vecmath:1.5.2"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.6",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.15.Final"
},
{
"name": "com.google.guava:guava:17.0"
},
{
"name": "org.apache.commons:commons-lang3:3.3.2"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.17"
},
{
"name": "com.mojang:realms:1.6.1"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:6.5"
},
{
"name": "tv.twitch:twitch-platform:6.5",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "1.8"
}
+137
View File
@@ -0,0 +1,137 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "1.8",
"inheritsFrom": "1.8",
"jar": "1.8",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"comment": "Force the downgrade on dedicated server to match client. Netty bug: https://github.com/MinecraftForge/MinecraftForge/issues/1848",
"name": "io.netty:netty-all:4.0.15.Final",
"serverreq":true,
"clientclasspath":false
},
{
"name": "net.minecraft:launchwrapper:1.12",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:5.0.3",
"serverreq":true
},
{
"name": "jline:jline:2.13",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "TODO", "TODO" ],
"serverreq":true,
"clientreq":false
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
"serverreq":true,
"clientreq":true
},
{
"name": "com.typesafe:config:1.2.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq":true
}
]
}
}
+328
View File
@@ -0,0 +1,328 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.12"
},
{
"name": "jline:jline:2.13",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.findbugs:jsr305:1.3.9",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.ow2.asm:asm-debug-all:5.0.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.typesafe:config:1.2.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "java3d:vecmath:1.5.2"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "oshi-project:oshi-core:1.1"
},
{
"name": "net.java.dev.jna:jna:3.4.0"
},
{
"name": "net.java.dev.jna:platform:3.4.0"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.6",
"children" : ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.23.Final"
},
{
"name": "com.google.guava:guava:17.0"
},
{
"name": "org.apache.commons:commons-lang3:3.3.2"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.21"
},
{
"name": "com.mojang:realms:1.7.39"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:6.5"
},
{
"name": "tv.twitch:twitch-platform:6.5",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "1.8"
}
+141
View File
@@ -0,0 +1,141 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "1.8",
"inheritsFrom": "1.8.8",
"jar": "1.8.8",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.12",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:5.0.3",
"serverreq":true
},
{
"name": "jline:jline:2.13",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
"serverreq":true,
"clientreq":false
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
"serverreq":true,
"clientreq":true
},
{
"name": "com.typesafe:config:1.2.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.6",
"serverreq":true
},
{
"name": "java3d:vecmath:1.5.2",
"clientreq":true,
"serverreq":true
},
{
"name": "net.sf.trove4j:trove4j:3.0.3",
"clientreq":true,
"serverreq":true
}
]
}
}
+244
View File
@@ -0,0 +1,244 @@
{
"id": "1.8.8",
"time": "2015-07-27T06:31:28-04:00",
"releaseTime": "2015-07-27T06:31:28-04:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"libraries": [
{
"name": "oshi-project:oshi-core:1.1"
},
{
"name": "net.java.dev.jna:jna:3.4.0"
},
{
"name": "net.java.dev.jna:platform:3.4.0"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.6"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.23.Final"
},
{
"name": "com.google.guava:guava:17.0"
},
{
"name": "org.apache.commons:commons-lang3:3.3.2"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.21"
},
{
"name": "com.mojang:realms:1.7.39"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:6.5"
},
{
"name": "tv.twitch:twitch-platform:6.5",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main",
"minimumLauncherVersion": 14,
"assets": "1.8"
}
+241
View File
@@ -0,0 +1,241 @@
{
"id": "1.8",
"time": "2014-09-02T08:24:35+00:00",
"releaseTime": "2014-09-02T08:24:35+00:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
"minimumLauncherVersion": 14,
"assets": "1.8",
"libraries": [
{
"name": "java3d:vecmath:1.5.2"
},
{
"name": "net.sf.trove4j:trove4j:3.0.3"
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.6"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},
{
"name": "com.paulscode:codecwav:20101023"
},
{
"name": "com.paulscode:libraryjavasound:20101123"
},
{
"name": "com.paulscode:librarylwjglopenal:20100824"
},
{
"name": "com.paulscode:soundsystem:20120107"
},
{
"name": "io.netty:netty-all:4.0.15.Final"
},
{
"name": "com.google.guava:guava:17.0"
},
{
"name": "org.apache.commons:commons-lang3:3.3.2"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "commons-codec:commons-codec:1.9"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.4"
},
{
"name": "com.mojang:authlib:1.5.21"
},
{
"name": "com.mojang:realms:1.6.1"
},
{
"name": "org.apache.commons:commons-compress:1.8.1"
},
{
"name": "org.apache.httpcomponents:httpclient:4.3.3"
},
{
"name": "commons-logging:commons-logging:1.1.3"
},
{
"name": "org.apache.httpcomponents:httpcore:4.3.2"
},
{
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
},
{
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
},
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
},
"rules": [
{
"action": "allow",
"os": {
"name": "osx"
}
}
]
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch:6.5"
},
{
"name": "tv.twitch:twitch-platform:6.5",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "linux"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows-${arch}",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "tv.twitch:twitch-external-platform:4.5",
"rules": [
{
"action": "allow",
"os": {
"name": "windows"
}
}
],
"natives": {
"windows": "natives-windows-${arch}"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
],
"mainClass": "net.minecraft.client.main.Main"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!--The ID below indicates application support for Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
<!--The ID below indicates application support for Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
<!--The ID below indicates application support for Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!--The ID below indicates application support for Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!--The ID below indicates application supprort for Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<!-- following stuff is so the EXE doesnt ask for admin access -->
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
+59
View File
@@ -0,0 +1,59 @@
-------------------------------------------
Source installation information for modders
-------------------------------------------
This code follows the Minecraft Forge installation methodology. It will apply
some small patches to the vanilla MCP source code, giving you and it access
to some of the data and functions you need to build a successful mod.
Note also that the patches are built against "unrenamed" MCP source code (aka
srgnames) - this means that you will not be able to read them directly against
normal code.
Source pack installation information:
Standalone source installation
==============================
Step 1: Open your command-line and browse to the folder where you extracted the zip file.
Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:
Windows: "gradlew setupDecompWorkspace"
Linux/Mac OS: "./gradlew setupDecompWorkspace"
Step 3: After all that finished, you're left with a choice.
For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)
If you preffer to use IntelliJ, steps are a little different.
1. Open IDEA, and import project.
2. Select your build.gradle file and have it import.
3. Once it's finished you must close IntelliJ and run the following command:
"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)
If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again.
Should it still not work,
Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
Tip:
If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code.
"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.
Tip:
When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE.
Forge source installation
=========================
MinecraftForge ships with this code and installs it as part of the forge
installation process, no further action is required on your part.
LexManos' Install Video
=======================
https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be
For more details update more often refer to the Forge Forums:
http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
+82
View File
@@ -0,0 +1,82 @@
// For those who want the bleeding edge
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
/*
// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "1.0"
group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "modid"
minecraft {
version = "@VERSION@"
runDir = "run"
// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "@MAPPINGS@"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}
dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"
// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
// the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
//provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
// except that these dependencies get remapped to your current MCP mappings
//deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
//deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}
processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
@@ -0,0 +1,4 @@
#Sun Jun 05 18:58:07 CEST 2011
version=1
eclipse.preferences.version=1
refresh.enabled=true
@@ -0,0 +1,7 @@
#Sun Jun 05 19:03:53 CEST 2011
eclipse.preferences.version=1
org.eclipse.debug.ui.UseContextualLaunch=false
Console.highWaterMark=88000
org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<launchPerspectives/>\r\n
org.eclipse.debug.ui.user_view_bindings=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<viewBindings>\r\n<view id\="org.eclipse.ui.console.ConsoleView">\r\n<perspective id\="org.eclipse.jdt.ui.JavaPerspective" userAction\="opened"/>\r\n</view>\r\n</viewBindings>\r\n
StringVariablePreferencePage=130,107,107,86,
@@ -0,0 +1,3 @@
#Sun Jun 05 18:58:07 CEST 2011
eclipse.preferences.version=1
org.eclipse.epp.usagedata.gathering.enabled=false
@@ -0,0 +1,14 @@
#Sun Sep 18 16:44:39 NZST 2011
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.source=1.6
@@ -0,0 +1,4 @@
#Sun Jun 05 18:58:05 CEST 2011
spacesForTabs=true
eclipse.preferences.version=1
overviewRuler_migration=migrated_3.1
@@ -0,0 +1,9 @@
#Sun Jun 05 18:58:07 CEST 2011
IMPORT_FILES_AND_FOLDERS_MODE=prompt
IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
SAVE_ALL_BEFORE_BUILD=true
eclipse.preferences.version=1
tipsAndTricks=true
platformState=1287081747687
quickStart=false
PROBLEMS_FILTERS_MIGRATE=true
@@ -0,0 +1,3 @@
#Sun Jun 05 18:50:08 CEST 2011
eclipse.preferences.version=1
showIntro=false
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/MDKExample"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
</launchConfiguration>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/MDKExample"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
</launchConfiguration>
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchHistory>
<launchGroup id="org.eclipse.ui.externaltools.launchGroup">
<mruHistory/>
<favorites/>
</launchGroup>
<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
<mruHistory/>
<favorites/>
</launchGroup>
<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
<mruHistory>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
</mruHistory>
<favorites/>
</launchGroup>
<launchGroup id="org.eclipse.debug.ui.launchGroup.run">
<mruHistory>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
</mruHistory>
<favorites/>
</launchGroup>
</launchHistory>
+22
View File
@@ -0,0 +1,22 @@
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project
# idea
out
*.ipr
*.iws
*.iml
.idea
# gradle
build
.gradle
# other
eclipse
run
@@ -0,0 +1,20 @@
package com.example.examplemod;
import net.minecraft.init.Blocks;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION)
public class ExampleMod
{
public static final String MODID = "examplemod";
public static final String VERSION = "1.0";
@EventHandler
public void init(FMLInitializationEvent event)
{
// some example code
System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
}
}
+16
View File
@@ -0,0 +1,16 @@
[
{
"modid": "examplemod",
"name": "Example Mod",
"description": "Example placeholder mod.",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "",
"updateUrl": "",
"authorList": ["ExampleDude"],
"credits": "The Forge and FML guys, for making this example",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
]
Loaded 100 of 1014 files, more files were not shown because too many files have changed in this diff. Show more