Commit graph

1053 commits

Author SHA1 Message Date
modmuss50
db2d6da333 Bump version 2023-11-26 13:52:05 +00:00
bluebear94
b7f3cf34e6
Add registry for core shaders in custom namespaces ()
* Add registry for core shaders in custom namespaces ()

* Add registry for core shaders in custom namespaces

* Apply suggestions from code review

Co-authored-by: modmuss50 <modmuss50@gmail.com>

* Use Identifier.NAMESPACE_SEPARATOR instead of ":"

* Remove fabric_ prefixes from mixins

* Move test rendering to lower-right corner for test screenshots

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>

* Reorder imports to comply with checkstyle

* Rename some classes

* Fix compilation error in test mod

---------

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2023-11-26 12:53:58 +00:00
modmuss50
0dc92ab9e3 Bump version 2023-03-15 12:29:04 +00:00
Technici4n
8165403603 Fix ItemStack.EMPTY.getItem() rarely returning null due to threading ()
* Fix ItemStack.EMPTY.getItem() rarely returning null due to threading

* Overwrite instead

(cherry picked from commit c3530bb1c6)
(cherry picked from commit 693ffc0581)
2023-03-15 12:02:45 +00:00
miir
43ce63a40d Add c:shields convention tag ()
* add shield tag

* regenerata data

Co-authored-by: itsmiir <itsmiir@users.noreply.github.com>
(cherry picked from commit 8e4e694f3d)
(cherry picked from commit 27265b3409)
2023-03-15 12:01:49 +00:00
Julian Burner
047a5ecbd9 Fix Programmer Art resource pack injection support ()
(cherry picked from commit edbdcddb99)
2023-03-15 10:51:43 +00:00
Maity
1fc43c6542 Conventional Biome Tags tweaks ()
* Birch Forest Tag 

* Fix 

* Run datagen

(cherry picked from commit 315602f6c2)
(cherry picked from commit 521b5c52a5)
(cherry picked from commit 4bc6e26285)
2023-03-15 10:49:11 +00:00
Juuz
6991bab891 EquipmentSlotProvider: Add javadoc link to getPreferredEquipmentSlot ()
(cherry picked from commit 09a3510c69)
(cherry picked from commit 71b82573d8)
(cherry picked from commit b7d188881d)
2023-03-15 10:49:08 +00:00
TelepathicGrunt
e83becadf1 Fixed end biome source injection ()
(cherry picked from commit 348a9c6486)

(cherry picked from commit f1c68e5823)
(cherry picked from commit 16f1e31314)
2023-03-15 10:48:54 +00:00
Michael
dc1e83895f Add 'Windswept Hills' biome convention tag ()
* add windswept biome tag

* change windswept tag to windswept hills

* list out biomes and revert name change

(cherry picked from commit 1b664772cf)
(cherry picked from commit 68a20504ee)
2023-03-15 10:48:22 +00:00
Shnupbups
6c70b68e65 Fixed blocks with vanilla loot tables making strict validation of datagen fail ()
* Fixed blocks with vanilla loot tables making strict validation of datagen fail

Previously, blocks that used `.dropsLike(block)` in their block settings to use a vanilla block's loot table, or `.dropsNothing()` to use the `minecraft:empty` loot table, would cause strict validation in data generation to fail as the vanilla loot tables wouldn't be present in the mod's own block loot table generator.

This fixes that by ensuring that the block's loot table ID has a namespace that matches the loot table generator before adding it to the missing IDs list.

Two test blocks were added to the testmod, one which uses `.dropsLike(Blocks.STONE)` to use the same loot table as Stone, and one that uses `.dropsNothing()`. Previously, these would have caused strict validation to fail as the `minecraft:stone` and `minecraft:empty` loot tables aren't generated by the testmod's generator. Now they pass just fine.

* Fixed blocks with vanilla loot tables making strict validation of datagen fail

Previously, blocks that used `.dropsLike(block)` in their block settings to use a vanilla block's loot table, or `.dropsNothing()` to use the `minecraft:empty` loot table, would cause strict validation in data generation to fail as the vanilla loot tables wouldn't be present in the mod's own block loot table generator.

This fixes that by ensuring that the block's loot table ID has a namespace that matches the loot table generator before adding it to the missing IDs list.

