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

2446 commits

Author SHA1 Message Date
David Quintana
983a47a7d6 Fix dark spots in fullbright quad rendering. 
Fix multi-layer model not declaring dependency on the particle texture.
Fix mistake in 2c054fca which I didn't intend to push when I did.
 2020-01-13 23:20:46 +01:00
David Quintana
c1840abb0a Fix multi-layer model loader to actually work in a sane way. No more "base" model involved, and now transforms and overrides work as expected. 2020-01-13 19:38:52 +01:00
David Quintana
2c054fca76 Attempt to fix fullbright lighting. 
Fix lightmap value calculation.
 2020-01-13 13:19:36 +01:00
tterrag
d5b94aa9c8 Add constructor for FishBucketItem that accepts suppliers 2020-01-09 17:26:11 -05:00
David Quintana
c4c760bfb3 Fix QuadTransformer normal processing. 2020-01-07 23:52:51 +01:00
Choonster TheMage
dd0260c476 Fix validation in RotationBuilder#angle (fixes #6323) (#6408) 2020-01-07 14:21:12 -08:00
Richard Freimer
ca62702ff9 Add support for custom nether portal frame blocks (#6389) 2020-01-07 14:20:37 -08:00
tterrag
df04ae11ef Fix dyes tag containing dye items instead of tags 
Update generated data
 2020-01-05 19:03:49 -05:00
Choonster TheMage
6e8b976089 [1.15.x] Remove unused parameter from ElementBuilder#rotation (fixes #6321) (#6407) 2020-01-05 14:29:45 -05:00
tterrag
bc878ddf19 Refactor BlockStateProvider to encapsulate a BlockModelProvider 
Make most protected methods of data generators public
 2020-01-05 14:27:20 -05:00
tterrag
3096608d4a Fix crash when building BakedQuadBuilder 
Add javadocs and move sprite to constructor where possible
 2020-01-05 13:36:06 -05:00
tterrag
7c99b756f9 Fix incorrect check for missing texture in DynamicBucketModel 2020-01-04 23:50:17 -05:00
tterrag
90035ab084 Remove custom vertex format from BakedQuad 2020-01-04 23:36:56 -05:00
David Quintana
b6c12f5fff A few more binary-breaking changes, before it's too late: 
- Move CompositeModel out of its package.
- Move a few inner classes from the OBJ loader.
- Rename the bucket model and fluid model classes to match the naming convention.
- Remove BiomeEvent.* and WorldTypeEvent.InitBiomeGens as they are not currently implemented and they haven't been in the previous version either.
 2020-01-04 17:18:28 +01:00
David Quintana
ca031ca33f Fix CompositeModel not respecting "display" transforms. 
Remove leftovers from discarded feature.
 2020-01-02 06:21:43 +01:00
David Quintana
ecb56054bc Allow model jsons to override the material library used by OBJ models. 
Fix model loader test mod resources.
Update licenses.
 2020-01-01 17:15:49 +01:00
tterrag
53747b0cb5 Apply baked-in lightmap data to rendering 
- Fix ForgeHooksClient.fillNormal injecting data to lightmap
- Fix OBJModel not filling lightmap data
- Fix NewModelLoaderTest blockitem not linking with block
 2019-12-30 16:12:14 -05:00
David Quintana
e1b0a8c153 Fix LightUtil.unpack to set the 4th component to 1 when expanding an xyz position into a 4-component vector. 
Add TRSRTransformer test mod.
Fix signature of the bindTileEntityRenderer method, to account for covariance.
 2019-12-29 17:16:27 +01:00
David Quintana
fc189c9aaf More model/rendering fixes: 
- Breaking change: Change ClientRegistry.bindTileEntityRenderer to a factory, so mods don't have to manually specify the dispatcher.
- Breaking change: Delete obsolete SimpleModelState (the class was duplicated by mistake, see SimpleModelTransform) and ICustomModelState (part of the old loader API).
- Breaking change: Rename getTextureDependencies to getTextures, for consistency.
- Reinstate the getRenderLayer method, fixed appropriately to return the new RenderType value.
- Fix OBJ loader applying the model transform in the wrong reference frame.
- Fix vanilla bug in TransformationMatrix#func_227986_a_
- Fix QuadTransformer logic.
- Added new method to IModelConfiguration to retrieve the owner IUnbakedModel, needed in order to construct ItemOverrideLists when baking custom models.
- Reintroduce multi-layer model through the new model loader system.
 2019-12-29 02:13:58 +01:00
David Quintana
e8ce61d4cd New batch of Model/rendering fixes: 
- PerspectiveMapWrapper did not pass IModelData through to the wrapped model.
- CompositeModel did not store the returned textures from getTextureDependencies.
- VertexFormat used COLOR instead of UV to detect UV presence.
- QuadTransformer would crash due to index out of bounds.
- Small cleanup of TransformationHelper
 2019-12-24 13:12:38 +01:00
David Quintana
ac61018806 Fix obj models having all faces in the same mesh, breaking material assignments and visibility in the process. 
Reintroduce lost patch from the model loader, which would cause the custom values to be missing from generated models.
 2019-12-20 18:14:09 +01:00
David Quintana
c3b1f47754 Fix item quads not using the existing vertex color when applying tint colors. 2019-12-20 04:50:40 +01:00
David Quintana
503d277033 Fix bucket model. Some mask textures were not added to the repository, and the bucket override generation was broken. 
Fix OBJ loading crash due to a float value being parsed as int.
Fixes 6377
 2019-12-20 02:44:27 +01:00
bl4ckscor3
40de19f16e Fix game crashing when modded entities are present (#6364) 2019-12-19 00:56:01 -05:00
ichttt
83ebdcd8f2 Fix warning screen about missing minecraft registry entries (#6363) 2019-12-18 21:02:20 -08:00
ichttt
747cb0f151 Some code cleanup for 1.15 (#6362) 2019-12-18 20:39:41 -08:00
tterrag
49596dcacc Mod list GUI detail pass 
- Make padding consistent on all elements
- Properly horizontally center the "Search" text
- Update and resize forge/mcp logos
- Enable linear filtering on logo rendering by default
  - Can be disabled with the "logoBlur" mods.toml property
 2019-12-17 20:58:26 -05:00
ichttt
5df687dddc Fix mod list screen (#6367) 2019-12-17 20:03:11 -05:00
David Quintana
599a754b60 Fix items in ground being too small, we were applying perspectives twice. 
Restore forge patch and fix a tiny mistake in it.
 2019-12-18 00:46:29 +01:00
tterrag
faaebe7a07 Remove uvlock hook, fixes broken stair/fence/etc models 2019-12-17 17:37:39 -05:00
tterrag
5987d917b8 Update to 1.15.1 2019-12-17 14:37:34 -05:00
David Quintana
738abbb360 Finish converting the code from javax.vecmath to the vanilla vector classes. Forge is now vecmath-free! 2019-12-17 19:14:52 +01:00
tterrag
1558362583 Remove deprecations 2019-12-17 04:50:13 -05:00
tterrag
5b67354e24 Fix incorrect item lighting 2019-12-16 23:46:45 -05:00
tterrag
dec91dec68 Revert fluid change to use Material, fixes server crash 2019-12-16 23:22:13 -05:00
LexManos
1933d05e36 Update to 1.15 
Due to the massive rendering changes, certain features, such as emissive item rendering and the forge block rendering/lighting pipeline are currently disabled.

Co-authored-by: David Quintana <gigaherz@gmail.com>
Co-authored-by: tterrag <tterrag1098@gmail.com>
Co-authored-by: Unnoen <theunnoen@gmail.com>
 2019-12-17 03:38:12 +01:00
Daniël Goossens
5d0fb2967c Split DrawBlockHighlightEvent into subevents to make usage clearer, addresses #2190 (#6269) 2019-12-10 11:46:01 -08:00
tterrag
5c88451f6f Allow classpath locator to discover jars via FMLModType attribute 2019-12-05 22:56:05 -05:00
cpw
cfc53c939e
Tidy up some output and also add libraries from the modfile detection into the transforming classloader. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-12-05 22:47:39 -05:00
tterrag
3ba78225c3 Fix swapped yaw/pitch in camera setup event 2019-12-02 19:10:59 -05:00
liach
d8e6181058 Restore camera setup render event (#6335) 2019-12-02 14:54:46 -08:00
DaemonUmbra
bb4e78da90 Fixed invocation of Vanilla spawn logic (#6334) 
Forge's replacement of the Vanilla logic gets inverted, so the Vanilla logic inside that replacement must be inverted to correct for this.
(Fixes #6332)
 2019-12-02 14:54:00 -08:00
bl4ckscor3
4dd32d6f72 Add item tag 'beacon_payment' for items that can activate a beacon (#6328) 2019-12-02 14:52:45 -08:00
Paul Becker
f9686cf098 New SleepFinishedTimeEvent allowing control of world time when waking up. (#6043) 2019-12-02 14:08:14 -08:00
tterrag
c18d26c7d8 Make EntityLootTables reusable for modders 2019-11-25 01:03:24 -05:00
nikita488
241db39cea Fix emissive items not working 2019-11-24 19:08:46 -05:00
cpw
31da9a4878
Fix the hang on startup problem when windows' broken device enumeration 
causes a huge glfwInit slowdown. Log a message too when this is detected.

See https://github.com/glfw/glfw/issues/1284, https://stackoverflow.com/questions/10967795/directinput8-enumdevices-sometimes-painfully-slow,
https://discourse.libsdl.org/t/win-10-initing-joystick-causes-45s-hang-in-sdl-dinput-joystickdetect/23293

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-11-23 15:37:56 -05:00
Richard Freimer
0e65f20f22 Add hooks to make it easier to add custom TNT blocks (#6290) 2019-11-20 19:19:34 -08:00
DaemonUmbra
d8d70e8b35 Add tags supports_beacon and supports_conduit and modify Beacon and Conduit to use these tags (#6266) 2019-11-20 19:15:13 -08:00
bl4ckscor3
5d62261082 Fix RawMouseEvent not being cancelable (#6310) 2019-11-12 15:12:25 -08:00
DaemonUmbra
f4a85e5f03 Fixed an NPE caused by missing registries. (#6292) 
Missing registries in this case being registries renamed without proper remapping or created by mods that were removed.
 2019-11-05 11:10:32 -08:00
DaemonUmbra
7f8b30aed3 Made the slash optional in fml confirm/cancel. (#6282) 2019-11-05 11:10:19 -08:00
LexManos
b8ea220925 Fix registry snapshots not reading aliases correctly. Closes #6298 2019-11-05 11:10:03 -08:00
cpw
1e1644f6d4
A few tweaks to things. Make the mods command a bit better, make the 
IndexedMessageCodec actually log which network channel it got back packets
on. Also, improve the custom directorymodlocator with actual custom names,
finally, allow up to 99 log rollovers, up from 7 default (this means a
repeatedly crashing server is less likely to roll out the log of the first
crash).

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-11-03 12:33:07 -05:00
tterrag
fab4ce894a Fix BlockStateProvider#horizontalBlock emitting rotations >=360 2019-11-01 17:10:06 -04:00
Camilo
f2f7ab80f6 Added some more biome types to BiomeDictionary (#6250) 2019-11-01 11:26:08 -07:00
DaemonUmbra
c044f3b0c4 Replaced getTypes invocation in ensureHasTypes with a direct reference to types, preventing infinite recursion (#6284) 
The direct reference is checked via ternary and reports if the set is empty, this is likely to result in log spam if modders don't assign types to their biomes
 2019-11-01 11:24:00 -07:00
tterrag
ebd463e92f Fix lang generator escaping newlines, add lang generator test 2019-10-30 15:25:03 -04:00
tterrag
69ba974960 Escape control chars and unicode when writing out lang datagen 2019-10-30 15:01:25 -04:00
tterrag
dbee8a24d8 Allow LanguageProvider helpers to accept suppliers of subtypes 2019-10-28 21:23:01 -04:00
tterrag
2373dab982 Expose private helper methods in BlockLootTables to subclasses 2019-10-28 19:28:16 -04:00
cpw
862289cf56
Handle logging during shutdown better on the server, by not 
closing the logfile before the server itself has shutdown.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-26 16:55:15 -04:00
cpw
e3068d7db2
Fix NPE in modlauncher when there is no mods dir yet. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-25 07:27:55 -04:00
DaemonUmbra
29ad7a39de Fixed NPEs caused by uninitialized lists in ModDirTransformerDiscoverer (#6277) 2019-10-24 23:06:27 -07:00
LexManos
3484200f80 Make Loot Table data generators more reusable for modders. 2019-10-24 22:09:08 -07:00
tterrag
acaa470dea
Add Blockstate and Model data providers (#6241) 2019-10-24 22:33:24 -04:00
cpw
3bf6c17bb8
Allow pack locators to load from the mods folder. 
Regular mods are now automatically de-duped based on the version number -
the highest version file of a "root mod id" is now selected automatically.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-23 21:30:17 -04:00
AfterRebelion
ca8a418364 Exclude Cobblestone slabs and wall recipes (#6230) 2019-10-22 15:31:35 -07:00
Wyn Price
6422310453 Fixed forge rendering pipeline and shape based light occulsion. (#6178) 2019-10-22 15:29:27 -07:00
cpw
c8967fa176
Expose the registrationchange event to simple channel (not that anyone should care, but who knows?) 
Also, Context.getNetworkManager should have been public. Derp.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-18 09:32:44 -04:00
cpw
dc664ba597
Add in an event to expose the standard MC channel stuff to network 
event channels that care about such things. Mods using simplechannel
don't need to care.

Also, put a sync wrapper around crashreportextender, so it doesn't
die sometimes randomly during startup.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-17 20:28:39 -04:00
David Quintana
ec3e8c2039 Fix vanilla models with parents not loading properly from forge blockstates. 2019-10-16 23:11:23 +02:00
ichttt
6c8342b74e Fixed loading error/warning screen not showing (#6218) 2019-10-15 14:59:41 -07:00
JoJoModding
8adc546d92 Allow mods actually to have their own usable config gui (#6208) 2019-10-15 14:56:27 -07:00
iChun
25a9e477cb Fix error logging in FMLUserdevLaunchProvider.setup (#6206) 2019-10-15 14:55:45 -07:00
ichttt
c98abaaa42 Fix some config checks still using the old fields (#6193) 2019-10-15 14:54:47 -07:00
Justin
a328364999 Fix mod info panel rendering incorrectly on some systems with HiDPI displays (pesky macs) (#6170) 2019-10-15 14:31:41 -07:00
FireController1847
94cbf72e39 Re-add PlayerGiveXpEvent & PlayerChangeLevelEvent (#6165) 2019-10-14 10:37:44 -07:00
Wyn Price
5978670897 Fixed IModelData not being cleared when tile entity is removed (#6115) 2019-10-10 23:07:52 -04:00
tterrag
940bbc4e91 Better sanity checks in ModelDataManager 2019-10-10 16:02:36 -04:00
Vincent Lee
7070bd0340 Make customClientFactory optional again (#6191) 2019-10-10 11:23:27 -07:00
David Quintana
5e9380ab85
Fix forge blockstates and custom model loading (#6154) 
* Reimplement forge blockstates variant through the use of a pseudo-model that handles the model loading, retexturing, custom data, etc. on behalf of the blockstates loader. This model gets injected into the model registry with an autogenerated unique name, to not collide with other model locations.
* Fix model loaders not being properly initialized by calling the reload method from the loader register function. In 1.12, registering a reload listener caused the listener to be called right away from the register method. This is not true anymore.
 2019-10-08 00:18:29 +02:00
cpw
9c759294c6
Add a super early GUI for showing pre-game launch messages from FML. NOTE: this cannot show on MAC because MAC can't handle 
off-thread GUIs in any way shape or form, and we need the main thread to do real work.

Fix forge fading in wrongly.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-05 17:03:02 -04:00
David Quintana
b294f4d894
New round of fluid system fixes: (#6175) 
- Fix race condition lazy-initializing flowing fluid block data.
- Fix typo in ItemTextureQuadConverter that prevents certain animated textures from being used in the fluid bucket.
- Fix calls to onContentsChanged in FluidTank.
- Fix FluidUtil.tryEmptyContainer logic when simulating.
- Fix EmptyFluidHandler.fill returning the wrong number.
 2019-10-05 19:49:26 +02:00
tterrag
ca980a56bc Combine all hidden mod resource packs into a single sortable pack 
Fix mod datapacks sorting under vanilla
 2019-10-04 18:36:33 -04:00
cpw
8482293b40
Split server and client side pack locators apart and move them to their 
respective behavioural components. This should facilitate fixing the
server pack data pack ordering, as well as other new features of mod
resource packs.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-04 15:24:15 -04:00
LexManos
dc5a06aab4 Fix dimension types being incorrect when connecting to a non-Forge server. Closes #6203 2019-10-04 10:36:50 -07:00
cpw
35bd69808c
Fix the stupid derp that broke singleplayer dims. Don't send the dim packet 
to the local client - it is not needed because obviously not. Seems to have
fixed the problem. Probably infinity new bugs by this.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-04 07:27:11 -04:00
tterrag
4f12261080 Move OnlyIn patches on DyeColor to SAS file 
Also fix broken cobblestone stairs recipe
 2019-10-04 02:26:54 -04:00
cpw
48735c3946
Properly propagate the DimensionType information from server to client 
at client connection time. This means the client now knows about the
dimensiontype properly and can access the ModDimension information on
the client.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-02 21:54:02 -04:00
Ruben Taelman
c985225d0c Fix FluidTank with empty contents throwing error if drained (#6196) 2019-10-01 19:57:05 -07:00
tterrag
78cdb705d4 Allow structure processors to process entities 2019-09-28 18:18:24 -04:00
cpw
136452840d
Remove forced ANSI terminal - it breaks the Eclipse terminal output. 
As a result, we can now support coloured log output again, by default.

Regen run configs to get the change (you should do this every update, you
know :D)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-28 16:05:50 -04:00
tterrag
b3631b707c Make patched-in StairsBlock constructor public 
Also fix supplier generic being too narrow in DeferredRegister#register
 2019-09-27 17:56:30 -04:00
cpw
f4bab8b8c1
Integrate modlauncher changes for mixin. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-27 17:42:24 -04:00
tterrag
2392a4c184 Fix new flower pot ctor not being usable with deferred register 2019-09-25 18:01:43 -04:00
tterrag
476b7056fb Usability improvements to RegistryObject/DeferredRegister 2019-09-25 18:01:39 -04:00
tterrag
d510978446 Add constructor to StairsBlock that accepts a state supplier 2019-09-24 21:05:23 -04:00
tterrag
01a862db30 Fix sea level not being available on client, move hook to Dimension 2019-09-23 13:08:26 -04:00
tterrag
dfbd61436b Add template arg to StructureProcessor#process 2019-09-22 23:35:12 -04:00
LexManos
48cf910626 Bump binpatcher and jarsplitter versions to address Java differences on older JDKs. 2019-09-22 17:30:29 -07:00
tterrag
571ecafdbc Fix type bound on GameRegistry.findRegistry being too narrow 2019-09-21 16:19:23 -04:00
tterrag
dee844e232 Add IExtensibleEnum#init, extend FillerBlockType/PlacementBehaviour 2019-09-21 15:57:32 -04:00
cpw
07bcff5067
Tag the deprecation of DeferredWorkQueue. I think this is causing confusion 
as to scope. Its functionality will be tied to the events in future -
so mods can request the deferred work through methods on the Mod Lifecycle
events directly. The API will be coming soon.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-17 21:41:08 -04:00
cpw
7fa3594c04
Fixed the problem where an error would cause the main thread to continue 
even though there were still parallel threads running. Also, handle exceptions
in the AutomaticEventSubscriber rather than leaking them to the Parallel processor.

Actually closes #6148
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-17 21:41:08 -04:00
tterrag
6fda1e968d Make FlowerPotBlock extensible and reusable for mods 
- Change static lookup map to an instance variable
- Add an instance variable for the "empty pot" for the current block
- Keep one instance of the lookup map between the empty pot and all its full versions
- Convert everything to use delegates
 2019-09-17 19:57:58 -04:00
Brennan Ward
af8074cc39 Post tag event directly from reloader thread (#6164) 2019-09-17 14:39:36 -07:00
cpw
71a4828809
Some tweaks around the code base. A functional consumer for networking - return a bool from your consumer function, rather than setPacketHandled. 
Tweak the server modloading behaviour to try and be a bit clearer that a mod errored.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-16 20:14:25 -04:00
Brennan Ward
79ce18ac3e Update furnace fuels to not recreate it's list every query, and update when tags are reloaded. Add Tag update events. (#6140) 2019-09-16 14:04:32 -07:00
Nightenom
bb83e11a7c Maintain default behavior for Item#canPlayerBreakBlockWhileHolding() (#6128) 2019-09-16 13:36:43 -07:00
MrCrayfish
f4215d121c Reimplemented "MouseEvent" as RawMouseEvent for 1.14.X (#6144) 2019-09-16 13:03:10 -07:00
LexManos
3cc76a3f60 Fix Entity.getPersistentData function name. Closes #6131 
Bump spec version for first 1.14.4 RB.
 2019-09-12 09:12:30 -07:00
David Quintana
58335d7bc0
Minor fixes to the fluids (#6150) 
* Fixed vanilla rendering of fluids to take into account the alpha bits of the color, and fix usages accordingly.
* Fixed missing texture derp.
 2019-09-12 17:33:19 +02:00
David Quintana
b0c9d7cce9
Some (sadly breaking) improvements to the Fluid API (#6110) 
* Some (sadly breaking) improvements to the API, after feedback and concerns provided by users:
  - Moved calculation of the translation key to the FluidAttributes constructor, so that builders can be shared between still & flowing sub-fluids.
  - Moved biome-based coloring to a dedicated FluidAttributes.Water variant, which is not used by default.
  - Added logic to automatically gather fluid textures into the list of textures to bake.
  - Patched BucketItem and FlowingFluidBlock to avoid eager access to the fluid objects.
  - Added a ForgeFlowingFluid class, as a more user-friendly way to construct a new FlowingFluid.
 2019-09-11 16:00:32 +02:00
LexManos
281ef5a152 Add new DeferredRegistry helper, and change RegistryObject to update when overrides are registered. 2019-09-10 16:02:07 -07:00
tterrag
3dce85c49f Properly fix missing attribute issue, add vanilla bug ID 2019-09-08 02:23:16 -04:00
tterrag
f777aba227 Remove StructureArgument to work around vanilla issue, clean up custom arguments 2019-09-08 02:01:17 -04:00
tterrag
fc5573333d Make /locate command support modded structures 2019-09-07 01:09:42 -04:00
tterrag
55fe7c470f Make STRUCTURE_FEATURE registry a slave map of the FEATURE registry 
Also convert Feature.STRUCTURES to a slave map
 2019-09-06 23:42:19 -04:00
LexManos
3ef1d6919c Fix REGISTER packet encode/decode issues. 
Changed ForgeConfig values to return the default value if the config is not loaded, and exposed the value objects as a internal config.
 2019-09-05 15:38:14 -07:00
LexManos
e1863383ff Fix naming conflicts with official names. 2019-09-04 22:33:17 -07:00
LexManos
4dc34b7d5b Fix item used stat not triggering properly on last item in the stack. 2019-09-03 19:58:57 -07:00
LexManos
2c8c022034 Add a bunch of tags from the omnibus. 
Fix test imports. And update patches for line numbers.
 2019-09-03 18:51:09 -07:00
bl4ckscor3
b5b43a5a36 Add spawn reason to spawn events (#6096) 2019-09-03 15:15:48 -07:00
Wire Segal
c09fe57031 Add collisionExtendsVertically hook to allow modded blocks that extend collision into the block above similar to fences. (#6092) 2019-09-03 14:50:27 -07:00
mcenderdragon
3f089e3add Added gravity as attribute to Entities (#5630) 2019-09-03 13:20:44 -07:00
ichttt
ddb90a69d3 Fix CME on chunk unload in FarmlandTicketManager (#5998) 2019-09-03 12:59:35 -07:00
cpw
bdce8d0494
Add a modfolderfactory. Fix up login payload exposure. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-01 14:40:39 -04:00
cpw
734a3d76aa
Peel IModLocator into the SPI package and extract a small IModFile 
interface as well. This allows building external IModLocator
implementations.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-01 11:31:09 -04:00
cpw
a4aa85259e
Add in some client only player connectivity events. Closes #5536 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:46 -04:00
cpw
ea1c7a7339
Add in MC REGISTER nonsense. Shut up #5730 
Tweak network a bit to fix initialization order stupidity. (Constants don't
load classes!)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:46 -04:00
Tobias Hotz
185f7344fa
move default log level for debug file to debug instead of trace, and remove millis from console and GUI. Also remove unused config xmls 2019-08-31 13:55:46 -04:00
GirafiStudios
26e4bf92a0
Added getters for FMLPlayMessages.SpawnEntity 2019-08-31 13:55:46 -04:00
cpw
68cb017be1
Move indexFor and biConsumer into FMLHandshakeHandler and expose them publicly, so mods can add additional 
login messages. Closes #6087

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:45 -04:00
David Quintana
68ff1afac1
Hookup BlockEvent.FluidPlaceBlockEvent (#6103) 2019-08-31 14:15:08 +02:00
cpw
0d448a5e4f
Update libs to 1.0 versions, bump grgit, and fix tag search behaviour that resulted. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-29 23:39:49 -04:00
David Quintana
d9f6659f2c
Fluid rework derp fixes. (#6098) 
* Fix nulls returning from non-null methods, and null-check of non-nullable values.
* Fix missed computation of the isEmpty flag in FluidStack
* Cleanup getAmount/isEmpty calls.
* Remove redundant suppliers. That info is readily available from the vanilla Fluid / FluidState.
 2019-08-29 21:09:42 +02:00
Vincent Lee
bae2ee0420 Minor model system cleanup/documentation (#6089) 2019-08-28 21:33:49 -07:00
DaemonUmbra
aa38f62bae Change fml.modloading.brokenfile.optifine to not imply that Forge is responsible for Forge-Optifine compatibility. (#6080) 2019-08-28 21:32:33 -07:00
ichttt
06c3e255b3 Add a config comment that lists the available constants of enums (#6079) 2019-08-28 21:28:21 -07:00
Daniël Goossens
c83d4d29e4 Added new InputEvent.MouseScrollEvent, fixes #5811 (#6037) 2019-08-28 21:13:31 -07:00
Brennan Ward
ee1c06085b Add Villager Trading Events (#6016) 2019-08-28 20:34:07 -07:00
BlakeBr0
336d53b692 Strip side annotations from CropsBlock.getSeedsItem (#6013) 2019-08-28 20:14:41 -07:00
Wyn Price
95c58ba75c Updated constants to 1.14 (#6012) 2019-08-28 20:13:47 -07:00
Vincent Lee
838998b885 Add particle factory registration event (#6018) 2019-08-28 18:42:17 -07:00
David Quintana
a9b3b48273 Make FluidStacks non-nullable, and implement some TODOs. 2019-08-29 03:18:42 +02:00
David Quintana
a788e8a475 Fix license headers so gradlew build is happy. 2019-08-29 03:18:42 +02:00
David Quintana
b7e1cc5f6b Fluid API rework (#5983) 
- Moved forge fluids into FluidAttributes companion object to the vanilla Fluid. By gigaherz
- Redesigned the Fluid API to be closer to the Items API. By King Lemming
Co-authored-by: King Lemming <kinglemming@gmail.com>
 2019-08-29 03:18:41 +02:00
LexManos
e784a7f606 Recipe system cleanup. (#6014) 2019-08-29 03:18:41 +02:00
ichttt
dd340b8ef2 Fix coremod not redirecting to the correct method (#6078) 2019-08-28 17:49:46 -07:00
LexManos
7deb479676 Fix blocks being placed in adventure mode. Closes #6085 
Add early error for setting invalid world directory. Closes #6084
Fix PlayerTickEvent not firing when dead, even if player isn't removed from world yet. Closes #6074
Fix PlayerDestroyItemEvent not firing for some cases. Closes #6067
 2019-08-28 12:57:25 -07:00
LexManos
1ab40e0b3f Fix Javac generics breakage. 2019-08-20 15:40:36 -07:00
LexManos
283c3d1664 Prevent worlds from unloading while players are in out-of-world states by tracking all worlds references by every player in the server's player list. 2019-08-20 15:31:08 -07:00
LexManos
5291ea7270 Add Argument serializer for ModIdArgument. EnumArgument can't as vanilla doesn't support extra data. 2019-08-20 15:29:26 -07:00
LexManos
0c1c1b65e1 Sort server.properties while writing. 2019-08-20 15:27:31 -07:00
LexManos
dc0eacb80f Fix Configs not generating correctly on first load Closes #6069 2019-08-19 19:45:32 -07:00
Vincent Lee
8c04651301 Add hook to load custom mrls/rls not attached to a block or item. (#6010) 2019-08-15 11:03:57 -07:00
kirderf1
5e392e3300 Make DimensionManager.SavedEntry save sky light consistently (#6019) 2019-08-15 10:17:28 -07:00
cpw
4323c6d845
Grrr. Stupid error. Sorry lex: I fixed it. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-05 08:56:42 -04:00
cpw
81ec8b99ac
Actually reload config when it changes on disk. Closes #5541 and #5959 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:37:43 -04:00
cpw
1af7b7603d
Move fml's PlayerEvent and TickEvent to forge. Update 
`import net.minecraftforge.fml.common.gameevent.PlayerEvent;`
to
`import net.minecraftforge.event.entity.player.PlayerEvent;`
and
`import net.minecraftforge.fml.common.gameevent.TickEvent;`
to
`import net.minecraftforge.event.TickEvent;`

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:34:14 -04:00
cpw
0fd8fa2211
Bump modlauncher to 3.2.x. Add a sender modid and document IMC. Closes #5746 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:19:02 -04:00
cpw
5048739b7f
Turned minecraft into a proper Mod, with a "dummy" language provider. 
Also fixed the "translations" not being available early if an exception occurs
by force loading the forge and MC ones. Closes #5984

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 20:16:01 -04:00
DaemonUmbra
44f3f9e2d0 Fix a crash I caused by misunderstanding formatToString (#6007) 2019-08-02 18:48:46 -07:00
its_meow
50e411b82a Add piston events (#5798) 2019-08-02 14:12:21 -07:00
its_meow
a8a0306f98 Fix AT for EntitySpawnPlacementRegistry.register 2019-08-02 14:06:05 -07:00
desht
19b7d26bc2 Make ParticleManager.IParticleMetaFactory public (#5926) 2019-08-02 14:05:32 -07:00
JoJoModding
c7940e70ed Add button to open mods folder (#5986) 2019-08-02 14:00:54 -07:00
DaemonUmbra
58ede2c80a Change ModLoadingException to display ModID instead of ModInfo instance identifier. (#5999) 2019-08-02 13:44:56 -07:00
Gamebuster
9a50c208f0 Fixed Buttons in the error screen are incorrectly rendered if they are extremely long Closes #5687 (#5924) 2019-08-02 13:42:58 -07:00
Gamebuster
7acb380ba8 Fix LazyOptional throwing NPE to consumers when owners null. (#5772) 2019-08-02 13:42:13 -07:00
LexManos
48fa2f458c Make Villager profession unlocalized name use modids when not 'minecraft' Closes #5977 
Fixed trees able to be generated through water. Closes #6000
Change Block#toString to use getRegistryName instead of getNameForObject Closes #5937
Allow Cooking Recipes to deserialize results with stack sizes. Closes #5960
 2019-08-02 13:37:02 -07:00
LexManos
318fc6ffe8 Fixed DimensionType.getRegistryName() returning null Closes #5992 
Fixed RegisterDimensionEvent not firing for new worlds. Closes #5987
 2019-07-31 22:43:46 -07:00
LexManos
b009cedc0c Introduce new Side Annotation Stripper system to semi-automate the shipment of Sided methods and cleanup patches. 
New forge:checkSAS task to validate this config file. Closes #5995
 2019-07-31 21:15:39 -07:00
ichttt
c6dd475610 Move world unload patch to tick function to prevent duplicate unloading, fix log message in dim manager, fix javadoc for unload method (#5964) 2019-07-30 16:39:05 -07:00
cpw
5d33697cb1
Fix naming for dev launch providers - they're in MCP.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-29 20:19:50 -04:00
cpw
ae09fc6b6d
Register a config command. Currently one subcommand: showfile, which 
when passed a modid and a type (CLIENT, COMMON or SERVER) will display
a link in the caller's chat to open that file in the OS file viewer of choice.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-28 21:09:15 -04:00
cpw
cd826f7bcf
Load default configs from the defaultconfig directory by default. (Can 
be overridden in the fml.toml config file if desired).

Will load any type of config tracked file from there - client, common, server
or custom tracked file. This means you can ship defaults for your pack
in a defaultconfig directory. I am thinking about ways to force a specific
config override for an existing config.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-28 13:44:18 -04:00
LexManos
1918148b8e Fixed network ticking player entity while it is dead. And explicitly prevent overworld from unloading. Closes #5978 2019-07-27 02:35:06 -07:00
cpw
e17714583f
Crash report extended to show ModLauncher FML and Forge data. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-26 20:02:21 -04:00
cpw
4c05c63a04
Fix potion transformer to look up the right name depending on context. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-26 00:35:03 -04:00
cpw
0bdc2d04b4
Added a coremod, shush, don't tell Lex. 
Seriously, this is how to do targeted changes to specific classes.

In this case, adding a fieldtomethod redirect for EffectInstance.potion
to allow substitution.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-25 23:02:05 -04:00
LexManos
731e1920d2 Fix @ObjectHolderRegistry not properly detecting vanilla class level references. Closes #5958 2019-07-25 17:59:08 -07:00
David Quintana
ae3d002ac6 Fix & Improve state comparison when checking vanilla block replacements (#5922) 2019-07-22 19:23:20 -07:00
cpw
c90b1732e9
Fix objloader registering at wrong time. Closes #5847. Added test 
class as suggested in the issue.

Note: most tests are commented out at the present time, pending
rework. Tests that work, work.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 21:04:00 -04:00
cpw
9d82d822db
Fix error when ModsDiscoverer visits a non existent mods dir. 
Closes cpw/modlauncher#30

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:37:54 -04:00
cpw
186d91c03f
Merge branch 'pull/5948' into 1.14.x 2019-07-20 19:35:26 -04:00
cpw
eec5809097
Realms' removal has removed the need for additional jar transformation. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:33:54 -04:00
cpw
4582a29ec1
Make I18N format errors less spammy, also remove single apostrophes from 
current translations in en_us.json. Other langs may still have problems.

Closes #5952
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:14:17 -04:00
ichttt
bef52c945b Fix forge 1.14.4 startup in obfed enviroment (#5955) 2019-07-20 12:59:23 -07:00
cpw
27afdc8a27
Provisional update to 1.14.4. Missing a lot of playerinteractionmanager patches because everything moved and I'm tired. 
Fix up immediate problems.

bump to 28.
 2019-07-20 00:35:40 -04:00
cpw
eff42f6066
Update mappings to 20190719 in prep for 1.14.4.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-19 11:55:30 -04:00
Barteks2x
b99453d568 Fix RegistryObject when used with generic registry entry classes 2019-07-19 12:06:16 +02:00
LexManos
cb21e95e0b Change default BrewingRecipe to use an Ingredient for the input instead of ItemStack. Closes #5944 
Add AT for GameRules.register Closes #5946
Fix Forge Blockstate loader model path is inconsistent with vanilla blockstates Closes #5892
Fix client crashing when opting not to load a world when there's missing blocks Closes #5886
 2019-07-18 14:13:20 -07:00
its_meow
5cf2af569f [1.14.x] Fix text positioning issues caused by scaling loading screen (#5932) 2019-07-16 12:41:21 -07:00
LexManos
a46b7cb67a Fixed PlayerSleepInBedEvent pos is always null Closes #5936 
Fixed decompile error causing Endless Loop in ModelBackery if model errors exist.
Fixed NPEs related to teleporting players without portals.
 2019-07-16 11:52:51 -07:00
LexManos
3d78f30d18 Add simple concurrency protection to Server world list. Closes #5938 and #5739 2019-07-16 09:59:33 -07:00
tterrag1098
0a7f5ff9fa Rework GuiModList mod info to use custom scrolling panel impl 2019-07-10 20:13:33 -07:00
LexManos
ce28c5794d Cleanup Forge's Access Transformer, and add ATs for Block.Properties#noDrop, and AxeItem/PickaxeItem. Closes #5866 and Closes #5921 2019-07-10 17:39:19 -07:00
LexManos
2cc264645b Implement Item.isRepairable in Crafting and Grindstone. Closes #5917 2019-07-09 18:02:47 -07:00
LexManos
983e0a93db Re-implement state.onBlockExploded() Closes #5914 2019-07-09 17:07:09 -07:00
Vincent Lee
d88e4fbf36 Add general damage hook for items. Closes #5502 (#5670) 2019-07-08 20:43:02 -07:00
LexManos
f79da3edf7 Fix syntax error in IRenderHandler. 2019-07-08 20:14:41 -07:00
LexManos
8742d74e93 Pass tick counter to custom render handlers (#5744) 2019-07-08 19:55:47 -07:00
Cadiboo
ff80ab6a23 Fire Loading event (#5795) 2019-07-08 19:49:47 -07:00
Dirk "YouDirk" Lehmann
8c37d642fe Fix logoFile not working properly (#5775) 2019-07-08 19:49:31 -07:00
ichttt
06a30e9f23 Adds some explanatory javadocs and check world in ModelDataManager (#5762) 2019-07-08 19:47:18 -07:00
Antoine Lucas
650e7dc16e Add InputEvent documentation (#5698) 2019-07-08 19:47:06 -07:00
ichttt
d41fad51c2 Add IModelData to getParticleTexture (#5756) 2019-07-08 19:46:32 -07:00
ichttt
0463949ac3 Fixed BakedModelWrapper not delegating new methods (#5761) 2019-07-08 19:45:27 -07:00
Sargun Vohra
5f0fd4b706 Throw exception when a mod returns null from a dispatched capability provider (#5646) 2019-07-08 19:45:10 -07:00
Benjamin K
201c368325 Add isServer and isClient methods to LogicalSide (#5606) 
* Add helper methods to LogicalSide.

* Fix backwards docs.
 2019-07-08 19:44:35 -07:00
Cadiboo
3fe08f149d Added documentation to ObfuscationReflectionHelper adn deprecated index based functions. (#5893) 2019-07-08 19:44:21 -07:00
LexManos
61bea2bfda Fixed EntityJoinWorldEvent not being fired when player is added to ServerWorld. #5827 
Fixed wrong example path for the access transformer in the MDK build.gradle. #5891
Added getters for mouse x/y velocity and if the middle-mouse button is being held down. #5776
Modify issue template for better clarity. #5874
Fixed grindstone not using ItemStack-sensitive getMaxDamage. #5831
Added ParticleManager.registerFactory to Forge's AT. #5896
Fixed NPE in SidedInvWrapper when side was null. #5787
Moved EndermanEntity.setAttackTarget super call to allow LivingSetAttackTargetEvent the ability to override default behavior. #5778
Added field to make "Looking at" debug info maximum distance configurable #5714
 2019-07-08 18:42:12 -07:00
DaemonUmbra
f720140481 Disable Config Button when no mods are selected (#5905) 
Closes #5889
 2019-07-08 15:56:49 -07:00
Tedstar
66a2d38ab8 Fix MC-258 on mod list screen, enable sorting, minor tweaks. (#5846) 2019-07-08 15:50:05 -07:00
Cloudhunter
719f08ea5e Fix link applying to whole component in chat if component starts with link (#5909) 2019-07-08 15:46:49 -07:00
primetoxinz
765efc3c72 Update TextureStitchEvent.Pre to give access to the list of ResourceLocations that will be loaded as textures. (#5870) 2019-07-03 12:26:51 -07:00
LexManos
bc23c1ddb2 Add installer processor to deobfuscate Mincraft's Realms library. 
This task will processes the current realms library from the json, so the installer must be re-ran every time they update it.
 2019-07-03 01:08:20 -07:00
LexManos
358211ca66 Fix type cast issues in ForgeConfig values. Closes #5894 
Added config value set and save functions.
By default mod configs are auto-saved, so you do not need to call save unless you create your own Config object.
 2019-07-02 11:54:59 -07:00
cpw
c8e5007913
Remove legacy StartupProgress. 
Implement properly scalable progress thanks to @gigaherz. Closes #5863.
Implement API for pushing messages to the startup screen from mods.
Add memory display.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-30 23:48:54 -04:00
LexManos
13ae8e41ee Fix duplicate WorldEvent.Unload call in client key handler. 
Add recipe generator to replace vanilla recipes with Forge tags.
 2019-06-27 17:23:23 -07:00
ある
2c3183bdae Fix garbled "µs" (#5818) 2019-06-26 13:23:47 -07:00
LexManos
53349603e2 Fix fmluserdevdata not being a valid launch target. 2019-06-25 18:16:10 -07:00
LexManos
c284de366b Split userdev data entry point into it's own provider to fix duplicate mod issue. 2019-06-25 18:03:51 -07:00
tterrag
e81c330694 Fix configs correcting numeric values when the primitive type differs 
Fix configs with range not clamping the corrected value, and instead
just replacing with the default

Closes #5855
 2019-06-25 19:56:31 -04:00
Ben Staddon
790da699dd Fix item placement losing NBT data in creative mode (#5757) 2019-06-25 13:59:10 -07:00
MajorTuvok
7915397377 Add extension to write entry id's to PacketBuffer's (#5812) 2019-06-25 13:55:24 -07:00
Someone
b2a5d34679 Add isItemValid check for ItemStackHandler (#5850) 2019-06-25 13:50:08 -07:00
Tedstar
9701148819 [1.14.x] Replace dye items in Forge tags. (#5843) 2019-06-25 13:44:54 -07:00
bl4ckscor3
b8131e6e67 implement Ingredient.getSerializer for custom ingredients (#5813) 2019-06-25 10:25:33 -07:00
LexManos
f4598a97f7 Fix vines and scaffolding not being climbable. 
Fix powered rails not spreading power correctly. Closes: #5854
 2019-06-24 20:05:50 -07:00
LexManos
ff0bb8c83c Initial 1.14.3 update. 2019-06-24 19:01:03 -07:00
cpw
e5acea60e6
Fix too many registries being sent from server to client 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 19:54:55 -04:00
cpw
0a819da0e7
Reorganize sided event dispatch slightly. Dispatch model and entityrenderer 
functions at more appropriate times.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 16:01:20 -04:00
cpw
bdad2af27b
Tweak for lowercase handling. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 14:51:58 -04:00
cpw
60513446fa
Merge branch 'pull/5793' into 1.14.x 2019-06-23 14:42:32 -04:00
cpw
be415091cd
Fix crash when crashing during modloading. Fix GuiModList being weird. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 14:37:05 -04:00
cpw
9067dbf6a0
Process the main modloading work on the async thread, but still 
do deferred work on the main thread by passing in the executor.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 12:26:45 -04:00
tterrag
359be1a880 Clean up config comments, make comment array nonnull 2019-06-23 02:57:00 -04:00
tterrag
99624bf3b5 Fix forge event bus never starting up 2019-06-23 02:17:51 -04:00
tterrag
252b94a110 Automatically add range to config comments 2019-06-23 02:17:28 -04:00
cpw
448d996a45
First pass of adding text to the loading progress UI. It deliberately uses the very primitive STB 
generated font, so can only render basic ASCII text, and also only renders pre-defined strings,
as translations aren't available either.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 23:39:00 -04:00
JoJoDeveloping
b9e5dfd286
Add mod failure identification 2019-06-23 03:14:05 +02:00
cpw
d966746fbf
Moved some events to the Mod's event bus. You'll need to update which bus 
you're listening to for these. (The Mod event bus is the only one actively
dispatching events during model loading).

ModelRegistryEvent, ModelBakeEvent, TextureStitchEvent.Pre, TextureStitchEvent.Post, ColourHandlerEvent.Block, ColourHandlerEvent.Item

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 20:36:07 -04:00
cpw
89006458a2
Fix stupid bug introduced with the refactor.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 19:08:49 -04:00
cpw
389bc1ecea
Tidy up mod loading a bit more, and also crash if the [[mods]] list isn't 
a list.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 12:52:22 -04:00
cpw
1e0437208b
Merge remote-tracking branch 'origin/1.14.x' into 1.14.x 2019-06-22 12:33:46 -04:00
cpw
256bd01e0c
Fix server side loading, tweak mods command. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 12:31:27 -04:00
tterrag
ef7b035f02 Fix ModelDataTest 2019-06-21 23:35:08 -04:00