Modding/silicate
Modding/silicate
5
0
Fork 1
Code Issues 4 Pull requests 1 Projects Releases 19 Packages Wiki Activity Actions

chore: Port to 1.21.5 + some additional fixes. #18

Merged
Sylv merged 10 commits from chore/1.21.5 into 1.21.5 2025-08-18 19:04:41 +00:00
Conversation 4 Commits 10 Files changed 51 +1103 -661
Cow commented 2025-07-27 08:56:53 +00:00
Owner
Copy link

(Copypaste of CHANGELOG.md)

Breaking Changes

  • silicate:entity_vehicle must now use the silicate:vehicle_entity param type to reference the vehicle entity, with other fields remaining the exact same.
  • silicate:entity_passenger must now use the silicate:passenger_entity param type to reference the passenger entity, with other fields remaining the exact same.
  • silicate:entity_tame_owner must now use the silicate:owner_entity param type to reference the owner entity, with other fields remaining the exact same.
  • silicate:entity_projectile_owner must now use the silicate:owner_entity param type to reference the owner entity, with other fields remaining the exact same.
  • The ContextParamType codec will now return a data error if not present within the registry, or if the class of the registered param type is unable to be casted to the specified class. On a success, this will return the original context param type if it is an exact match in class, otherwise, this will create a new param type if the resulting class can be cast to the specified class. The latter is always equal to the former.

Added

  • Ported to 1.21.5.

Fixed

  • Fixed entity_vehicle, entity_passenger, entity_tame_owner, entity_projectile_owner conditions overriding the original field with the target entity within their inner conditions' context.
  • Fixed issues with registering custom game conditions on NeoForge.
  • Fixed ContextParamType codec creating entirely new param types without checking if a param type of the sort exists already.
  • Fixed ContextParamType codec's entirely new param types not being equal to any param type in the case of casted classes.
(Copypaste of CHANGELOG.md) ## Breaking Changes - `silicate:entity_vehicle` must now use the `silicate:vehicle_entity` param type to reference the vehicle entity, with other fields remaining the exact same. - `silicate:entity_passenger` must now use the `silicate:passenger_entity` param type to reference the passenger entity, with other fields remaining the exact same. - `silicate:entity_tame_owner` must now use the `silicate:owner_entity` param type to reference the owner entity, with other fields remaining the exact same. - `silicate:entity_projectile_owner` must now use the `silicate:owner_entity` param type to reference the owner entity, with other fields remaining the exact same. - The ContextParamType codec will now return a data error if not present within the registry, or if the class of the registered param type is unable to be casted to the specified class. On a success, this will return the original context param type if it is an exact match in class, otherwise, this will create a new param type if the resulting class can be cast to the specified class. The latter is always equal to the former. ## Added - Ported to 1.21.5. ## Fixed - Fixed `entity_vehicle`, `entity_passenger`, `entity_tame_owner`, `entity_projectile_owner` conditions overriding the original field with the target entity within their inner conditions' context. - Fixed issues with registering custom game conditions on NeoForge. - Fixed ContextParamType codec creating entirely new param types without checking if a param type of the sort exists already. - Fixed ContextParamType codec's entirely new param types not being equal to any param type in the case of casted classes.
Cow commented 2025-07-27 09:01:49 +00:00
Author
Owner
Copy link

Another little note is that I've updated parts of the Gradle build script to my own preferences.

Another little note is that I've updated parts of the Gradle build script to my own preferences.
sylv256 (Migrated from github.com) reviewed 2025-08-01 05:28:24 +00:00
common/src/main/java/net/modgarden/silicate/api/condition/builtin/EntityPassengerCondition.java
sylv256 (Migrated from github.com) commented 2025-08-01 05:28:24 +00:00
Copy link

In a future PR, we should make this configurable.

In a future PR, we should make this configurable.
sylv256 (Migrated from github.com) approved these changes 2025-08-18 19:03:43 +00:00
sylv256 (Migrated from github.com) left a comment
Copy link

We need to get this out for ModFest: Toybox, so we can fix the nitpicks later.

We need to get this out for ModFest: Toybox, so we can fix the nitpicks later.
common/src/main/java/net/modgarden/silicate/api/context/param/ContextParamType.java
@ -39,1 +39,3 @@
.xmap(name -> new ContextParamType<>(name, clazz), ContextParamType::name);
.flatXmap(name -> {
ContextParamType<?> paramType = SilicateBuiltInRegistries.CONTEXT_PARAM_TYPE.getValue(name);
if (paramType != null) {
sylv256 (Migrated from github.com) commented 2025-08-01 05:53:47 +00:00
Copy link

We can move all of this logic to TypedGameCondition#validate and use a byName Codec.

We can move all of this logic to `TypedGameCondition#validate` and use a `byName` Codec.
common/src/main/java/net/modgarden/silicate/api/context/param/ContextParamType.java
@ -40,0 +43,4 @@
return DataResult.success((ContextParamType<T>)paramType);
if (clazz.isAssignableFrom(paramType.clazz())) // If the paramType extends the specified class...
return DataResult.success(new ContextParamType<>(name, clazz)); // Create a new ContextParamType that may be used in place of the old one.
return DataResult.error(() -> paramType + " is not of the proper parameter"); // Remapping is the reason why we don't tell which class.
sylv256 (Migrated from github.com) commented 2025-08-01 05:36:20 +00:00
Copy link

We should remove unbraced if-statements, this could be ambiguous.

We should remove unbraced if-statements, this could be ambiguous.
common/src/main/java/net/modgarden/silicate/api/context/param/ContextParamType.java
@ -40,0 +52,4 @@
@Override // Makes sure that values return the correct value within the context when clazz is cast.
public boolean equals(Object obj) {
if (obj == this)
return true;
sylv256 (Migrated from github.com) commented 2025-08-01 05:47:58 +00:00
Copy link

We should remove this if it's not used anywhere, and I don't think this comment has anything to do with anything here.

We should remove this if it's not used anywhere, and I don't think this comment has anything to do with anything here.
common/src/test/java/net/modgarden/silicate/test/instance/ConditionsTestInstance.java
@ -0,0 +125,4 @@
.build();
}
private static ContextParamMap createParamMap(BlockState state, BlockPos origin, Entity entity, Entity entity2, BlockState entityBlock, ServerPlayer fakePlayer, Projectile projectile, GameTestHelper helper) throws InvalidContextParameterException {
sylv256 (Migrated from github.com) commented 2025-08-01 06:02:24 +00:00
Copy link

We should probably name entity and entity2 something more specific, like "chicken" or whatever mob name they are.

We should probably name `entity` and `entity2` something more specific, like "chicken" or whatever mob name they are.
Sign in to join this conversation.
Reviewers
No reviewers
sylv256
Labels
Clear labels
  
Compat
Breaking
Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Port

Port to another platform version

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Security

This is security issue

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Status
Needs Triage
This issue or pull request needs to be triaged

  
Testing

Issue or pull request related to testing

No labels
Compat
Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Port
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Security
Status
Abandoned
Status
Blocked
Status
Need More Info
Status
Needs Triage
Testing
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Modding/silicate!18
No description provided.