Two test blocks were added to the testmod, one which uses `.dropsLike(Blocks.STONE)` to use the same loot table as Stone, and one that uses `.dropsNothing()`. Previously, these would have caused strict validation to fail as the `minecraft:stone` and `minecraft:empty` loot tables aren't generated by the testmod's generator. Now they pass just fine.
2023-03-15 09:15:03 +00:00
Juuz
0690875101 Fix javadoc issues in data generation API
Partial cherry-pick from , leaving only the parts affecting
data generation.

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
2023-03-15 09:15:03 +00:00
mineblock11
c16602cafa FabricLanguageProvider - Data Generation API ()
Co-authored-by: modmuss50 <modmuss50@gmail.com>
Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
2023-03-15 09:15:03 +00:00
modmuss50
dd4fd39044 Add DataGeneratorEntrypoint.getEffectiveModId () 2023-03-15 09:15:03 +00:00
modmuss50
9a4cf49a49 Bump version 2023-02-24 10:05:16 +00:00
PepperCode1
03e2b68790
Fix backport ()
- Restore BlockRenderContext.didOutput
- Restore null checks for AoCalculator.vanillaCalc
2023-02-24 09:50:21 +00:00
modmuss50
a1cecd3807 Bump version 2023-02-23 12:58:52 +00:00
PepperCode1
bf4864981b Indigo shade related fixes and other changes ()
* Apply disabled shade from vanilla quads directly to material

- Remove QuadViewImpl.shade

* Fix enhanced AO calculation and respect non-terrain culling state

- Fix AoCalculator using AO face data computed with a potentially different shade state
- Move non-cached computation code to separate method in AoCalculator
- Turn AoCalculator's brightnessFunc and aoFunc into abstract methods
- Do not check null check world in non-terrain AO calculation since it cannot be null
- Pass through lightFace and shade state as method arguments in AoCalculator methods to prevent additional lookups
- Do not check for the axis aligned flag in AbstractQuadRenderer.shadeFlatQuad
- Respect cull parameter passed to non-terrain rendering by merging TerrainBlockRenderInfo into BlockRenderInfo
- Use reusable search pos when calling Block.shouldDrawSide to prevent additional BlockPos allocation
- Change BlockRenderContext.render and TerrainRenderContext.tessellateBlock to return void since return value is no longer used
- Remove QuadViewImpl.vertexStart since it is unused

* Add suggestions

- Mark Direction parameter to BlockRenderInfo.shouldDrawFace as Nullable
- Reuse MaterialFinder in FrameBakedModel

(cherry picked from commit 3a95925af4)

(cherry picked from commit 1adbf277ee)
2023-02-23 10:49:42 +00:00
Technici4n
6bd39c990e Indigo and Renderer API fixes related to fallback consumers ()
* Fix : Indigo fallback consumer does not respect BlendMode or emissivity

* Change renderer testmod to test material change

* Remove presumably unneeded `quad.geometryFlags()` call

* Also test emissivity

* Call emitBlockQuads in the testmod

* Allow passing the block state explicitly to the fallback consumer. Fixes 

* Expand testmod to also test item models

* Also fix fallback consumer ignoring material for items

* Slight changes

* Introduce new interface for the expanded fallback consumer

* Add javadoc to ModelHelper

(cherry picked from commit 9f179aa14c)

(cherry picked from commit 2e5408b563)
2023-02-23 10:40:06 +00:00
modmuss50
88087ab966 Bump versions 2023-01-31 10:28:13 +00:00
modmuss50
a6f01b2607 Fix vanilla behaviour change causing Dragon Breath's to leave an empty Glass Bottle in Brewing Stand ()
This fix restores the previouslly broken behaviour of item remainders in brewing stands.

(cherry picked from commit 312c329484)
2023-01-31 10:19:47 +00:00
BasiqueEvangelist
64b7c69373 Fix memory leak by using weak set for ArrayBackedEvent list ()
* use weak set for array backed events list

* use thread safe map

(cherry picked from commit 70be179cf3)
2023-01-31 08:57:21 +00:00
modmuss50
ff8094f0c5 Bump version 2022-11-20 14:53:10 +00:00
AlphaMode
d8cf4e5a10 Support stack aware recipe remainders ()
* Support stack aware recipe remainders

* Fix checkstyle

* Remove all overwrites

* Add FabricItemStack and make RecipeRemainderHandler thread safe

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecipeRemainderHandler.java

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

* Remove hasRecipeRemainder, Update test mod and remove unneeded mixins

* Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java

Co-authored-by: Salvatore Peluso <info@devpelux.xyz>

* Avoid copying the ItemStack

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java

Co-authored-by: Salvatore Peluso <info@devpelux.xyz>

* Sneakily change duplicate keybinding to a less used key

* make everything thread safe and improve AbstractFurnaceBlockEntityMixin

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

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

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java

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

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: Salvatore Peluso <info@devpelux.xyz>

* clear thread local and change field prefix

* forgot the allow

* Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

Co-authored-by: Salvatore Peluso <info@devpelux.xyz>

* Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java

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

* Add FurnaceGameTest

* Change test keybind back to LShift

* Fix brewing stand remainder and fix nitpicks

* add code example to remainder javadoc

* Fixed and reformatted docs, changed recipe mixin behavior to store the remainder stack instead of the original stack, refactoring.

* Added gametests for brewing stand and recipe mixins, fixed furnace gametest compairing stacks with themselves.

* Use (0,1,0) position for game tests

* Review changes

Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>
Co-authored-by: Salvatore Peluso <info@devpelux.xyz>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
(cherry picked from commit fa140d5976)
2022-11-20 14:22:49 +00:00
modmuss50
8d7ffdee44 Bump version 2022-11-07 20:35:35 +00:00
Technici4n
ee3621fcdd Add a block appearance API () 2022-11-07 19:16:41 +00:00
modmuss50
880f393aaa Bump version 2022-10-18 14:00:01 +01:00
Benonardo
bb2e04773e Fix crash when replacing SimpleRegistry contents ()
* Fix crash when replacing SimpleRegistry contents

* Called .value() two more times

(cherry picked from commit 726b65209a)
2022-10-18 13:56:33 +01:00
Technici4n
5d58937841 Skip adding out-of-bound sprites to SpriteFinderImpl ()
(cherry picked from commit c0ae659db2)
2022-10-18 13:49:01 +01:00
modmuss50
e77f1c629b Bump version. 2022-09-25 15:03:38 +01:00
modmuss50
e1cc3e83aa Bump version. 2022-09-17 10:09:14 +01:00
modmuss50
1e52169859
Rename modid to "fabric-api" and provide "fabric" () 2022-09-17 10:08:10 +01:00
modmuss50
f14603e862 Bump version 2022-07-21 20:41:03 +01:00
Technici4n
17cbbd436b Fix inconsistent ordering of item attribute modifiers by using a linked hashmap () 2022-07-21 20:16:02 +01:00
apple502j
2d30af4b7a Fix incorrect check in GlobalReceiverRegistry () 2022-07-21 20:15:58 +01:00
PepperCode1
41a02c8a4e Fix Indigo AO calculation ()
* Fix AO calculation

- Ensure calcFastVanilla and computeFace have parity with vanilla
- Ensure BlockStates are not queried more than once for the same position
- Replace deprecated FabricLoader#getConfigDirectory call with FabricLoader#getConfigDir

* Revert opaque sides fix

* More AO fixes and optimizations
2022-07-21 20:15:22 +01:00
modmuss50
2d1b3c535f Enable parallel builds by default.
Update remotesign to a parallel capable version.
Set org.gradle.parallel.threads in actions as we are IO bound.
2022-07-21 20:11:14 +01:00
modmuss50
f12f3bf3f7 Bump version. 2022-06-28 19:47:14 +01:00
apple502j
651bcc5952
Fix biome modification for modded end biomes () 2022-06-28 19:26:04 +01:00
deirn
489d6f824d
Port fix for MC-195468 to 1.18.2 ()
* re-enable custom dimension test

* port ServerBugfixMixin to 1.18.2
2022-06-28 19:25:06 +01:00
Juuxel
1997ad1227 Add FabricLootTableBuilder.modifyPools ()
* Add FabricLootTableBuilder.modifyPools

* Fix typo in javadoc
2022-06-28 19:23:34 +01:00
Player
d005b03a4c Clarify Indigo TextureHelper BAKE_NORMALIZED use 2022-06-24 05:50:11 +02:00
Player
16d6ef959a Revert "Fix the bitwise comparison for BAKE_NORMALIZED ()"
This reverts commit 0ca985e2c2.
2022-06-24 05:46:29 +02:00
RichieSams
0ca985e2c2 Fix the bitwise comparison for BAKE_NORMALIZED ()
The bitwise comparison is doing the opposite of what we want. It's currently checking for the *absence* of the BAKE_NORMALIZED flag. And if the flag is absent, it is normalizing. This should do the opposite.
2022-06-23 20:21:24 +01:00
mooz
3fa7078881 Bump version. 2022-06-19 19:46:27 +01:00
modmuss50
446e0595e8 Optimise file exists check in ModNioResourcePack () 2022-06-19 19:22:46 +01:00
PepperCode1
0ca3bd2b78 Defer Indigo item rendering ()
- Move ItemRenderer injection point from head to before isBuiltin check to allow model replacement to run
2022-06-19 19:22:43 +01:00
Technici4n
c85f2e3889
Fix : FlammableBlockRegistry ignores tags unless /reload () 2022-06-19 19:18:05 +01:00
apple502j
22138a0242
Backport fixes to resource loader and biome API ()
* Load mod-provided data packs and DRM entries (backport of )

* Port biome testmod changes

* Fix Biome API bugs (backport of )

* Re-run tests
2022-06-19 19:17:33 +01:00
modmuss50
d78c70fcbb Bump version 2022-06-13 20:41:02 +01:00