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

2529 commits

Author SHA1 Message Date
Edwin Mindcraft
7fa42ca064
Use IProperty#getName when generating blockstate jsons (#6582) 
Close #6520
 2020-05-15 13:28:10 -04:00
David Quintana
c23ea1e733 Model system fixes: 
- Add "origin" key to determine what origin to use. This will default to the existing (broken) behaviour to avoid breaking changes.
- Fix interaction of transforms with variant transforms (transformation ordering).
- Fix OBJ loader ignoring "diffuseLighting" attribute from the json.
  This attribute will continue not being used if "ambientToFullbright" is on (default) to avoid breaking changes.
 2020-05-15 19:25:26 +02:00
LexManos
0f48e851a3 Fixed typo in registry alias writing causing infinite loop. Closes #6689 2020-05-15 09:38:20 -07:00
ichttt
29396b6235
Fix server config directory remaining locked when integrated server is shut down. (#6644) 2020-05-12 15:11:45 -07:00
Alex Thomson
4ce32c3663
Fix exclusion of coremods not filtering correctly when the mods directory is a symbolic link. (#6600) 2020-05-12 15:02:01 -07:00
ShetiPhian
e35c5c9ae4
Fixed FluidTank.drain calling onContentsChanged when simulating (#6684) 2020-05-12 14:17:17 -07:00
covers1624
99d8fa1a6b
Fix IForgeBlock.removedByPlayer not firing on the client. (#6638) 2020-05-11 15:28:38 -07:00
Jamie Mansfield
fa01ba3221
Fixed informational /forge commands being repeated to all ops when logging is enabled. Closes #6330 2020-05-06 13:49:15 -07:00
Jamie Mansfield
766019e1fc
Fix ModListScreen escape key not matching done button behavior. Closes #6672 2020-05-06 13:41:43 -07:00
David Quintana
a7e4cdcc49 Patch the bucket logic to not hardcode some checks to WATER. Fixes not being able to place custom fluids into modded fluid-loggable blocks that accept fluids other than water. 2020-05-06 13:30:20 +02:00
David Quintana
6551ccc247 Avoid discarding the bottom 4 bits of the lightmap coords. It turns out vanilla relies on those bits. Fixes some blocks being darker than they should be in certain circumstances. 2020-05-04 01:13:43 +02:00
Jacob Smith
c3e4d303e9
Fix issue with providing a null ItemStack to onPlayerDestroyItem (#6633) 2020-05-03 13:48:17 -07:00
Brennan Ward
9e763a8334
Allow overriding of tool level requirements when harvesting a block, via the HarvestCheck event. (#6632) 2020-05-03 13:40:34 -07:00
Richard Freimer
035c01e222
Fixed Hoppers not inserting fully into custom contains with slots that can hold more then max stack (#6631) 2020-05-03 13:34:26 -07:00
Corey Frenette
1fa88ebd56
Fixed ChunkDataEvent.Save being fired with a null world if chunk isn't fully generated when unloaded. (#6628) 2020-05-03 13:27:06 -07:00
Dion van der Hak
a377727ac4
Added missing localization for swim speed, and reach distance attributes (#6585) 2020-05-03 13:13:56 -07:00
Vincent Lee
385fb64ab7
Allow colors of tooltip to be specified in GuiUtils.drawHoveringText tooltip methods (#6579) 2020-05-03 13:09:28 -07:00
ichttt
f2216f4e25
Fix config comments referencing disallowed enum values. (#6542) 2020-05-03 12:56:47 -07:00
David Quintana
0fc1ea01d1 Remove redundant call to modifyLoot. Closes #6657 2020-04-28 19:22:48 +02:00
tterrag
ea23cd4779 Fix various issues with the loading screen and datagen 
Fix NPE on datagen startup
Fix early loading GUI hanging and never terminating after datagen
Add loading GUI messages for datagen
 2020-04-28 00:00:45 -04:00
Take Weiland
903a400132
Fix BackgroundScanHandler crashing on servers (#6660) 2020-04-27 11:06:34 -07:00
tterrag
9d8817b5db Rename window icon image to avoid conflict, fix not using vanilla icon 2020-04-27 01:09:34 -04:00
LexManos
746d702058 Fix resource packs not being sorted properly. Closes #6287 2020-04-26 20:05:56 -07:00
LexManos
3c5728f070 Fix Automatic Event Subscriber not detecting mod id defaults, and fix test mods. 2020-04-26 19:04:37 -07:00
cpw
8c8ef2d9e1
Use forge logo as short term window Icon, fix Buffer cast problems for new JDK stupid. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-04-26 21:42:18 -04:00
cpw
6a25490d7f
Handle message display a bit better, try to make the UI tick a bit better.. Still a problem with 
a modelbake right at the end, happening on the window flip.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-04-26 21:03:43 -04:00
RogueLogix
6a0b16817d Move ClientVisualization to secondary thread 2020-04-26 16:06:44 -07:00
RogueLogix
677e2104a0 move handOffWindow down near start() 2020-04-26 15:41:53 -07:00
cpw
438c969fef
merge early startup into main window if used. It seems to work well.. Also ticks window on main thread, so mac compatible now. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-04-26 18:24:48 -04:00
LexManos
03c2a3d3a8 Fix potential NPEs in RegistryObject.orElseThrow/isPresent/ifPresent Closes #6647 2020-04-24 19:18:57 -07:00
David Quintana
9a6d1c390e Add tickRate setter to the ForgeFlowingFluid Properties builder. 2020-04-23 14:57:06 +02:00
cpw
0512a47eba
Fix recursion mess in PlayerAdvancement loading, by using an alternative based on a toposorted list of all advancements. 
It seems to be fully equivalent in testing, but there may be corner cases, so there is a config to disable, though disabling
may break servers, especially those chunkloading fake players.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-04-19 21:36:44 -04:00
LexManos
5a552b9f8d Fixed dev time compilation using J9+ producing incorrect bytecode. 2020-04-14 23:54:32 -07:00
David Quintana
aa5b9d12ea
Add "type" field to global loot modifier jsons. (#6554) 
* Add "type" field to global loot modifier jsons and fix tests.
To avoid binary breaking, "type" defaults to be the same as the filename.
* Fix license headers.
 2020-04-12 21:27:11 +02:00
tterrag
a3b1007633 Fix child annotations not inheriting member name, cleanup 2020-04-11 01:57:40 -04:00
tterrag
bdd0af5280 Fix element type of scanned child annotations 2020-04-11 01:19:25 -04:00
Patrick Ocampo
5e554530ac
Fixed PlantType not extending IExtensibleEnum, Closes #6286 2020-04-08 17:17:38 -07:00
tterrag
c359a38d9f Improve performance of VertexBufferConsumer by inlining element locs 2020-04-07 21:44:29 -04:00
tterrag
d84a88d78d Revive forge lighting pipeline, disabled by default for now 
Remove a lot of light value convolution by using 0..1 for nearly everything
Fix a lot of TODOs that are needed for the lighting pipeline to function
Potential fix for #6425
 2020-04-07 21:44:15 -04:00
tterrag
cf9b1b2193 Fix Tag serializing empty optionals, improve RegistryObject error msg 2020-04-05 00:48:56 -04:00
tterrag
25605505d5 Remove SideOnly from WoodType methods 2020-04-04 15:35:41 -04:00
LexManos
0d2a0deef3 Cleanup IForgeTagBuilder code style. 2020-04-01 11:34:36 -07:00
tterrag
b6dc5381ca Move global loot test data files out of generated folder 2020-03-31 20:15:55 -04:00
tterrag
559bacbd98 Add support for optional tag values to Tag.Builder 
Add optional tag values to data gen test
Fix data gen test not running by correcting gui_light value
 2020-03-31 20:15:09 -04:00
tterrag
db3d202c4e Deprecate ModelBuilder#gui3d, add ModelBuilder#guiLight 2020-03-30 00:15:08 -04:00
naqaden
2f5172f907
Add renderer to RenderNameplateEvent (#6562) 2020-03-27 16:22:01 -07:00
hnOsmium0001
fcee09cab2
Fix ownership leak in ItemStackHandler (#6580) 
- Triggered by invoking ItemStackHandler#extractItem with `simulate=true`
 2020-03-27 16:10:21 -07:00
cpw
3e48066021
Add a progress message for atlas textures. Fills a big time gap on bigger packs. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-03-20 17:34:46 -04:00
LexManos
52b8070692 Fix Forge's tps and gen commands. 2020-03-15 16:27:58 -07:00
LexManos
23541ab175 Update gradle wrapper 
Update MCPConfig to version that bypasses javac compiler bugs
Fix Global loot test compile errors.
 2020-03-15 13:55:03 -07:00
tterrag
c7a17946a5 Fix loading text not rendering after mojang logo appears 2020-03-15 03:39:04 -04:00
tterrag
208ca23515 Fix loading GUI corrupting matrix state 2020-03-15 03:27:43 -04:00
cpw
6329c0fcf2
Somewhat restore the loading screen overlay. It seems that once the mojang logo and progress bar 
start running, I can no longer write to the window, even though I am obviously trying to..

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-03-14 23:28:45 -04:00
Nightenom
202ae50820
Add projection matrix to RenderWorldLastEvent (#6536) 2020-03-11 00:00:21 -07:00
Draco18s
58e5f33fad
Global Loot Functions (#6401) 2020-02-26 22:13:36 -08:00
DaemonUmbra
2ce4f5ece5
Updated ForgeDev MCP Mapping Version (#6532) 2020-02-25 19:45:14 -08:00
cpw
aca45340bf
Fix up alarming security crisis with network handling that allowed for wrong code execution on the server, resulting in CRASHED SERVERS. AWFUL stuff. 
Also fixed a silly log message from the login handler.

This change introduces a mechanism to direct certain packets to only process on one side or another. Invalid sidedness will result in the connection being terminated.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-02-23 22:15:34 -05:00
Julian Dunskus
30d4520c6b
Make TransformationHelper.slerp for quaternions public (#6528) 2020-02-23 18:32:33 +01:00
DaemonUmbra
daff482092
Fixed Conduit and Beacon Activation on Vanilla Servers (#6438) 2020-02-17 11:01:38 -08:00
Richard Freimer
a740044e21
Fix ITeleporter being ignored when teleporting from the end to the overworld (#6505) 
* Fix custom teleporters triggering end credits when returning from the end
* Fix setdimension command ignoring position
 2020-02-17 17:16:46 +01:00
malte0811
3f292d5d42
Fixed ChunkWatchEvent.(Un)Watch not firing correctly (#6453) 2020-02-14 12:02:47 -08:00
David Quintana
8fbd84515f Fix gui_light for forge's item parent models. 2020-02-14 19:03:11 +01:00
Richard Freimer
f93289e01c
Allows custom blocks to define if they should use the fluid overlay instead of the flowing texture when in a fluid (#6493) 2020-02-06 23:53:37 +01:00
Richard Freimer
1f46169e1e
Add FluidStack support to the Forge packet buffer. (#6353) (#6485) 2020-02-03 12:46:14 -08:00
ichttt
06d9b6531c
Revert game data to frozen on disconnect from a remote server or when terminating a local server. Closes #6487 (#6497) 2020-02-03 12:21:10 -08:00
David Quintana
a901d80dd5 Implement fluid overlay texture rendering for custom fluids. 2020-02-02 23:02:56 +01:00
DaemonUmbra
d86f58a0df
Fixed Attacks/Punches not Registering (#6481) 
Replaced incorrect magic number with constant
 2020-01-29 22:12:04 -08:00
Vincent Lee
0ad574257e
Clean up a bunch of render events (#6444) 
* Delete RenderHandEvent as RenderSpecificHandEvent can do everything it does and more. Rename RenderSpecificHandEvent to RenderHandEvent as it's now the only hand rendering event.
* Pass MatrixStack and IRenderTypeBuffer into the event whenever they are available. If they're available, that means we're in a batching environment and the modder should not be using the tessellator or other buffers on their own, or they risk "Already building" crashes.
 2020-01-30 00:46:22 +01:00
Bartosz Skrzypczak
4839d18c73
Fix NullPointerException on java 8u242 in dev environment. (#6473) 
Java 8u242 no longer re-initializes internal sys_paths and usr_paths fields in loadLibrary when they are null, so the value can't be set to null.
 2020-01-29 13:55:07 -08:00
Cadiboo
617159c825
Small Forge config fixes (#6466) 2020-01-29 13:04:35 -08:00
LexManos
c72d6e9122 Fix ChunkDataEvent.Load not firing, it now fires in the aync thread. Be careful. Closes #6471 2020-01-29 12:18:13 -08:00
LexManos
40091678a8 Fix default mod resources loosing it's sort order. 2020-01-29 11:31:31 -08:00
mcenderdragon
44d9fff2b4
[1.15] Reimplemented the ITeleporter interface (#6404) 2020-01-29 09:18:07 -08:00
David Quintana
509a28efd3 Hook "gui_light" value from the model into the IBakedModel implementations. 
Apply some of the suggestions from the 1.14 models PR.
 2020-01-23 22:54:54 +01:00
LexManos
c4e000dbe7 1.15.2 Initial Update 2020-01-22 13:44:03 -08:00
ichttt
0bcc2e3fbd Cleanup fml packages removing old deprecated classes related to GUIs/Configs and fix HoverChecker (#6437) 
Fixed ModListWidget name to avoid confusion and collision.
Delete CheckBox, as vanilla has it's own CheckBox now which looks much better
Rename ModConfigEvent.ConfigReloading to ModConfigEvent.Reloading
 2020-01-22 14:09:58 -07:00
Daniël Goossens
dea08be906 Updated method names referencing ItemStackTileEntityRenderer (#6461) 2020-01-22 12:26:34 -07:00
Cadiboo
0f27975f77 Fix Widget Foreground Color not allowing pure black (#6460) 2020-01-22 12:25:35 -07:00
Take Weiland
ad7e4e95ae Use extended version of getLightValue in all places (#6433) 2020-01-22 12:22:35 -07:00
Scotteh
345387645e [1.15.x] Added entity nameplate rendering event hook (#6416) 2020-01-22 12:22:04 -07:00
tterrag
380366e25f Remove emissive items hook, add small utility for bakedquad lighting 2020-01-20 22:44:26 -05:00
David Quintana
1936eb1f36 Fix breaking overlay weirdness. applyBakedNormals was not transforming the baked normals when applying them. Fixes #6432 2020-01-16 03:29:46 +01:00
Daniël Goossens
088fc6b67f [1.15] Add new InputEvent.ClickInputEvent, addresses #5802 (#6047) 2020-01-15 16:30:01 -08:00
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