Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FabricMC/fabric
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.96.11+1.20.5
Choose a base ref
...
head repository: FabricMC/fabric
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.97.0+1.20.5
Choose a head ref
  • 19 commits
  • 217 files changed
  • 8 contributors

Commits on Mar 20, 2024

  1. 24w12a (#3658)

    # Removed
    - FabricItemStack.isSuitableFor (replaced with vanilla component)
    - FabricItemStack.getFoodComponent (replaced with vanilla component)
    - ResourceReloadListenerKeys.LOOT_TABLES
    - fabric-resource-conditions-api-v1 support for loot tables
    
    # Disabled modules
    - fabric-loot-api-v2
    - fabric-mining-level-api-v1
    modmuss50 authored Mar 20, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e9d2a72 View commit details

Commits on Mar 27, 2024

  1. Fully port to 24w12a (#3664)

    * Bump yarn
    
    * Apply yarn update
    
    * Sync map decorations type registry
    
    * Remove Mining Level API
    
    * Port loot API
    
    * whoops
    
    * Rename LootManagerMixin
    
    * Fix javadoc
    
    * Fix registerGiftLootTable
    
    * RegistryKey is traditionally compared using identity
    
    * Fix wrong loot source being used
    apple502j authored Mar 27, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9b3069f View commit details
  2. fix OpenScreenPayload title being decoded but not encoded (#3668)

    Leximon authored Mar 27, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e78eae2 View commit details
  3. 24w13a (#3676)

    Fixes #3669
    
    Co-authored-by: Drex <nicknamedrex@gmail.com>
    modmuss50 and DrexHD authored Mar 27, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b21c00c View commit details

Commits on Apr 3, 2024

  1. Update to Loom 1.6

    modmuss50 committed Apr 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    3844af0 View commit details
  2. Improve data attachment port (#3678)

    * Bump yarn
    
    * Apply yarn update
    
    * Fix porting of Data Attachment block entity support
    
    * Fix FrameBlockEntity testmod
    apple502j authored Apr 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    97f703d View commit details
  3. 24w14a & Java 21

    modmuss50 committed Apr 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f1e646e View commit details
  4. Run client and resources tests on Java 21

    modmuss50 committed Apr 3, 2024
    Copy the full SHA
    a0ecfae View commit details
  5. Actually run resources tests on Java 21

    modmuss50 committed Apr 3, 2024
    Copy the full SHA
    e7bca69 View commit details
  6. Fix release by reverting a change in 3844af0

    modmuss50 committed Apr 3, 2024
    Copy the full SHA
    9d8968f View commit details

Commits on Apr 10, 2024

  1. [1.20.5] Codec-based Resource Conditions and refactors (#3690)

    * Initial move to codec-based resource conditions
    
    * Move default condition types to DefaultResourceConditionTypes
    
    * Move built-in condition types to impl
    
    * Run spotlessApply
    
    * Move default condition registration to entrypoint in imp
    
    * Formatting fixes
    
    * Add back package-info.java
    
    * Make it compatible with new DFU
    
    * checkstyle
    
    * Refactor FeaturesEnabledResourceCondition
    
    * Pass RegistryWrapper and reduce reliance on statics
    
    * Some more improvements
    
    * Add back some tests
    
    * Add more tests
    
    * Add back tags_populated support, clean up code
    
    * Some more improvements
    
    * add javadocs (wip)
    
    * Fix unfixed merge conflict
    
    * Javadocs
    
    * Fix null condition in addConditions
    
    * Allow empty arrays in certain codecs
    
    * Move addConditions to datagen impl
    
    * Address reviews
    
    * add debug log
    
    * Store features in normal static field
    
    * Fix TagsPopulatedResourceCondition#getType
    
    ---------
    
    Co-authored-by: Apollo <102649729+Apollounknowndev@users.noreply.github.com>
    apple502j and Apollounknowndev authored Apr 10, 2024
    Copy the full SHA
    3b6dc5d View commit details
  2. 1.20.5-pre1 (#3700)

    * 1.20.5-pre1
    
    * BrewingRecipeRegistryBuilderCallback
    
    * Remove debug line
    
    * Fix build
    
    * Bump version
    modmuss50 authored Apr 10, 2024
    Copy the full SHA
    74e2f56 View commit details
  3. Translation updates (#3618)

    * New translations en_us.json (Korean)
    
    * New translations en_us.json (Vietnamese)
    
    * New translations en_us.json (Korean)
    
    * New translations en_us.json (Korean)
    
    * New translations en_us.json (Vietnamese)
    
    * New translations en_us.json (Korean)
    
    * New translations en_us.json (Portuguese, Brazilian)
    
    * New translations en_us.json (French)
    
    * New translations en_us.json (Portuguese, Brazilian)
    
    * New translations en_us.json (Estonian)
    
    * New translations en_us.json (Malay)
    
    * New translations en_us.json (Malay)
    
    * New translations en_us.json (Malay)
    
    * New translations en_us.json (German)
    
    * New translations en_us.json (Czech)
    
    * New translations en_us.json (Chinese Simplified)
    
    * New translations en_us.json (Chinese Simplified)
    
    * New translations en_us.json (Spanish, Chile)
    
    * New translations en_us.json (Spanish, Chile)
    
    * New translations en_us.json (Spanish, Chile)
    
    * New translations en_us.json (Chinese Traditional)
    
    * New translations en_us.json (Chinese Traditional)
    
    * New translations en_us.json (Polish)
    
    * New translations en_us.json (Toki Pona)
    
    * New translations en_us.json (Toki Pona)
    FabricMCBot authored and modmuss50 committed Apr 10, 2024
    Copy the full SHA
    aae0949 View commit details
  4. Copy the full SHA
    d73f365 View commit details
  5. Deprecate FabricEntityTypeBuilder & FabricBlockEntityTypeBuilder in f…

    …avour of the vanilla classes (#3677)
    
    * Replace FabricEntityTypeBuilder with EntityTypeBuilder + iface injection
    
    * Finish and test entity type builder
    
    * Deprecate FabricBlockEntityTypeBuilder
    
    * Review fix
    
    * Fixes based on review
    
    * Some fixes
    
    * Checkstyle
    modmuss50 committed Apr 10, 2024
    Copy the full SHA
    44e6689 View commit details
  6. Fix EntityType.Builder for 1.20.5

    modmuss50 committed Apr 10, 2024
    Copy the full SHA
    6793dde View commit details
  7. Enchantment API (#3627)

    * ALLOW_ENCHANTING event
    
    * Intrinsic enchantments + testmod
    
    also fixed a bug in the testmod that prevented the custom damage handler from ever working
    
    * Item-based override mechanism
    
    * Replaces part of the use cases of the event with a convenient method to override in FabricItem.
    * Updated and tested the testmod.
    
    * javadoc
    
    * Move event logic to FabricItemStack
    
    * oops
    
    * Simplify mixin
    
    * Replace ActionResult with TriState
    
    * Use TriState in testmod
    
    * requests
    
    * Clarify jdoc
    
    * Ship without intrinsic enchantments at first
    
    * Checkstyle
    
    * Checkstyle
    
    ---------
    
    Co-authored-by: modmuss50 <modmuss50@gmail.com>
    Syst3ms and modmuss50 authored Apr 10, 2024
    Copy the full SHA
    8f5205a View commit details

Commits on Apr 14, 2024

  1. Finish port to 1.20.5-pre1 (#3706)

    * Buildscript changes
    
    * Particle API: port and some refactor
    
    * Add support for Ingredient in FabricBrewingRecipeRegistry
    
    * Add private ctor to ClientPlayerBlockBreakEvents
    
    Not related to port, but something I've found during the process.
    Also adds final to CommonLifecycleEvents.
    
    * Fix Sound API testmod
    
    * Fix broken javadocs
    
    * Codec-related changes
    
    * Document behavior of SUCCESS_NO_ITEM_USED in UseEntityCallback
    
    * Add getEnabledFeatures
    
    * checkstyle
    apple502j authored Apr 14, 2024
    Copy the full SHA
    c5fc38b View commit details
  2. Bump version

    modmuss50 committed Apr 14, 2024
    Copy the full SHA
    cfb0a2d View commit details
Showing with 3,043 additions and 3,139 deletions.
  1. +1 −0 .gitattributes
  2. +18 −23 .github/workflows/build.yml
  3. +1 −1 .github/workflows/release.yml
  4. +3 −3 build.gradle
  5. +0 −7 deprecated/fabric-events-lifecycle-v0/build.gradle
  6. +0 −42 ...-events-lifecycle-v0/src/client/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java
  7. +0 −50 ...events-lifecycle-v0/src/client/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java
  8. +0 −35 ...src/client/java/net/fabricmc/fabric/impl/event/lifecycle/v0/client/LegacyClientEventInvokers.java
  9. +0 −39 ...c-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java
  10. +0 −39 ...ic-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java
  11. +0 −42 ...ic-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java
  12. +0 −43 ...bric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java
  13. +0 −37 ...s-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/v0/LegacyEventInvokers.java
  14. BIN deprecated/fabric-events-lifecycle-v0/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png
  15. +0 −36 deprecated/fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json
  16. +0 −64 ...0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java
  17. +0 −19 deprecated/fabric-events-lifecycle-v0/src/testmod/resources/fabric.mod.json
  18. +0 −43 .../java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java
  19. +1 −1 ...-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java
  20. +3 −3 fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java
  21. +0 −68 ...ent-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FabricBrewingRecipeRegistry.java
  22. +70 −0 ...istries-v0/src/main/java/net/fabricmc/fabric/api/registry/FabricBrewingRecipeRegistryBuilder.java
  23. +13 −2 ...t-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java
  24. +89 −0 ...0/src/main/java/net/fabricmc/fabric/mixin/content/registry/BrewingRecipeRegistryBuilderMixin.java
  25. +3 −2 ...ries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/GiveGiftsToHeroTaskAccessor.java
  26. +0 −2 fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.accesswidener
  27. +1 −0 fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json
  28. +4 −1 fabric-content-registries-v0/src/main/resources/fabric.mod.json
  29. +15 −6 ...registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java
  30. +0 −1 fabric-content-registries-v0/src/testmod/resources/fabric-content-registries-v0-testmod.mixins.json
  31. +2 −1 ...src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
  32. +2 −1 fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json
  33. +4 −6 ...ttachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSerializingImpl.java
  34. +5 −4 ...c-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockEntityMixin.java
  35. +0 −53 ...nt-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockEntityUpdateS2CPacketMixin.java
  36. +0 −1 fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json
  37. +1 −0 ...chment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/BlockEntityTests.java
  38. +2 −2 ...n-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootTableGenerator.java
  39. +4 −5 ...n-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java
  40. +8 −7 ...pi-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java
  41. +3 −3 ...ion-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricCodecDataProvider.java
  42. +3 −3 ...ion-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java
  43. +7 −8 ...ration-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
  44. +25 −4 ...ic-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java
  45. +3 −3 ...-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/ConditionBlockLootTableGenerator.java
  46. +9 −10 ...ation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/FabricLootTableProviderImpl.java
  47. +10 −9 ...eration-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java
  48. +13 −8 fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FailSoftMapCodec.java
  49. +1 −1 fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTypeMixin.java
  50. +3 −3 fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
  51. +0 −6 ...tity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/PlayerEntityMixin.java
  52. +4 −1 ...-v0/src/client/java/net/fabricmc/fabric/api/event/client/player/ClientPlayerBlockBreakEvents.java
  53. +1 −1 ...c-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseEntityCallback.java
  54. +5 −4 fabric-item-api-v1/src/client/java/net/fabricmc/fabric/api/client/item/v1/ItemTooltipCallback.java
  55. +5 −3 fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemStackMixin.java
  56. +56 −0 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantingContext.java
  57. +84 −0 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantmentEvents.java
  58. +20 −31 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java
  59. +18 −8 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java
  60. +50 −0 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilScreenHandlerMixin.java
  61. +5 −3 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java
  62. +0 −41 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/CatEntityMixin.java
  63. +13 −7 ...-v1/src/main/java/net/fabricmc/fabric/mixin/item/{BlockItemMixin.java → EnchantCommandMixin.java}
  64. +11 −13 .../net/fabricmc/fabric/mixin/item/{HungerManagerMixin.java → EnchantRandomlyLootFunctionMixin.java}
  65. +13 −7 ...net/fabricmc/fabric/mixin/item/{CookingRecipeJsonBuilderMixin.java → EnchantmentHelperMixin.java}
  66. +0 −46 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/FoxEntityMixin.java
  67. +0 −32 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemMixin.java
  68. +0 −20 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java
  69. +0 −24 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/LivingEntityMixin.java
  70. +0 −57 fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/WolfEntityMixin.java
  71. +5 −7 fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json
  72. +32 −11 fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java
  73. +0 −62 fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/FoodGameInitializer.java
  74. +8 −20 fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/UpdatingItem.java
  75. +0 −97 fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/FoodGameTest.java
  76. +3 −3 fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/RecipeGameTest.java
  77. +6 −0 fabric-item-api-v1/src/testmod/resources/data/minecraft/tags/items/pickaxes.json
  78. +2 −4 fabric-item-api-v1/src/testmod/resources/fabric.mod.json
  79. +1 −1 fabric-item-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/item/client/TooltipTests.java
  80. +3 −0 fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/es_cl.json
  81. +1 −1 fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/ko_kr.json
  82. +3 −0 fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/ms_my.json
  83. +3 −0 fabric-item-group-api-v1/src/main/resources/assets/fabric/lang/tok.json
  84. +1 −1 ...cle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/CommonLifecycleEvents.java
  85. +9 −3 ...ycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/DataPackContentsMixin.java
  86. +14 −18 fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/api/loot/v2/LootTableEvents.java
  87. +5 −5 fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java
  88. +45 −0 fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java
  89. +0 −100 fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/LootManagerMixin.java
  90. +84 −0 fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableRegistriesMixin.java
  91. +2 −1 fabric-loot-api-v2/src/main/resources/fabric-loot-api-v2.mixins.json
  92. +16 −16 fabric-loot-api-v2/src/testmod/java/net/fabricmc/fabric/test/loot/LootTest.java
  93. +0 −11 fabric-mining-level-api-v1/build.gradle
  94. +0 −51 ...-mining-level-api-v1/src/main/java/net/fabricmc/fabric/api/mininglevel/v1/FabricMineableTags.java
  95. +0 −84 ...-mining-level-api-v1/src/main/java/net/fabricmc/fabric/api/mininglevel/v1/MiningLevelManager.java
  96. +0 −81 ...ining-level-api-v1/src/main/java/net/fabricmc/fabric/impl/mininglevel/MiningLevelManagerImpl.java
  97. +0 −56 fabric-mining-level-api-v1/src/main/java/net/fabricmc/fabric/mixin/mininglevel/ShearsItemMixin.java
  98. +0 −61 fabric-mining-level-api-v1/src/main/java/net/fabricmc/fabric/mixin/mininglevel/SwordItemMixin.java
  99. BIN fabric-mining-level-api-v1/src/main/resources/assets/fabric-mining-level-api-v1/icon.png
  100. +0 −13 fabric-mining-level-api-v1/src/main/resources/fabric-mining-level-api-v1.mixins.json
  101. +0 −31 fabric-mining-level-api-v1/src/main/resources/fabric.mod.json
  102. +0 −135 ...ic-mining-level-api-v1/src/testmod/java/net/fabricmc/fabric/test/mininglevel/MiningLevelTest.java
  103. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/fabric/tags/blocks/mineable/shears.json
  104. +0 −8 fabric-mining-level-api-v1/src/testmod/resources/data/fabric/tags/blocks/mineable/sword.json
  105. +0 −7 fabric-mining-level-api-v1/src/testmod/resources/data/fabric/tags/blocks/needs_tool_level_4.json
  106. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/minecraft/tags/blocks/mineable/axe.json
  107. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/minecraft/tags/blocks/mineable/hoe.json
  108. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
  109. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/minecraft/tags/blocks/mineable/shovel.json
  110. +0 −6 fabric-mining-level-api-v1/src/testmod/resources/data/minecraft/tags/blocks/needs_stone_tool.json
  111. +0 −17 fabric-mining-level-api-v1/src/testmod/resources/fabric.mod.json
  112. +1 −1 .../net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java
  113. +5 −4 ...der-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java
  114. +43 −0 ...1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/entity/FabricBlockEntityType.java
  115. +23 −0 ...ain/java/net/fabricmc/fabric/api/object/builder/v1/block/entity/FabricBlockEntityTypeBuilder.java
  116. +2 −2 ...rc/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java
  117. +127 −0 ...ilder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityType.java
  118. +85 −12 ...pi-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityTypeBuilder.java
  119. +0 −44 ...object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java
  120. +107 −0 ...ct-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityTypeImpl.java
  121. +4 −3 ...-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java
  122. +37 −0 ...er-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockEntityTypeBuilderMixin.java
  123. +114 −0 ...builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/EntityTypeBuilderMixin.java
  124. +18 −11 ...object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/EntityTypeMixin.java
  125. +3 −0 fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json
  126. +5 −1 fabric-object-builder-api-v1/src/main/resources/fabric.mod.json
  127. +87 −0 ...ct-builder-api-v1/src/test/java/net/fabricmc/fabric/test/object/builder/FabricEntityTypeTest.java
  128. +2 −1 ...ct-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/VillagerTypeTest1.java
  129. +3 −0 ...ticles-v1/src/client/java/net/fabricmc/fabric/api/client/particle/v1/ParticleFactoryRegistry.java
  130. +17 −21 fabric-particles-v1/src/main/java/net/fabricmc/fabric/api/particle/v1/FabricParticleTypes.java
  131. +1 −1 fabric-particles-v1/src/testmod/java/net/fabricmc/fabric/test/particle/ParticleTestSetup.java
  132. +2 −2 ...api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredientSerializer.java
  133. +5 −5 ...recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java
  134. +5 −5 ...recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java
  135. +5 −5 ...e-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
  136. +6 −5 ...api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java
  137. +7 −21 ...api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java
  138. +6 −5 ...api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
  139. +1 −2 fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
  140. +3 −6 ...recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
  141. +4 −0 fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java
  142. +2 −2 ...nc-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java
  143. +0 −46 ...c/main/java/net/fabricmc/fabric/mixin/registry/sync/StructuresToConfiguredStructuresFixMixin.java
  144. +1 −1 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/de_de.json
  145. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/es_cl.json
  146. +1 −1 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/et_ee.json
  147. +1 −1 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/fr_fr.json
  148. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/ko_kr.json
  149. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/ms_my.json
  150. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/pt_br.json
  151. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/tok.json
  152. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/vi_vn.json
  153. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/zh_cn.json
  154. +7 −0 fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/zh_tw.json
  155. +0 −1 fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json
  156. +3 −3 ...rer-api-v1/src/client/java/net/fabricmc/fabric/mixin/renderer/client/WeightedBakedModelMixin.java
  157. +1 −1 fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/FrameBlockEntity.java
  158. +2 −2 ...g-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java
  159. +4 −0 fabric-resource-conditions-api-v1/build.gradle
  160. +0 −74 ...ns-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ConditionJsonProvider.java
  161. +0 −260 ...pi-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/DefaultResourceConditions.java
  162. +59 −0 ...itions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java
  163. +74 −0 ...ns-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditionType.java
  164. +126 −121 ...tions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
  165. +3 −4 ...-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/package-info.java
  166. +49 −0 ...-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/DefaultResourceConditionTypes.java
  167. +86 −205 ...ons-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java
  168. +47 −0 .../java/net/fabricmc/fabric/impl/resource/conditions/conditions/AllModsLoadedResourceCondition.java
  169. +46 −0 ...1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AndResourceCondition.java
  170. +47 −0 .../java/net/fabricmc/fabric/impl/resource/conditions/conditions/AnyModsLoadedResourceCondition.java
  171. +58 −0 ...ava/net/fabricmc/fabric/impl/resource/conditions/conditions/FeaturesEnabledResourceCondition.java
  172. +43 −0 ...1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/NotResourceCondition.java
  173. +46 −0 ...v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/OrResourceCondition.java
  174. +62 −0 ...va/net/fabricmc/fabric/impl/resource/conditions/conditions/RegistryContainsResourceCondition.java
  175. +63 −0 .../java/net/fabricmc/fabric/impl/resource/conditions/conditions/TagsPopulatedResourceCondition.java
  176. +40 −0 .../src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TrueResourceCondition.java
  177. +5 −10 ...ons-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/DataPackContentsMixin.java
  178. +5 −14 ...tions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java
  179. +0 −93 ...nditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/LootManagerMixin.java
  180. +15 −13 ...itions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RecipeManagerMixin.java
  181. +76 −0 ...api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ReloadableRegistriesMixin.java
  182. +37 −0 ...-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java
  183. +9 −2 ...in/java/net/fabricmc/fabric/mixin/resource/conditions/SinglePreparationResourceReloaderMixin.java
  184. +3 −0 fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.accesswidener
  185. +3 −1 fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json
  186. +6 −0 fabric-resource-conditions-api-v1/src/main/resources/fabric.mod.json
  187. +10 −8 ...pi-v1/src/testmod/java/net/fabricmc/fabric/test/resource/conditions/ConditionalResourcesTest.java
  188. +202 −0 .../src/testmod/java/net/fabricmc/fabric/test/resource/conditions/DefaultResourceConditionsTest.java
  189. +2 −1 ...testmod/resources/data/fabric-resource-conditions-api-v1-testmod/recipes/item_tags_populated.json
  190. +2 −1 fabric-resource-conditions-api-v1/src/testmod/resources/fabric.mod.json
  191. +0 −1 ...resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/ResourceReloadListenerKeys.java
  192. +1 −4 ...-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/KeyedResourceReloadListenerMixin.java
  193. +9 −0 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/cs_cz.json
  194. +4 −1 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/es_cl.json
  195. +4 −2 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/ko_kr.json
  196. +9 −0 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/ms_my.json
  197. +1 −1 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/pl_pl.json
  198. +6 −1 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/pt_br.json
  199. +3 −1 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/vi_vn.json
  200. +2 −2 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/zh_cn.json
  201. +1 −1 fabric-resource-loader-v0/src/main/resources/assets/fabric-resource-loader-v0/lang/zh_tw.json
  202. +16 −1 fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/impl/screenhandler/Networking.java
  203. +1 −1 fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/SineStream.java
  204. +4 −4 fabric-transfer-api-v1/README.md
  205. +2 −2 ...1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRenderHandler.java
  206. +6 −6 ...pi-v1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRendering.java
  207. +1 −2 ...r-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/base/SingleVariantStorage.java
  208. +12 −4 fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/VariantCodecs.java
  209. +7 −12 ...ansitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener
  210. +5 −10 fabric-transitive-access-wideners-v1/template.accesswidener
  211. +52 −54 gradle.properties
  212. BIN gradle/wrapper/gradle-wrapper.jar
  213. +1 −1 gradle/wrapper/gradle-wrapper.properties
  214. +7 −7 gradlew
  215. +10 −10 gradlew.bat
  216. +0 −2 settings.gradle
  217. +1 −1 src/main/resources/fabric.mod.json
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.java text eol=lf
*.json text eol=lf
*.bat text eol=crlf
41 changes: 18 additions & 23 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ jobs:
build:
strategy:
matrix:
java: [17-ubuntu, 21-ubuntu]
java: [21-ubuntu]
runs-on: ubuntu-22.04
container:
image: mcr.microsoft.com/openjdk/jdk:${{ matrix.java }}
@@ -13,28 +13,23 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew check build publishToMavenLocal --stacktrace --warning-mode=fail
- uses: gradle/wrapper-validation-action@v2
- run: ./gradlew check build publishToMavenLocal --stacktrace
- uses: Juuxel/publish-checkstyle-report@v1
if: ${{ failure() }}
with:
reports: |
**/build/reports/checkstyle/*.xml
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Artifacts
path: build/libs/
- uses: actions/upload-artifact@v3
name: Artifacts ${{ matrix.java }}
path: |
build/libs/
./*/build/libs/
build/publishMods/
- uses: actions/upload-artifact@v4
with:
name: Artifacts
path: ./*/build/libs/
- uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/publishMods/
- uses: actions/upload-artifact@v3
with:
name: Maven Local
name: Maven Local ${{ matrix.java }}
path: /root/.m2/repository/net/fabricmc/

client_test:
@@ -43,15 +38,15 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'microsoft'
java-version: '17'
java-version: '21'
- name: Run Auto test Client
uses: modmuss50/xvfb-action@v1
with:
run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: Test Screenshots
@@ -63,10 +58,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'microsoft'
java-version: '17'
java-version: '21'
- run: mkdir run && echo "eula=true" >> run/eula.txt
- run: ./gradlew runProductionAutoTestServer --stacktrace --warning-mode=fail

@@ -76,9 +71,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'microsoft'
java-version: '17'
java-version: '21'
- run: ./gradlew generateResources --stacktrace --warning-mode=fail
- run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
with:
context: changelog
workflow_id: release.yml
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v2
- run: ./gradlew checkVersion build publish publishMods --stacktrace
env:
MAVEN_URL: ${{ secrets.MAVEN_URL }}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ plugins {
id "idea"
id "maven-publish"
id 'jacoco'
id "fabric-loom" version "1.5.4" apply false
id "fabric-loom" version "1.6.5" apply false
id "com.diffplug.spotless" version "6.20.0"
id "org.ajoberstar.grgit" version "3.1.0"
id "me.modmuss50.remotesign" version "0.4.0" apply false
@@ -154,7 +154,7 @@ allprojects {
apply plugin: "com.diffplug.spotless"

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
it.options.release = 21
}

java {
@@ -371,7 +371,7 @@ loom {

javadoc {
options {
source = "17"
source = "21"
encoding = "UTF-8"
charSet = "UTF-8"
memberLevel = JavadocMemberLevel.PACKAGE
7 changes: 0 additions & 7 deletions deprecated/fabric-events-lifecycle-v0/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading