Commit graph

124 commits

Author SHA1 Message Date
Mark
81af046eba [1.19.3] Implement custom SignTypes (#2832)
* 1.19.3 custom sign types

Co-authored-by: AlphaMode <26313415+alphamode@users.noreply.github.com>

* fix mixin name

Co-authored-by: AlphaMode <26313415+alphamode@users.noreply.github.com>
(cherry picked from commit eb2a3ba986)
2023-01-20 18:01:07 +00:00
apple502j
85f102ee1a
Object builder API updates (#2798)
* Add feature support to FabricEntityTypeBuilder

* Use IdentityHashMap for EntityType-keyed maps

* Improve tests

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityTypeBuilder.java

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

* Fix naming of static-final field

* Address some reviews

* Rebuild

* Split gametest

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/MinecartComparatorLogicRegistry.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2023-01-02 13:05:10 +00:00
Silver
e498f5f0a9
Replace old nullability comments with annotations (#2800)
* Replace useless nullability comments with jetbrains annotation

* These were old comments

* Revert "These were old comments"

This reverts commit 4e9555ad51.

* checkstyle + nullability in mixin
2023-01-02 13:04:34 +00:00
apple502j
f1e4495b13
Javadoc and typo fixes (#2782) 2022-12-23 15:20:04 +00:00
apple502j
e9dee004f1
Refactor FabricBlockSettings to copy and override new stuff (#2741)
* Copy new block settings

* Sort method calls in copy method

* Add more overrides
2022-12-11 13:50:59 +00:00
modmuss50
49abcf7e64 Update mappings 2022-11-16 16:12:51 +00:00
modmuss50
f84bf2d968
22w45a (#2647) 2022-11-10 16:07:38 +00:00
modmuss50
28cc6cc789 Merge remote-tracking branch 'origin/1.19.2' into 1.19.3
# Conflicts:
#	gradle.properties
2022-11-07 19:01:58 +00:00
triphora
06e0e251a9
Implement a version of FabricDefaultAttributeRegistry#register that takes a DefaultAttributeContainer (#2589)
Refer to https://github.com/orgs/FabricMC/discussions/2587 for motivations :)
2022-11-07 18:30:06 +00:00
modmuss50
11ba9c3b22
22w43a (#2610)
Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>
2022-10-26 20:48:38 +01:00
modmuss50
75e98211bd
22w42a 🐫 (#2599)
Co-authored-by: shartte <shartte@users.noreply.github.com>
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2022-10-22 20:38:33 +01:00
apple502j
93d8cb82e8
Fix many javadoc issues (#2526)
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2022-09-25 14:45:12 +01:00
modmuss50
aeb40ebeab
Rename and validate Mixin class names. (#2450)
And update loom.
2022-08-15 18:59:19 +01:00
Shnupbups
42d99c329d
Add many more transitive access wideners (#2341)
- `DamageSource` constructor and methods made accessible - supersedes #1085
- `SpawnRestriction` method `register` made accessible - allows `SpawnRestrictionAccessor` mixin to be removed
- `TradeOffers` trade factory inner classes made accessible
- `Material$Builder` methods made accessible (except `lightPassesThrough` method as that would break binary compat in `FabricMaterialBuilder`
- Fixed `generateAccessWideners` task for TAWs module so it can now find the jar
- `AxeItem`, `MusicDiscItem`, and `PickaxeItem` constructors made accessible
- `ItemUsageContext` and `ItemPlacementContext` alternate constructors made accessible - allows passing a `null` PlayerEntity
- `Factory` inner classes of both `CookingRecipeSerializer` and `CuttingRecipeSerializer` made accessible
- `BrewingRecipeRegistry` methods `registerItemRecipe`, `registerPotionType`, and `registerPotionRecipe` made accessible
- `ScoreboardCriterion` `create` methods made accessible
- `ModelPart` inner classes `Vertex` and `Quad` made accessible
- `RenderLayer` `of` method made accessible
- `SensorType` and `Activity` constructors made accessible
- `LivingEntity` methods `damageArmor`, `damageHelmet`, and `damageShield` made accessible
- `ProjectileEntity` constructor made accessible
- `FishingBobberEntity` alternate constructor made accessible - allows passing luck of the sea or lure levels for custom fishing bobbers
- `ServerWorld` method `sendToPlayerIfNearby` made accessible
- `TextColor` method `getHexCode` made accessible
- `TranslatableTextContent` method `getArg` made accessible
2022-08-15 18:41:18 +01:00
apple502j
7675279697 Fix POI types not being registered properly 2022-08-06 19:12:46 +01:00
apple502j
83a865928d
Make static-only classes final and unconstructible (#2421)
The following classes have been made final and unconstructible:

- All convention tags classes
- `FluidVariantAttributes`
- `FluidVariantRendering`

The following classes have been made unconstructible:

- `BiomeModifications`
- `ClientEntityEvents`
- `ClientTickEvents`
- `LootTableEvents`
- `FabricDefaultAttributeRegistry`
- `MinecartComparatorLogicRegistry`
- `StorageUtil`

The following classes have been explicitly marked as final. Note that actually extending such class has always been impossible due to missing public constructor:

- `VillagerInteractionRegistries`
- `VillagerPlantableRegistry`
- `ModelHelper`
- `StoragePreconditions`

While the first two are technically breaking changes, there is no actual or observed usage for any of those.
2022-08-06 19:04:11 +01:00
Technici4n
1e232e13ae
Move a few object builders to transitive AWs (#2154)
* Move a few object builders to transitive AWs

* Remove outdated access widener

* Remove controversial deprecation of FabricBlockEntityTypeBuilder
2022-08-06 19:01:41 +01:00
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
modmuss50
23acfcd6a1 Update mappings. 2022-05-20 18:56:00 +01:00
Player
f71b366fb1
Update command registration API to reflect 1.19 vanilla changes (#2227)
* Update command registration API to reflect vanilla changes

* Allow module versions in impl+mixin packages

* Use v2 module, keeping v1 for server commands at least

* update, address review

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-05-20 18:39:10 +01:00
modmuss50
51821d6d14 Copy offsetType in FabricBlockSettings 2022-05-20 18:29:19 +01:00
Luligabi1
1e43a8d519 Fix #1947, #1873: FabricBlockSettings#copy does not copy all settings, the sequel (#2119)
* Fix FabricMC#1947, FabricMC#1873

* Ordered import to follow checkstyle

* Removed broken 1.18 code on 1.18.2 branch

* Added note specyfing that FabricBlockSettings copies settings Block.Settings doesn't.

(cherry picked from commit 032c981de8)
2022-05-20 18:19:41 +01:00
modmuss50
55043e695a 1.19-pre1 2022-05-18 19:16:52 +01:00
modmuss50
55e82473ab 22w19a 2022-05-12 21:58:35 +01:00
modmuss50
ec94c6f636
22w16b
Co-authored-by: Player <player@player.to>
2022-04-20 22:22:10 +01:00
modmuss50
8eae451042 22w15a 2022-04-13 19:03:57 +01:00
modmuss50
0c7c3953f9 Merge remote-tracking branch 'origin/1.18.2' into 1.19 2022-04-10 17:20:49 +01:00
haykam821
fe4ddef067
Add methods to the FabricBlockEntityTypeBuilder class for adding additional blocks (#1699)
* Add methods to the FabricBlockEntityTypeBuilder class for adding additional blocks

* Fix the FabricBlockEntityTypeBuilder class creating a fixed-size initial blocks list

* Document the FabricBlockEntityTypeBuilder#addBlock method

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

* Document the FabricBlockEntityTypeBuilder#addBlocks method

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

* Add tests for the FabricBlockEntityTypeBuilder class

* Fix license violations in the BlockEntityTypeBuilderTest class

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2022-04-10 16:34:05 +01:00
modmuss50
717abbc48a 22w14a 2022-04-06 21:49:45 +01:00
modmuss50
a67d2aa505 22w12a 2022-03-24 20:18:23 +00:00
Juuxel
40c91ec8c3
Create transitive AW module (#2044)
* Add transitive AW module with block constructors

* Add various registries to transitive AW module

* Fix module name in README, add skip flags to class reading

* Add reasons for TAWs, document Block ctor finding algorithm
2022-03-13 13:52:38 +00:00
CyborgCabbage
34b2a0ce93
Fix Order of operations in FabricEntityTypeBuilder (#2024) 2022-03-03 18:16: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
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
Vincent Lee
3b82842e3d Add ability for minecarts to specify their detector rail comparator value (#1321)
* Add ability for minecarts to specify their detector rail comparator value

Address comments

* Apply suggestions from code review

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

* Warn instead of debug

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-12-03 13:37:23 +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
Juuxel
d2f76b0fdf 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
2021-11-05 15:50:11 +00:00
modmuss50
b7ab612143 1.17-pre1 2021-05-27 18:40:00 +01:00
Player
8297e96629 21w20a
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-05-20 01:15:25 +02:00
modmuss50
a02b4463f9 21w19a 2021-05-12 20:23:04 +01:00
Technici4n
1f1ad061d4 Fix trade offers by writing to the trade map directly (#1430)
* Write to the trade map directly

* Add warning when TradeOfferHelper#refreshOffers is called

* Correctly use synchronized, just in case

* Add null check - PR should be ready for merge now

* Make ctor private to hide it from javadoc
2021-05-01 23:23:40 +02:00
modmuss50
40e100eb8e 21w07a - Fairly major mappings update 2021-02-17 19:11:45 +00:00
PepperCode1
4270b5a63f Fix FabricMaterialBuilder.notSolid having the wrong return type (#1308)
Should be backwards compatible.

(cherry picked from commit cd0f1d33c1)
2021-02-14 17:56:45 +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
modmuss50
df3673f0bc 20w46a 2020-11-11 20:18:14 +00:00
i509VCB
8d074a03a9
Temp fix for feature renderer testmod, update mappings, reimplement client entity events (#1152)
* Temp fix for feature renderer testmod, update mappings

* Deprecation comments...

* Reimplement client entity events

* Readd the client world change entity event stuff
2020-11-07 19:54:09 +00:00
modmuss50
fd6e7547e7
20w45a
Added FabricBlockEntityTypeBuilder
Reworked EntityRendererRegistry
Ported BlockEntityRendererRegistry
2020-11-05 18:05:55 +00:00
modmuss50
a89534abff Add back renamed lightLevel method, I believe the root cause of this issue is in tiny remapper 2020-10-28 08:44:17 +00:00
i509VCB
25b143484c
Tweak entity type builder generics to eliminate explicit type arguments (#1094)
* Tweak entity type builder generics to eliminate explicit type arguments

* Apply different generic on the entity factory method
2020-10-26 20:57:02 +00:00
i509VCB
eacb8ba396
Update yarn mappings (#1127) 2020-10-22 18:54:44 +01:00
i509VCB
1304192f58
Add helper methods to create custom villager types. (#1076)
* Add helper methods to create custom villager types.

* Rename biome method

* Make it register and register the instance of the villager type.

* Javadoc 2

* Add texture javadoc
2020-10-05 19:15:49 +01:00
Deximus-Maximus
5f10696617
Add @Nullable and friends (#1007)
* Boost to Loom 0.5
Add null related annotations

* Rearrange nullable to be overline

* Fix anno sorting for picky

* Add imports

* Address feedback

* Fix import
2020-09-27 12:10:02 +01:00
modmuss50
95c147c6a1 Fix crash in prod 2020-09-18 18:30:17 +01:00
i509VCB
670bc71753 Fix bug with creating custom villager types and TradeOffer utilities. 2020-09-18 18:09:23 +01:00
modmuss50
b17f382b19
Custom advancement criterion registry (#1091)
* Custom advancement criterion registry

Fixes #20

Signed-off-by: liach <liach@users.noreply.github.com>

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/advancement/FabricCriterionRegistry.java

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/advancement/FabricCriterionRegistry.java

* Rename fabric criterion registry -> criterion registry

Signed-off-by: liach <liach@users.noreply.github.com>

* Remove unnecessary build.gradle parts

Will add manually when I run tests

Signed-off-by: liach <liach@users.noreply.github.com>

* Fine I give up

Hope my github editing skill suffices

* Code style

Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-09-18 17:44:59 +01:00
Hugman
15028e6f6c
Tweaks to EntityTypeBuilder [1.16] (#836)
* Better consistency with vanilla mobs

* Added a new method for just tracking distance

* Renamed param names

* Update FabricEntityTypeBuilder.java

* Updated v0 for backwards compatibility

* Updated descriptions and parameter names of FabricEntityTypeBuilder

* Added compat with new builders

* Style fix

* Fix style again

* Added backwards compat
2020-09-03 19:46:36 +01:00
i509VCB
de1d6c86d0
Add ability to define default attributes and spawn restirctions within the entity type builder. (#828)
* Add ability to define default attributes within the entity type builder.

* Update fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java

Co-authored-by: Pyrofab <redstoneinfire@gmail.com>

* Add ability to specify spawn restriction. Add a Living and Mob builder to handle attributes and spawn restrictions seperately from default builder.

* Let's not cast like a maniac

* Add misc overloads for living builder

* Add a few null checks

* Allow factory to be defined in builder

* Make spawn group a builder parameter

Co-authored-by: Pyrofab <redstoneinfire@gmail.com>
2020-08-13 18:15:01 +01:00
Shnupbups
23a4a963ba
Fix FabricBlockSettings not copying the toolRequired boolean (#984) 2020-08-07 19:47:09 +01:00
shedaniel
ba4afa57ac
Fix the javadocs of object-builders as the method was moved from material to block. (#892)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2020-07-20 19:35:49 +01:00
i509VCB
43ae9fbacb
Move new method in FabricBlockSettings to correct place in class. (#668)
The lower methods in the class are commented with their categories:

`FABRIC DELEGATE WRAPPERS` for additional methods to allow editing fields not actually exposed in vanilla.

`FABRIC HELPERS` for methods to handle things like mining levels.

Per these two categories, the new method does not belong in `FABRIC HELPERS` and has been moved accordingly
2020-06-21 13:31:36 +01:00
modmuss50
059ea866ec update mappings 2020-06-09 22:29:07 +01:00
modmuss50
346247d7d1 Checkstyle 2020-06-04 21:24:25 +01:00
modmuss50
74492929a5 Stabilise experimental api's 2020-06-04 21:22:30 +01:00
modmuss50
0d474ec430 1.16-pre1 2020-06-04 21:20:20 +01:00
i509VCB
c6ab3e1b2d
Make the create method public on villager profession builder (#647)
* Make the create method public

* Bump module ver

* Bump main version
2020-05-29 23:34:00 +01:00
i509VCB
2521f6a319 Add object builders to simplify the process of creating Villager professions (#493)
* Add Object builders for simplifying the process of creating villager professions and point of interest types.

* Move everything to new object-builders-api

* flatten a bit down

* a few javadoc changes

* More JD tweaks
2020-05-29 20:02:33 +01:00
modmuss50
da175ad6ad 20w22a 2020-05-29 15:56:10 +01:00
modmuss50
6d41837a96 20w20a 2020-05-13 18:42:14 +01:00
modmuss50
c8964fcb8d tool attribute 1.1 (#589)
* Actual support

* Remove this useless mixin

* Resolve some issues

* Remove duplicate entries

* maybe?

* fix max breaking speed

* choose an item that is the closest

* Set version to 1.1

* better docs remove stuff

* deprecation doc and no todo comments

* Check if block has valid mining level

* javadocs

* Most of the issues resolved

* Some more javadoc and resolve some issues

* Forgot to change order for these

* Adds post process method to DynamicAttributeTool
Fixed going to vanilla again to query
Fixed tool mining level < 0
Fixed vanilla items on modded blocks not working
Renamed taggedToolHandlerInvoker to toolHandlerInvoker
Renamed entries to ENTRIES

* New comparision method for modded tools to vanilla blocks

* Remove useless mixins and use getMaterial().getMiningSpeed to support more tools.

* Simply mixin

* Some useful javadocs

* Fix license

* Bump fabric-object-builders-v0 because we are good

* Bump version of fabric-object-builder-api-v1 because we are nice

* Resolve some issues

* a

* remove vanilla tools vanilla blocks thing ok

* descriptive

* Get the faster speed instead

* Rename ModdedToolsVanillaBlocksToolHandler

* Remove tri state

* Fix compile errors

* testmod

* fix formatting

* fix testmod javadoc

* forgot to license format testmod

* Bump to 1.1.0
# Conflicts:
#	fabric-object-builder-api-v1/build.gradle
#	fabric-tool-attribute-api-v1/build.gradle
#	fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/api/tool/attribute/v1/DynamicAttributeTool.java
#	fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinItemStack.java
#	fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/MixinPlayerInventory.java
2020-05-11 22:12:43 +01:00
liach
eae12eb815
Add fabric model predicate provider registry (#601)
* Add fabric model predicate provider registry

Signed-off-by: liach <liach@users.noreply.github.com>

* Fix jd with new mappings

Signed-off-by: liach <liach@users.noreply.github.com>

* Bump module version

Signed-off-by: liach <liach@users.noreply.github.com>

* Remove redundant line

* Move inner class accessor to outer class

Co-authored-by: liach <liach@users.noreply.github.com>
2020-05-07 22:10:07 +01:00
modmuss50
84cce57f4d 20w19a: Deprecated min/maxDespawnDistance in FabricEntityTypeBuilder as they are no longer applicable to the EntityType.
This was done to keep mod compat and will be removed very shortly. I dont think they were used by many mods (only added in a recent 1.16 snapshot) so I think this is the best course of action.
2020-05-06 18:46:36 +01:00
modmuss50
bf7c167a1d Fix crash 2020-04-30 00:45:49 +01:00
i509VCB
c38e8d9e1e
Object builders v0->v1 migration (#537)
* Migrate object builders from v0 -> v1

* Port entity attribute registry to v1
2020-04-29 22:48:08 +01:00