Commit graph

121 commits

Author SHA1 Message Date
modmuss50
9ff28f4026
Split client only code into its own sourceset. (#2179)
A common source of crashes on modded Minecraft servers comes from modders accidently calling client only code from the client, this PR is another large step towards elimitating that.

This PR has been months in the making and years in the planning, requiring major changes to Loom & Loader. In recent Minecraft versions Mojang has made it easier than ever to cleanly split the jar, going against the status-quo of merging the client and server into one jar.

From the start we have designed Fabric to have a very clear split between client and common (client & server) code. Fabric has always encoraged keeping client only code seprate from the server, this can be seen at a fundamental level with the entrypoints in Loader. Fabric API's have all been designed with this mind.

This PR provides a compile safety net around Fabric API using client only code on the server. Even though there are almost 400 changed files, minimal changes beyond moving the files were required to achieve this in Fabric API, thanks to the effort of all contributors in the past.

These changes should not affect modders or players in anyway, a single "universal" jar is still produced. Im happy to awnswer any questions.
2022-05-21 16:26:46 +01:00
Jab125
4a05de7fe1 Allow Built in Resource Packs to have custom names (#1827)
* TooltipComponent API (#1695)

* TooltipComponent API

* Add warning

* Fix handling of orphaned registry entries (#1759)

* Fix handling of orphaned registry entries

* Fix handling of orphaned registry entries in RegistrySyncManager

* Transfer API: bugfixes and improvements (#1762)

* Fix SingleVariantItemStorage extraction bug

* Inventory wrappers: reuse the original stack more aggressively

* Add some filtered overloads to StorageUtil methods

* Override PlayerInventoryStorage#insert to call #offer

* Add small comment regarding predicates

* Bump version

* Fix refamp generation for gametest API. Fixes #1722

* Bump version.

* Add two more sleep events (#1755)

* Add event for setting bed occupation state

* Add wake up pos event and update tests

* Bump version

Just in case. I have a bad feeling that
this could become a patch version otherwise.

* Add code tags for true/false/null in EntitySleepEvents jd

* Add Dynamic annotations for lambda body mixins

* Update class javadoc to contain the new events

* Bump version

* Fix Registry.GAME_EVENT not being synced.

* Updated mappings to yarn 1.17.1+build.63 (#1786)

* Updated mappings to yarn 1.17.1+build.63

* Forgot some bits.

* Forgot to reeable

* Make biome & dimension api stable. And change usage around @Deprecated (#1783)

* Make biome & dimension api stable (for 1.17). Remove the usage of @Deprecated for other experimental modules.

The @Deprecated should be used for experimental/volatile APIs that are highly likely to change.

* Apply suggestions from code review

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* ItemGroup API: Remove return and call super so all others ItemStack's get appended (#1617)

* Remove return and call super so all others ItemStack's get appended

* Add method to FabricItemGroupBuilder to pass ItemGroup with appendItems and change stacksForDisplay to a BiConsumer

* Update ItemGroupBuilder javadoc and add example to testmod

* Remove leftover aw

* Update fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update fabric-item-groups-v0/src/testmod/java/net/fabricmc/fabric/test/item/group/ItemGroupTest.java

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>

* Remove used import in ItemGroupTest

* Clean up

* Fix damn checkstyle

* Change version to 0.3.0

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>

* Bump version

* Add tag-based mining level API, fix and deprecate FabricBlockSettings.breakByTool (#1629)

* Mining Level API, part 1

* Fix incorrect netherite mining level in MiningLevelManager docs

* Add some format checks in dynamic mining level tag checking

* Add mining level API test mod

* Grammar

* Add cursed basic support for the tool attribute api

* Fix tool attribute JD

* Add proper compat for tool attribute api

Also fixes the remaining bugs in it!

* Update license headers

* stuff

* better comments

* more test mod work

* more

* Fix test mod

* i'm done with this module

* Address some code review things

* Use Reference2IntMap (basically IdentityHashMap for int values)

* Prefix mixin handlers with fabric$

* Add missing license header

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java

* Resolve liach's comment

* Update to use TagFactory

* Add event phases (#1669)

* Proof of concept

* Simplify and document

* Allow events to be registered with default phases

* Use modified Kosaraju for the toposort, and add test for cyclic dependency graphs

* Separate phase-related functionality in an EventPhase class

* Revert "Separate phase-related functionality in an EventPhase class"

This reverts commit e433f348f4.

* Ensure that the phase order is deterministic

* Add pretty graphs

* Add a test, fix a bug, only do one sort for every constraint registration

* Environmental renderers (#1727)

* Environmental Renderers

* Remove defunt hideClouds and hideWeather

* Pushed missing License

* Push checkstyle fixes

* remove unused

* Unwrapped the test mod sky rendering.

* Added a first attempt at javadoc.

* Forgot a blank line

* Moved Environment references out of class

* Moved Lamda functions for fog override, thick fog usage and fog color adjustment to their own interfaces and gave them proper javadoc.

* Made FabricSkyProperties private

* PURGE THE H...I mean FabricSkyPropertyBuilder and FabricSkyProperties.

- Reverted unintentional mixin changes
- Fix various typo errors that were pointed out.
- Added missing javadocs and added the ability to override.

* Forgot some pluggin in some overrides.

* Added missing javadoc suggestion

* Changed api a bit so that it fires a exception if renderer not being overridden and one already exists.

* Split Implemtnation and Interface

* Forgot a license

* Added WorldRenderContext to Renderers

* Added logging

* Added missing javadocs and removed the override option.

* Removed INSTANCE

* Environmental Renderers

* Remove defunt hideClouds and hideWeather

* Pushed missing License

* Push checkstyle fixes

* remove unused

* Unwrapped the test mod sky rendering.

* Added a first attempt at javadoc.

* Forgot a blank line

* Moved Environment references out of class

* Moved Lamda functions for fog override, thick fog usage and fog color adjustment to their own interfaces and gave them proper javadoc.

* Made FabricSkyProperties private

* PURGE THE H...I mean FabricSkyPropertyBuilder and FabricSkyProperties.

- Reverted unintentional mixin changes
- Fix various typo errors that were pointed out.
- Added missing javadocs and added the ability to override.

* Forgot some pluggin in some overrides.

* Added missing javadoc suggestion

* Changed api a bit so that it fires a exception if renderer not being overridden and one already exists.

* Split Implemtnation and Interface

* Forgot a license

* Added WorldRenderContext to Renderers

* Added logging

* Added missing javadocs and removed the override option.

* Removed INSTANCE

* Fixed Issues

* Fixed formatting issue.

* completed Juuxl's suggestions and removed null check on adding skyproperties. Changed SkyProperties registering to take an Identifier. Registration turns out to be only adding new options to the "effects" entry of dimension type jsonjson.

* Forgot to reenable this.

* Just did suggested tweaks

* Changed SkyProperties to DimensionEffects

* Pushed suggestions of Haykam and apple502j

* Added missing changes from sky properties to dimension effects.

* Corrected me being inconsistent.

* Forgot to remove import.

* Impliments

https://github.com/FabricMC/fabric/pull/1727#discussion_r734988305
https://github.com/FabricMC/fabric/pull/1727#discussion_r734988265

* Implements https://github.com/FabricMC/fabric/pull/1727#discussion_r730429748

* Last minute tweak. Runnable that controls fog runs right before dimension spefific rendering is done. Based on more subtle issues discovered while working api with twilight forest.

Co-authored-by: AlphaMode <AlphaModeYT@gmail.com>

* Another wave of transfer API improvements (#1801)

* Another wave of transfer API improvements

* Cleaner implementation of FilteringStorage#...Of

* Undo colored name for water and lava variants

* Custom fluid renderers and enhanced vanilla fluid renderer customization (#1687)

* Implement custom fluid rendering

* Move custom renderers in FluidRenderer mixin and add overlay sprite support to FluidRenderHandlers

* Add vanilla-like fluid renderer. Maybe very unnecessary, might remove.

* Optimize imports

* Allow custom fluid renderers to call the default renderer. Re-add DEFAULT.

* Add interface to implement by blocks that enforces overlay texture on fluids

* Some comments

* Simplify API and remove DefaultLikeFluidRenderer

* Make simple renderer overlay texture nullable

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>

* Expand test mod

* Checkstyle and licenses

* Easy shortcut for custom colored vanilla water fluids

* Easy way to register a renderer for two (still+flowing) fluids

* Update fabric-rendering-fluids-v1/src/main/java/net/fabricmc/fabric/api/client/render/fluid/v1/FluidRenderHandlerRegistry.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Update fabric-rendering-fluids-v1/src/main/java/net/fabricmc/fabric/mixin/client/rendering/fluid/MixinFluidRenderer.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Bump versions

All of the version need to be bumped due to fabric-api-base being updated, this highlights the need for a better solution.

* Target the void world in the DimensionalRenderingTest

It's a bit too obnoxious for the overworld.

* Fix shears being the ultimate mining tool (#1809)

* Add detail about default value to MiningLevelManager jd

* Fix shears being the ultimate mining tool

In more technical terms, fix an invalid
comparison in TaggedToolsModdedBlocksToolHandler.
The code was supposed to check if the tool's
mining level was at least the block's minimum
mining level. Instead, the check succeeded
whenever the block required a tool
(min level >= 0).

* WIP fixing tool attribute api bugs

* Fix mostly everything

* Simplify to (== 0) with explanation

* A less breaking workaround for https://github.com/FabricMC/fabric/issues/1806 (#1811)

* A less breaking workaround for https://github.com/FabricMC/fabric/issues/1806

* Checkstyle

* Bump version

* Update Loom and Loader. Cleanup/improve buildscript. (#1802)

Co-authored-by: shartte <shartte@users.noreply.github.com>

* Fix missing some chunk unloads events leading to a possible memory leak. (#1820)

* Fix crash when loading resources from a UNC (windows) network share.

See: https://bugs.openjdk.java.net/browse/JDK-8178726

* Update ResourceManagerHelper.java

* Update ResourceManagerHelperImpl.java

* Update ResourceManagerHelperImpl.java

* attempt to get rid of trailing whitespace

* works

* Update the test mod

* Split TestPack to check if unnamed packs still load and display correctly

* update javadoc

* bump testmod version

* Update fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/ResourceManagerHelper.java

Co-authored-by: LambdAurora <aurora42lambda@gmail.com>

* Use modid in description

* Add lang

Co-Authored-By: LambdAurora <email@lambdaurora.dev>

* Update fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Fix optional server resource loading

* small changes and adhere to checkstyle

* Remove ResourcePackProfileAccessor from mixin json

* bump pack_format

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>
Co-authored-by: BasiqueEvangelist <basiqueevangelist@yandex.ru>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: Waterpicker <Waterpickerenternity@gmail.com>
Co-authored-by: AlphaMode <AlphaModeYT@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Shadew <11669132+FoxShadew@users.noreply.github.com>
Co-authored-by: shartte <shartte@users.noreply.github.com>
Co-authored-by: LambdAurora <aurora42lambda@gmail.com>
Co-authored-by: LambdAurora <email@lambdaurora.dev>
Co-authored-by: deirn <deirn@bai.lol>
(cherry picked from commit 2afceb2962)
2022-05-20 18:25:14 +01:00
modmuss50
ec94c6f636
22w16b
Co-authored-by: Player <player@player.to>
2022-04-20 22:22:10 +01:00
modmuss50
717abbc48a 22w14a 2022-04-06 21:49:45 +01:00
modmuss50
a67d2aa505 22w12a 2022-03-24 20:18:23 +00:00
Player
c8c49daef7 Update mappings 2022-03-23 01:15:45 +01:00
Technici4n
583ee89038 Fix #2091: multiple mods adding to the same tag not working 2022-03-22 23:27:35 +00:00
Player
ac75df34b9 Fix group resource packs 2022-03-18 02:19:43 +01:00
Player
7463d67c85 22w11a 2022-03-18 00:33:37 +01:00
Justsnoopy30
2de5574501
Allow dots in namespaces to match vanilla behavior (#2069) 2022-03-13 13:52:07 +00:00
modmuss50
801ec85b51 Fix checkstyle issues missed after merging. 2022-03-03 18:36:57 +00:00
Player
78a6342690 Support Loader 0.13's multiple mod root paths, optimize ModNioResourcePack (#1918) 2022-03-03 18:12:39 +00:00
modmuss50
55dca1a4f3 Update mappings. 2022-02-16 18:14:59 +00:00
modmuss50
d882b91555
Port to 22w06a (#1989)
This snapshot is possibly one of the most impactful for API we have ever had. This PR is an inital port to support 22w06a, stuff will be missing and broken. 

# Removed modules:
- fabric-mining-levels-v0 - Previously deprecated
- fabric-object-builders-v0 - Previously deprecated
- fabric-tag-extensions-v0
- fabric-tool-attribute-api-v1

# Modules with API breaking changes:
- fabric-biome-api-v1
- fabric-content-registries-v0
- fabric-data-generation-api-v1
- fabric-mining-level-api-v1
- fabric-object-builder-api-v1
- fabric-resource-conditions-api-v1
- fabric-structure-api-v1

# Impactful API changes:
### fabric-object-builder-api-v1
- Removed - FabricBlockSettings.breakByHand
- Removed - FabricBlockSettings.breakByTool  - Previously deprecated

# Notable changes

- fabric-registry-sync-v0 moves vanilla's new registry freezing to a later point in time, allowing mods to add to the registry during init.

# Known issues:
- ServerBugfixMixin used to fix https://bugs.mojang.com/browse/MC-195468 has not yet been ported.
2022-02-11 17:02:44 +00:00
modmuss50
54e5b2eccb 22w05a
Remove 1.18.1 support.
2022-02-02 18:34:04 +00:00
modmuss50
d7c144a830
Migrate to SLF4j and update loom (#1960)
* Migrate to SLF4j and update loom

* Update loom

* Update to latest loom
2022-01-30 21:37:23 +00:00
modmuss50
e66b59e98c 22w03a
1.18.1 is also supported with this version.
2022-01-19 19:18:31 +00:00
Player
3ac43d9577 Revert Mixin compatibilityLevel bump, bump versions 2021-11-17 03:29:11 +01:00
modmuss50
e77d3ea62f 1.18-pre2 & Java 17 2021-11-16 18:41:10 +00:00
modmuss50
31860a91ee Fix crash when loading resources from a UNC (windows) network share.
See: https://bugs.openjdk.java.net/browse/JDK-8178726
2021-11-12 16:49:44 +00:00
Technici4n
25611bb75a
Stop DefaultResourcePack scanning the entire classpath (#1564)
* Stop DefaultResourcePack scanning the entire classpath

* Use another approach to find the JAR

* Make it work for filesystem assets as well (tested, it works!)

* Only patch what is necessary
2021-07-23 17:06:03 +01:00
modmuss50
b7ab612143 1.17-pre1 2021-05-27 18:40:00 +01:00
modmuss50
a02b4463f9 21w19a 2021-05-12 20:23:04 +01:00
Juuxel
c0514c5228 Add Finnish translation (#1416)
(cherry picked from commit 42c13ca9b1)
2021-04-14 18:52:48 +01:00
modmuss50
23b3c92ea9 21w13a 2021-03-31 20:52:51 +01:00
modmuss50
1eb2670e8a 21w05a 2021-02-03 19:53:20 +00:00
modmuss50
36b77c3e9f 21w03a 2021-01-20 19:50:47 +00:00
i509VCB
f8cf2bb436 Add custom value denoting module lifecycles. (#1253)
* Add custom value denoting module lifecycles.

* Make the module validation work.

My hand has been forced - we must use buildSrc since JsonSlurper is not available in main buildscript.

* Apply task to each project and dont cross projects

* A horrible hack

* Wait what

* It works now.

* Not needed

* Drop unneeded maven repo, cache map lookup

(cherry picked from commit daa38b3d82)
2021-01-19 18:54:23 +00:00
LambdAurora
ea2e406d01 Fix dev env crash on Windows. 2021-01-05 13:21:54 +01:00
modmuss50
27f445e70d Fix merge.
Its always checkstyle...
2020-12-23 20:30:07 +00:00
modmuss50
87d0b2af53 Fix a number of issues with reload listeners (#1240)
* Fix resource reload listeners not being sorted.
Fix missing/broken reload listener keys.
Add a debug log line for missing reload keys
Add some basic tests.

* Undo adding new keys, we can look at this later.

* use AssertionError

* Fix test on server

(cherry picked from commit 67abea83c2)
2020-12-23 20:09:38 +00:00
LambdAurora
0ea93ebaf8 Resource loader improvements (#1186)
* Add resource pack activation type, programmer art API, group mod resource packs.

* Add missing license headers.

* Cleanup and add documentation.

* Fix performance issues.

* Rename invoker.

* Add comment in ReloadableResourceManagerImplMixin.

* Add package-info to resource loader.

(cherry picked from commit 73b29211a6)
2020-12-23 18:51:52 +00:00
modmuss50
e1f1abb1c0 20w49a 2020-12-02 19:02:44 +00:00
LambdAurora
7fc3efa106 Internal refactor, remove legacy code, fix FabricMC/fabric#878. (#1134) 2020-11-13 18:26:33 +00:00
modmuss50
df3673f0bc 20w46a 2020-11-11 20:18:14 +00:00
modmuss50
fd6e7547e7
20w45a
Added FabricBlockEntityTypeBuilder
Reworked EntityRendererRegistry
Ported BlockEntityRendererRegistry
2020-11-05 18:05:55 +00:00
LambdAurora
151ba21b21
Resource loader for 20w45a. (#1)
* Resource loader for 20w45a.

* You have seen nothing.
2020-11-05 01:37:03 -06:00
modmuss50
facf3bbf67 Fix license... 2020-09-03 23:53:33 +01:00
modmuss50
fcdfdfa1c7 Fix server crash, closes #1058 2020-09-03 23:44:31 +01:00
LambdAurora
8072a3a990
Resource loader changes and built-in mod resource/data packs API (#1011)
* WIP built-in resource packs API.

* Add built-in resource pack register API and fix old injection methods.

* Fix code style.

* Fix code style.

* Add documentation.

* Drop useless else.

* Fix resource packs and data packs isolation issues, and more.

* Move ResourcePackManagerAccessor to its own accessor mixin.

* Make the built-in mod pack test mod work on server too because data pack part.

* Add new argument to built-in pack method and make mod data packs always active.

* Add documentation.

* Complete documentation in GameOptions mixin.

* Remove register built-in pack overload as Player requested.
2020-09-03 19:49:40 +01:00
modmuss50
e5d3217f0d Mappings update 2020-08-11 17:42:40 +01:00
modmuss50
35e08e3387 20w28a - no biomes or dimensions 2020-07-08 19:31:01 +01:00
modmuss50
c668f41520 20w27a 2020-07-01 18:40:27 +01:00
modmuss50
33474e5255
Hide mods from the resource/data pack screen (#854)
* Hide mods from the resource/data pack screen

* License
2020-06-30 20:17:07 +01:00
modmuss50
059ea866ec update mappings 2020-06-09 22:29:07 +01:00
modmuss50
4e84b64f5c Fix log spam for mods that are not datapacks. Also bump version for release 2020-06-05 20:09:24 +01:00
Meredith Espinosa
3d52d1e569
Make Fabric mod data packs automatically enable on world creation, allow mod data packs to load on dedicated servers (#663)
* make mod data packs load on dedi servers, auto-enable

* license headers
2020-06-05 11:34:38 +01:00
modmuss50
277876c741 Hopefully fix mod datapacks 2020-06-04 22:35:10 +01:00
modmuss50
346247d7d1 Checkstyle 2020-06-04 21:24:25 +01:00
modmuss50
0d474ec430 1.16-pre1 2020-06-04 21:20:20 +01:00
modmuss50
da175ad6ad 20w22a 2020-05-29 15:56:10 +01:00
modmuss50
2fd224ca63 20w17a 2020-04-22 17:59:17 +01:00
Juuxel
94c7834a50
Make resource-loader-v0's generated resource packs use the latest data version (#559)
This prevents incompatibility warnings about mod resource and data packs.
2020-04-11 19:46:10 +00:00
modmuss50
5b8a535acb 20w11a - All mapping changes 2020-03-11 17:37:48 +00:00
modmuss50
b7d52fa581 20w10a 2020-03-04 20:59:37 +00:00
modmuss50
06c939b35c 1.15-pre3 - just mapping changes 2019-11-28 19:40:14 +00:00
modmuss50
f3d8141bae 1.15-pre1 2019-11-21 21:04:17 +00:00
modmuss50
58e820e06c Fix style errors.
Sorry player.
2019-11-07 20:39:57 +00:00
modmuss50
12515ed9ee 19w45a 2019-11-07 20:35:26 +00:00
Player
b7f9825dbb Add checkstyle verification for package names, fix non-API packages. 2019-11-03 20:14:45 +01:00
modmuss50
ce77399215 19w44a
Only yarn renames
2019-10-30 17:10:30 +00:00
Player
dfdb52d6e5 Add checkstyle, format existing code accordingly. 2019-10-27 15:40:26 +01:00
modmuss50
ccd269cfad 19w41a 2019-10-09 19:05:13 +01:00
modmuss50
d32291da65 Fix resource-loader 2019-09-18 23:24:15 +01:00
Prospector
5ed88c193a Add more metadata to the modules (#353)
* Add fabric-api-base as a dep to fabric-networking-v0
2019-09-09 01:48:43 +02:00
modmuss50
d1f89c1d5e Fix builtin mods being added as resource packs 2019-08-28 20:00:17 +01:00
asie
232e294c2c optimize removeAll in ResourceManagerHelperImpl.sort (#298) 2019-08-08 00:02:25 +01:00
coderbot16
7495ea28d6 Prevent mods from shadowing default resources (Fixes #66) (#310) 2019-07-16 10:59:34 +01:00
asie
59147463cc add proper depends lists to mods 2019-05-17 23:08:53 +02:00
Adrian Siekierka
eff4f58df6 [fabric-resource-loader] make paulscode hack opt-in, possibly remove in the future; i mean, no paulscode anymore 2019-05-17 16:23:35 +02:00
Adrian Siekierka
f16189181b final module name refactor prior to release, hopefully 2019-05-11 23:48:33 +02:00