-
-
Notifications
You must be signed in to change notification settings - Fork 689
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Goat horns and item cooldowns for 1.21.2 (#5102)
Co-authored-by: Camotoy <[email protected]>
- Loading branch information
1 parent
4588f34
commit 6cc2aa3
Showing
19 changed files
with
320 additions
and
66 deletions.
There are no files selected for viewing
166 changes: 166 additions & 0 deletions
166
core/src/main/java/org/geysermc/geyser/inventory/item/GeyserInstrument.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| /* | ||
| * Copyright (c) 2024 GeyserMC. http://geysermc.org | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * @author GeyserMC | ||
| * @link https://github.com/GeyserMC/Geyser | ||
| */ | ||
|
|
||
| package org.geysermc.geyser.inventory.item; | ||
|
|
||
| import net.kyori.adventure.key.Key; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
| import org.cloudburstmc.nbt.NbtMap; | ||
| import org.geysermc.geyser.session.GeyserSession; | ||
| import org.geysermc.geyser.session.cache.registry.JavaRegistry; | ||
| import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; | ||
| import org.geysermc.geyser.translator.text.MessageTranslator; | ||
| import org.geysermc.geyser.util.MinecraftKey; | ||
| import org.geysermc.geyser.util.SoundUtils; | ||
| import org.geysermc.mcprotocollib.protocol.data.game.Holder; | ||
| import org.geysermc.mcprotocollib.protocol.data.game.item.component.Instrument; | ||
| import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound; | ||
|
|
||
| import java.util.Locale; | ||
|
|
||
| public interface GeyserInstrument { | ||
|
|
||
| static GeyserInstrument read(RegistryEntryContext context) { | ||
| NbtMap data = context.data(); | ||
| String soundEvent = SoundUtils.readSoundEvent(data, "instrument " + context.id()); | ||
| float range = data.getFloat("range"); | ||
| String description = MessageTranslator.deserializeDescriptionForTooltip(context.session(), data); | ||
| BedrockInstrument bedrockInstrument = BedrockInstrument.getByJavaIdentifier(context.id()); | ||
| return new GeyserInstrument.Impl(soundEvent, range, description, bedrockInstrument); | ||
| } | ||
|
|
||
| String soundEvent(); | ||
|
|
||
| float range(); | ||
|
|
||
| /** | ||
| * In Bedrock format | ||
| */ | ||
| String description(); | ||
|
|
||
| BedrockInstrument bedrockInstrument(); | ||
|
|
||
| /** | ||
| * @return the ID of the Bedrock counterpart for this instrument. If there is none ({@link #bedrockInstrument()} is null), then -1 is returned. | ||
| */ | ||
| default int bedrockId() { | ||
| BedrockInstrument bedrockInstrument = bedrockInstrument(); | ||
| if (bedrockInstrument != null) { | ||
| return bedrockInstrument.ordinal(); | ||
| } | ||
| return -1; | ||
| } | ||
|
|
||
| /** | ||
| * @return the ID of the Java counterpart for the given Bedrock ID. If an invalid Bedrock ID was given, or there is no counterpart, -1 is returned. | ||
| */ | ||
| static int bedrockIdToJava(GeyserSession session, int id) { | ||
| JavaRegistry<GeyserInstrument> instruments = session.getRegistryCache().instruments(); | ||
| BedrockInstrument bedrockInstrument = BedrockInstrument.getByBedrockId(id); | ||
| if (bedrockInstrument != null) { | ||
| for (int i = 0; i < instruments.values().size(); i++) { | ||
| GeyserInstrument instrument = instruments.byId(i); | ||
| if (instrument.bedrockInstrument() == bedrockInstrument) { | ||
| return i; | ||
| } | ||
| } | ||
| } | ||
| return -1; | ||
| } | ||
|
|
||
| static GeyserInstrument fromHolder(GeyserSession session, Holder<Instrument> holder) { | ||
| if (holder.isId()) { | ||
| return session.getRegistryCache().instruments().byId(holder.id()); | ||
| } | ||
| Instrument custom = holder.custom(); | ||
| return new Wrapper(custom, session.locale()); | ||
| } | ||
|
|
||
| record Wrapper(Instrument instrument, String locale) implements GeyserInstrument { | ||
| @Override | ||
| public String soundEvent() { | ||
| return instrument.getSoundEvent().getName(); | ||
| } | ||
|
|
||
| @Override | ||
| public float range() { | ||
| return instrument.getRange(); | ||
| } | ||
|
|
||
| @Override | ||
| public String description() { | ||
| return MessageTranslator.convertMessageForTooltip(instrument.getDescription(), locale); | ||
| } | ||
|
|
||
| @Override | ||
| public BedrockInstrument bedrockInstrument() { | ||
| if (instrument.getSoundEvent() instanceof BuiltinSound) { | ||
| return BedrockInstrument.getByJavaIdentifier(MinecraftKey.key(instrument.getSoundEvent().getName())); | ||
| } | ||
| // Probably custom | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| record Impl(String soundEvent, float range, String description, @Nullable BedrockInstrument bedrockInstrument) implements GeyserInstrument { | ||
| } | ||
|
|
||
| /** | ||
| * Each vanilla instrument on Bedrock, ordered in their network IDs. | ||
| */ | ||
| enum BedrockInstrument { | ||
| PONDER, | ||
| SING, | ||
| SEEK, | ||
| FEEL, | ||
| ADMIRE, | ||
| CALL, | ||
| YEARN, | ||
| DREAM; | ||
|
|
||
| private static final BedrockInstrument[] VALUES = values(); | ||
| private final Key javaIdentifier; | ||
|
|
||
| BedrockInstrument() { | ||
| this.javaIdentifier = MinecraftKey.key(this.name().toLowerCase(Locale.ENGLISH) + "_goat_horn"); | ||
| } | ||
|
|
||
| public static @Nullable BedrockInstrument getByJavaIdentifier(Key javaIdentifier) { | ||
| for (BedrockInstrument instrument : VALUES) { | ||
| if (instrument.javaIdentifier.equals(javaIdentifier)) { | ||
| return instrument; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static @Nullable BedrockInstrument getByBedrockId(int bedrockId) { | ||
| if (bedrockId >= 0 && bedrockId < VALUES.length) { | ||
| return VALUES[bedrockId]; | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.