Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make AttributeTemplate record public #1708

Merged
merged 4 commits into from
Nov 28, 2024
Merged

Make AttributeTemplate record public #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae5c52b
Make AttributeTemplater ecord public
TelepathicGrunt Nov 26, 2024
6161212
AT access to record
TelepathicGrunt Nov 26, 2024
da40a62
Merge branch '1.21.x' into AttributeTemplatePublicity
marchermans Nov 27, 2024
57fd4ba
Merge branch '1.21.x' into AttributeTemplatePublicity
marchermans Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/net/minecraft/world/effect/MobEffect.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
return this.requiredFeatures;
}

- static record AttributeTemplate(ResourceLocation id, double amount, AttributeModifier.Operation operation) {
+ static record AttributeTemplate(ResourceLocation id, double amount, AttributeModifier.Operation operation, @Nullable it.unimi.dsi.fastutil.ints.Int2DoubleFunction curve) {
- public static record AttributeTemplate(ResourceLocation id, double amount, AttributeModifier.Operation operation) {
+ public static record AttributeTemplate(ResourceLocation id, double amount, AttributeModifier.Operation operation, @Nullable it.unimi.dsi.fastutil.ints.Int2DoubleFunction curve) {
+
+ public AttributeTemplate(ResourceLocation id, double amount, AttributeModifier.Operation operation) {
+ this(id, amount, operation, null);
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/accesstransformer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ public net.minecraft.world.damagesource.DamageSources source(Lnet/minecraft/reso
public net.minecraft.world.damagesource.DamageSources source(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource; # source
public net.minecraft.world.damagesource.DamageSources source(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource; # source
public net.minecraft.world.damagesource.DamageSources damageTypes # damageTypes
public net.minecraft.world.effect.MobEffect$AttributeTemplate <init>(Lnet/minecraft/resources/ResourceLocation;DLnet/minecraft/world/entity/ai/attributes/AttributeModifier$Operation;)V # constructor
public net.minecraft.world.effect.MobEffect$AttributeTemplate # AttributeTemplate
protected net.minecraft.world.entity.Entity ENTITY_COUNTER # ENTITY_COUNTER
public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String; # getEncodeId
public net.minecraft.world.entity.ExperienceOrb value # value
Expand Down