GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/blocky

Browse source
This commit is contained in:
Joshua Castle 2023-05-13 14:24:12 -07:00
commit a886fd2424
No known key found for this signature in database
GPG key ID: F674F38216C35D5D
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/org/geysermc/geyser/item/Items.java
View file

@ -29,6 +29,8 @@ import org.geysermc.geyser.item.components.ToolTier;
import org.geysermc.geyser.item.type.*; import org.geysermc.geyser.item.type.*;
import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.Registries;
import java.util.Collections;
import static org.geysermc.geyser.item.type.Item.builder; import static org.geysermc.geyser.item.type.Item.builder;
/** /**
@ -1271,7 +1273,11 @@ public final class Items {
public static <T extends Item> T register(T item, int id) { public static <T extends Item> T register(T item, int id) {
item.setJavaId(id); item.setJavaId(id);
Registries.JAVA_ITEMS.get().add(item); // This makes sure that the array is large enough to put the java item at the correct location
if (Registries.JAVA_ITEMS.get().size() <= id) {
Registries.JAVA_ITEMS.get().addAll(Collections.nCopies(id - Registries.JAVA_ITEMS.get().size() + 1, AIR));
}
Registries.JAVA_ITEMS.get().set(id, item);
Registries.JAVA_ITEM_IDENTIFIERS.register(item.javaIdentifier(), item); Registries.JAVA_ITEM_IDENTIFIERS.register(item.javaIdentifier(), item);
return item; return item;
} }