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