trueog/ViaVersion
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix attack_range and provides_banner_pattern hashing

Browse Source
This commit is contained in:
Nassim Jahnke committed 2026-03-30 20:22:40 +02:00
1 parent e2d3874f6d
commit 8b115c7fde
4 files changed
+6 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderSet.java
+3
View File
@@ -22,6 +22,7 @@
*/
package com.viaversion.viaversion.api.minecraft;
import com.google.common.base.Preconditions;
import com.viaversion.nbt.tag.ListTag;
import com.viaversion.nbt.tag.StringTag;
import com.viaversion.nbt.tag.Tag;
@@ -40,6 +41,7 @@ public interface HolderSet {
* @return a new holder set
*/
static HolderSet of(final String tagKey) {
Preconditions.checkNotNull(tagKey);
return new HolderSetImpl.Tag(tagKey);
}
@@ -50,6 +52,7 @@ public interface HolderSet {
* @return a new holder set
*/
static HolderSet of(final int[] ids) {
Preconditions.checkNotNull(ids);
return new HolderSetImpl.Ids(ids);
}
api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttackRange.java
+2 -2
View File
@@ -56,8 +56,8 @@ public record AttackRange(float minRange, float maxRange,
@Override
public void write(final Ops ops, final AttackRange AttackRange) {
ops.writeMap(map -> map
.writeOptional("min_range", Types.FLOAT, AttackRange.minRange, 0F)
.writeOptional("max_range", Types.FLOAT, AttackRange.maxRange, 3F)
.writeOptional("min_reach", Types.FLOAT, AttackRange.minRange, 0F)
.writeOptional("max_reach", Types.FLOAT, AttackRange.maxRange, 3F)
.writeOptional("min_creative_reach", Types.FLOAT, AttackRange.minCreativeRange, 0F)
.writeOptional("max_creative_reach", Types.FLOAT, AttackRange.maxCreativeRange, 5F)
.writeOptional("hitbox_margin", Types.FLOAT, AttackRange.hitboxMargin, 0.3F)
api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ProvidesBannerPatterns.java
+1 -8
View File
@@ -24,18 +24,11 @@ package com.viaversion.viaversion.api.minecraft.item.data;
import com.viaversion.viaversion.api.minecraft.HolderSet;
import com.viaversion.viaversion.api.minecraft.RegistryKey;
import com.viaversion.viaversion.api.minecraft.codec.Ops;
import com.viaversion.viaversion.api.type.TransformingType;
import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.Types;
import com.viaversion.viaversion.api.type.types.misc.HolderSetType;
public record ProvidesBannerPatterns(HolderSet patterns) {
public static final Type<ProvidesBannerPatterns> TYPE = new TransformingType<>(Types.HOLDER_SET, ProvidesBannerPatterns.class, ProvidesBannerPatterns::new, ProvidesBannerPatterns::patterns) {
@Override
public void write(final Ops ops, final ProvidesBannerPatterns value) {
ops.writeMap(map -> map.write("items", new HolderSetType(RegistryKey.of("banner_pattern")), value.patterns));
}
};
public static final Type<ProvidesBannerPatterns> TYPE = TransformingType.of(new HolderSetType(RegistryKey.of("banner_pattern")), ProvidesBannerPatterns.class, ProvidesBannerPatterns::new, ProvidesBannerPatterns::patterns);
}
common/src/main/java/com/viaversion/viaversion/rewriter/RecipeDisplayRewriter.java
-1
View File
@@ -198,7 +198,6 @@ public class RecipeDisplayRewriter<C extends ClientboundPacketType> {
final int[] ids = items.ids();
for (int i = 0; i < ids.length; i++) {
final int id = ids[i];
ids[i] = rewriteItemId(ids[i]);
}
}