From 8ee624f02d52ae8103bfa50e23e95c528635c356 Mon Sep 17 00:00:00 2001 From: Kieran Wallbanks Date: Wed, 17 Mar 2021 12:19:22 +0000 Subject: [PATCH] make Sound enum implement Adventure's Sound.Type --- .../java/net/minestom/server/sound/Sound.java | 2 +- .../minestom/codegen/sounds/SoundEnumGenerator.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/autogenerated/java/net/minestom/server/sound/Sound.java b/src/autogenerated/java/net/minestom/server/sound/Sound.java index 2394aff1a..d5b8058d0 100644 --- a/src/autogenerated/java/net/minestom/server/sound/Sound.java +++ b/src/autogenerated/java/net/minestom/server/sound/Sound.java @@ -11,7 +11,7 @@ import net.minestom.server.utils.NamespaceID; * //============================== */ @SuppressWarnings({"deprecation"}) -public enum Sound implements Keyed { +public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { AMBIENT_CAVE("minecraft:ambient.cave"), AMBIENT_BASALT_DELTAS_ADDITIONS("minecraft:ambient.basalt_deltas.additions"), diff --git a/src/generators/java/net/minestom/codegen/sounds/SoundEnumGenerator.java b/src/generators/java/net/minestom/codegen/sounds/SoundEnumGenerator.java index 8ca5f8fd2..0d67b1ea5 100644 --- a/src/generators/java/net/minestom/codegen/sounds/SoundEnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/sounds/SoundEnumGenerator.java @@ -1,7 +1,9 @@ package net.minestom.codegen.sounds; +import com.squareup.javapoet.ClassName; +import net.kyori.adventure.sound.Sound; import net.minestom.codegen.BasicEnumGenerator; -import net.minestom.codegen.stats.StatsEnumGenerator; +import net.minestom.codegen.EnumGenerator; import net.minestom.server.registry.ResourceGatherer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +47,14 @@ public class SoundEnumGenerator extends BasicEnumGenerator { super(targetFolder); } + @Override + protected void prepare(EnumGenerator generator) { + super.prepare(generator); + + // implement type as well + generator.addSuperinterface(ClassName.get(Sound.Type.class)); + } + @Override protected String getCategoryID() { return "minecraft:sound_event";