mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
* Start on custom molang tags with custom items * geyser_custom instead of geyser item tag * Address reviews, add custom namespace ("geyser_custom") to tags * use isBlank() instead of isEmpty() * More efficient item tag setting Co-authored-by: Konicai <71294714+konicai@users.noreply.github.com> * tags instead of temp * Merge in master, adapt to changes in the MappingsReader, delete unused ToolBreakSpeedsUtils class * oops * clean diff * Change namespace from `geyser_custom` to just `geyser` * Don't force a namespace at all; just like blocks don't * Tags for items are now, as blocks, NonNull. Additionally, calling the .tags() builder multiple times will not add both sets of tags, but replace the existing tag set * Remove @NotNull usage in favor of @NonNull * Allow setting null for tags, but ensure that .tags() is always non-null * Fix nullable annotation on tags method in the builder interface
200 lines
6.4 KiB
Java
200 lines
6.4 KiB
Java
/*
|
|
* Copyright (c) 2019-2022 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.item;
|
|
|
|
import lombok.EqualsAndHashCode;
|
|
import lombok.ToString;
|
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
|
import org.geysermc.geyser.api.item.custom.CustomItemData;
|
|
import org.geysermc.geyser.api.item.custom.CustomItemOptions;
|
|
import org.geysermc.geyser.api.item.custom.CustomRenderOffsets;
|
|
|
|
import java.util.HashSet;
|
|
import java.util.Objects;
|
|
import java.util.Set;
|
|
|
|
@EqualsAndHashCode
|
|
@ToString
|
|
public class GeyserCustomItemData implements CustomItemData {
|
|
private final String name;
|
|
private final CustomItemOptions customItemOptions;
|
|
private final String displayName;
|
|
private final String icon;
|
|
private final boolean allowOffhand;
|
|
private final boolean displayHandheld;
|
|
private final int textureSize;
|
|
private final CustomRenderOffsets renderOffsets;
|
|
private final Set<String> tags;
|
|
|
|
public GeyserCustomItemData(String name,
|
|
CustomItemOptions customItemOptions,
|
|
String displayName,
|
|
String icon,
|
|
boolean allowOffhand,
|
|
boolean displayHandheld,
|
|
int textureSize,
|
|
CustomRenderOffsets renderOffsets,
|
|
Set<String> tags) {
|
|
this.name = name;
|
|
this.customItemOptions = customItemOptions;
|
|
this.displayName = displayName;
|
|
this.icon = icon;
|
|
this.allowOffhand = allowOffhand;
|
|
this.displayHandheld = displayHandheld;
|
|
this.textureSize = textureSize;
|
|
this.renderOffsets = renderOffsets;
|
|
this.tags = tags;
|
|
}
|
|
|
|
@Override
|
|
public @NonNull String name() {
|
|
return name;
|
|
}
|
|
|
|
@Override
|
|
public CustomItemOptions customItemOptions() {
|
|
return customItemOptions;
|
|
}
|
|
|
|
@Override
|
|
public @NonNull String displayName() {
|
|
return displayName;
|
|
}
|
|
|
|
@Override
|
|
public @NonNull String icon() {
|
|
return icon;
|
|
}
|
|
|
|
@Override
|
|
public boolean allowOffhand() {
|
|
return allowOffhand;
|
|
}
|
|
|
|
@Override
|
|
public boolean displayHandheld() {
|
|
return this.displayHandheld;
|
|
}
|
|
|
|
@Override
|
|
public int textureSize() {
|
|
return textureSize;
|
|
}
|
|
|
|
@Override
|
|
public CustomRenderOffsets renderOffsets() {
|
|
return renderOffsets;
|
|
}
|
|
|
|
@Override
|
|
public @NonNull Set<String> tags() {
|
|
return tags;
|
|
}
|
|
|
|
public static class CustomItemDataBuilder implements Builder {
|
|
protected String name = null;
|
|
protected CustomItemOptions customItemOptions = null;
|
|
|
|
protected String displayName = null;
|
|
protected String icon = null;
|
|
protected boolean allowOffhand = true; // Bedrock doesn't give items offhand allowance unless they serve gameplay purpose, but we want to be friendly with Java
|
|
protected boolean displayHandheld = false;
|
|
protected int textureSize = 16;
|
|
protected CustomRenderOffsets renderOffsets = null;
|
|
protected Set<String> tags = new HashSet<>();
|
|
|
|
@Override
|
|
public Builder name(@NonNull String name) {
|
|
this.name = name;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder customItemOptions(@NonNull CustomItemOptions customItemOptions) {
|
|
this.customItemOptions = customItemOptions;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder displayName(@NonNull String displayName) {
|
|
this.displayName = displayName;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder icon(@NonNull String icon) {
|
|
this.icon = icon;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder allowOffhand(boolean allowOffhand) {
|
|
this.allowOffhand = allowOffhand;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder displayHandheld(boolean displayHandheld) {
|
|
this.displayHandheld = displayHandheld;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder textureSize(int textureSize) {
|
|
this.textureSize = textureSize;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder renderOffsets(CustomRenderOffsets renderOffsets) {
|
|
this.renderOffsets = renderOffsets;
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public Builder tags(@Nullable Set<String> tags) {
|
|
this.tags = Objects.requireNonNullElseGet(tags, Set::of);
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public CustomItemData build() {
|
|
if (this.name == null || this.customItemOptions == null) {
|
|
throw new IllegalArgumentException("Name and custom item options must be set");
|
|
}
|
|
|
|
if (this.displayName == null) {
|
|
this.displayName = this.name;
|
|
}
|
|
if (this.icon == null) {
|
|
this.icon = this.name;
|
|
}
|
|
return new GeyserCustomItemData(this.name, this.customItemOptions, this.displayName, this.icon, this.allowOffhand, this.displayHandheld, this.textureSize, this.renderOffsets, this.tags);
|
|
}
|
|
}
|
|
}
|