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

589 commits

Author SHA1 Message Date
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
cpw
112c41a707 Merge branch '1.7.10' - fix up some oredictionary and substitution related issues 2015-11-10 18:35:38 -05:00
Gabriel Harris-Rouquette
d08cf58d80
Fix a possible NPE when checking supertypes of interfaces. Closes #2176. 
Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
 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
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
1a6c816bac Test of mcp patching 2015-11-08 23:09:33 -05:00
Lex Manos
ffbad6633d Fixed Open url confirm screen not showing URL. 2015-11-08 12:52:41 -08: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
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
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
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
darkevilmac
b9f5e152de Add PlayerSetSpawnEvent 2015-10-10 15:39:27 -07: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
luacs1998
05f6ede2ea Fix a possible crash in EventBus 2015-09-27 12:47:37 +08:00
RainWarrior
d70ca1a357 Workaround for MinecraftForge/ForgeGradle#256 2015-09-02 22:01:30 +03: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
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
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
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
James
589465bb81 Fix faulty Channel name 2015-08-21 16:06:07 -07:00
cpw
b211aca5ce Merge branch 'fg2' 2015-08-20 12:27:20 -07:00
laci200270
ba8ae53867 Update FMLSecurityManager.java 2015-08-19 20:27:42 +02: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
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
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
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
Ruben Taelman
0cf1f0d51c Fix source block check for BlockFluidClassic 2015-07-21 10:51:53 +02:00
liach
e2ee54a27d Add an EnumHelper hook and fixed an issue 2015-07-14 08:55:51 +08: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
Clienthax
97f8c246b8 Signed-off-by: Clienthax <clienthax@gmail.com> 2015-06-30 22:29:34 +01:00
RainWarrior
c4f370a7e6 Custom transformations in forge blockstate json. 2015-06-30 21:37:11 +03:00
AbrarSyed
bbfae84ee8 removed broken and duplicate AT lines 2015-06-29 21:56:30 -05: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
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
diesieben07
ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update 2015-06-25 19:09:32 +02: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
LexManos
8bb34107f1 Merge pull request #1858 from FlansMods/master 
Hook for Camera Angles, Including Roll
 2015-06-21 11:19:26 -07:00
larman
2cb971c38f fix logic for guessing mesa tag in biome dict 2015-06-19 07:04:19 -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
RainWarrior
07038f8342 Added fluid renderer. 2015-06-18 14:26:53 +03:00
LexManos
bf63879a92 Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader 
Bugfix for B3DLoader
 2015-06-17 16:52:08 -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
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
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
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
superckl
c84f7a740f Fixing two IndexOutBoundsExceptions from the BiomeDictionary 2015-06-12 17:08:19 -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
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
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
ganymedes01
0373920f99 Added a brewing registry system 2015-06-09 14:01:45 -03: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
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
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
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
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
Lex Manos
c608e7c04e Fixes MC-75630 - Exploit with signs and command blocks 2015-05-25 15:28:14 -07:00
Lex Manos
df5e594e95 Loosen up ServerChatEvent to support IChatComponent Closes #1893 2015-05-25 13:34:34 -07: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
t1g3l
6a299a483a Changed forge command tab completion to use getListOfStringsMatchingLastWord() 2015-05-18 13:51:05 +02:00
t1g3l
fe327fbd76 Added tab completion 2015-05-17 11:00:42 +02: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
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
dcb2f2588c Actually use the override constraint in ticket requests. Closes #1802 2015-04-19 11:57:39 -04:00
cpw
54af750717 Verify that the fluid registry doesn't contain "junk" fluids thru reflection. 2015-04-18 21:37:45 -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 <kinglemming@gmail.com>
 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
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
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 <kinglemming@gmail.com>
 2015-04-13 22:40:38 -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
King Lemming
37d63b3fe9 Adds a warning to the FluidContainerRegistry when a mod does something stupid! Also denies the registration. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-10 20:09:58 -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 <kinglemming@gmail.com>
 2015-04-10 16:38:45 -04:00
King Lemming
433b7ca589 Fixes #1782 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-09 17:28:20 -04: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
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
02ebc9ca21 Restore binary compatibility issues in FluidRegistry caused by recent changes. 2015-04-07 20:06:55 -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 <kinglemming@gmail.com>
 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 <kinglemming@gmail.com>
 2015-04-05 22:30:39 -04:00
iChun
b2f1b036de Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex. 2015-04-04 22:30:23 +01: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
RainWarrior
46b1b82f13 Fixed mipmapping not being enabled by expanding 1x1 texture 2015-04-01 16:06:03 +03: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
JamiesWhiteShirt
3b567a92d8 Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity. 2015-03-19 12:37:21 +01:00
LexManos
888bab92c3 Merge pull request #1723 from Geforce132/master 
Add an EntityMountEvent.
 2015-03-16 10:01:53 -07:00
Geforce132
d2f36d56f1 -Added EntityMountEvent. 2015-03-13 19:12:16 -05:00
diesieben07
642003e065 Fix jukebox message being too low with forge 2015-03-11 23:25:41 +01:00
robin4002
af0316ab9b remove translation and add a note for contributors 2015-03-04 20:21:16 +01: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
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
RainWarrior
0e34510032 Removed event bus call from the ModelLoader 2015-02-17 21:20:19 +03: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
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
RainWarrior
d741b1bafc Attributes.put (de)normalization now works as intended 2015-02-16 03:53:33 +03: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
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
RainWarrior
87ef833d32 Alternative models work once again 2015-02-14 00:23:03 +03:00
RainWarrior
dfc2e04255 fix ModelLoader.setCustomModelResourceLocation not storing same item with different metadata values 2015-02-09 17:19:10 +03: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
7ed7da159e Fixed debugging Dedicated server in Forge Dev workspace. 2015-02-06 21:35:11 -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
RainWarrior
3a0de2edca Fixed tracking of UV locking state. Closes #1679 2015-02-03 10:40:30 +03:00
Lex Manos
79356d7023 Fixed ItemFrames not having a model. Closes #1678 2015-02-02 13:06:57 -08:00
Lex Manos
c374ba5463 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:56:00 -08:00