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

Add tags

Browse source
This commit is contained in:
Joshua Castle 2023-01-05 19:46:33 -08:00
parent 96967dafa2
commit 010e99d2dc
No known key found for this signature in database
GPG key ID: F674F38216C35D5D
4 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/geyser/src/main/java/org/geysermc/geyser/api/block/custom/component/CustomBlockComponents.java
View file

@ -28,6 +28,7 @@ package org.geysermc.geyser.api.block.custom.component;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Map;
import java.util.Set;
public interface CustomBlockComponents {
BoxComponent selectionBox();
@ -52,6 +53,8 @@ public interface CustomBlockComponents {
boolean placeAir();
Set<String> tags();
interface Builder {
Builder selectionBox(BoxComponent selectionBox);
@ -75,6 +78,8 @@ public interface CustomBlockComponents {
Builder placeAir(boolean placeAir);
Builder tags(Set<String> tags);
CustomBlockComponents build();
}
}

20
core/src/main/java/org/geysermc/geyser/level/block/GeyserCustomBlockComponents.java
View file

@ -25,7 +25,9 @@
package org.geysermc.geyser.level.block;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.block.custom.component.BoxComponent;
@ -53,6 +55,7 @@ public class GeyserCustomBlockComponents implements CustomBlockComponents {
Integer lightDampening;
RotationComponent rotation;
boolean placeAir;
Set<String> tags;
private GeyserCustomBlockComponents(CustomBlockComponentsBuilder builder) {
this.selectionBox = builder.selectionBox;
@ -70,6 +73,11 @@ public class GeyserCustomBlockComponents implements CustomBlockComponents {
this.lightDampening = builder.lightDampening;
this.rotation = builder.rotation;
this.placeAir = builder.placeAir;
if (builder.tags.isEmpty()) {
this.tags = Set.of();
} else {
this.tags = Set.copyOf(builder.tags);
}
}
@Override
@ -127,6 +135,11 @@ public class GeyserCustomBlockComponents implements CustomBlockComponents {
return placeAir;
}
@Override
public Set<String> tags() {
return tags;
}
public static class CustomBlockComponentsBuilder implements Builder {
protected BoxComponent selectionBox;
protected BoxComponent collisionBox;
@ -139,6 +152,7 @@ public class GeyserCustomBlockComponents implements CustomBlockComponents {
protected Integer lightDampening;
protected RotationComponent rotation;
protected boolean placeAir = false;
protected final Set<String> tags = new HashSet<>();
private void validateBox(BoxComponent box) {
if (box == null) {
@ -247,6 +261,12 @@ public class GeyserCustomBlockComponents implements CustomBlockComponents {
return this;
}
@Override
public Builder tags(Set<String> tags) {
this.tags.addAll(tags);
return this;
}
@Override
public CustomBlockComponents build() {
return new GeyserCustomBlockComponents(this);

12
core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java
View file

@ -26,6 +26,8 @@
package org.geysermc.geyser.registry.mappings.versions;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.base.CharMatcher;
import org.geysermc.geyser.GeyserImpl;
@ -383,6 +385,16 @@ public class MappingsReader_v1 extends MappingsReader {
}
}
if (node.has("tags")) {
JsonNode tags = node.get("tags");
if (tags.isArray()) {
ArrayNode tagsArray = (ArrayNode) tags;
Set<String> tagsSet = new HashSet<>();
tagsArray.forEach(tag -> tagsSet.add(tag.asText()));
builder.tags(tagsSet);
}
}
CustomBlockComponents components = builder.build();
return components;

3
core/src/main/java/org/geysermc/geyser/registry/populator/CustomBlockRegistryPopulator.java
View file

@ -227,6 +227,9 @@ public class CustomBlockRegistryPopulator {
.putString("triggerType", "geyser:place_event")
.build());
}
if (!components.tags().isEmpty()) {
components.tags().forEach(tag -> builder.putCompound("tag:" + tag, NbtMap.EMPTY));
}
return builder.build();
}