From 21a486b9bf098494152580a334b9a03168ce96bf Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Thu, 24 Aug 2023 15:46:28 +0200 Subject: [PATCH] oops --- .../geyser/api/item/custom/NonVanillaCustomItemData.java | 6 +++--- .../registry/mappings/versions/MappingsReader_v1.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java b/api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java index 53fc7f82309..616a5bba6e1 100644 --- a/api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java +++ b/api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java @@ -227,9 +227,6 @@ default Builder tool(boolean isTool) { @Override Builder icon(@NonNull String icon); - @Override - Builder tags(@Nullable Set tags); - @Override Builder allowOffhand(boolean allowOffhand); @@ -242,6 +239,9 @@ default Builder tool(boolean isTool) { @Override Builder renderOffsets(@Nullable CustomRenderOffsets renderOffsets); + @Override + Builder tags(@Nullable Set tags); + NonVanillaCustomItemData build(); } } diff --git a/core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java b/core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java index 481efff5f76..4da2abfe19d 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java +++ b/core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java @@ -339,7 +339,7 @@ private CustomBlockMapping createCustomBlockMapping(CustomBlockData.Builder cust CustomBlockData customBlockData = customBlockDataBuilder .permutations(permutations) .build(); - // Build CustomBlockStates for each Java block staFte we wish to override + // Build CustomBlockStates for each Java block state we wish to override Map states = blockStateBuilders.entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> new CustomBlockStateMapping(e.getValue().builder().apply(customBlockData.blockStateBuilder()), e.getValue().extendedCollisionBox())));