-
-
Notifications
You must be signed in to change notification settings - Fork 644
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
- Loading branch information
Showing
14 changed files
with
587 additions
and
7 deletions.
There are no files selected for viewing
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
165 changes: 165 additions & 0 deletions
165
core/src/main/java/org/geysermc/geyser/entity/properties/GeyserEntityProperties.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,165 @@ | ||
| /* | ||
| * Copyright (c) 2019-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.entity.properties; | ||
|
|
||
| import it.unimi.dsi.fastutil.objects.Object2IntMap; | ||
| import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; | ||
| import it.unimi.dsi.fastutil.objects.ObjectArrayList; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.ToString; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
| import org.cloudburstmc.nbt.NbtMap; | ||
| import org.cloudburstmc.nbt.NbtMapBuilder; | ||
| import org.cloudburstmc.nbt.NbtType; | ||
| import org.geysermc.geyser.entity.properties.type.BooleanProperty; | ||
| import org.geysermc.geyser.entity.properties.type.EnumProperty; | ||
| import org.geysermc.geyser.entity.properties.type.FloatProperty; | ||
| import org.geysermc.geyser.entity.properties.type.IntProperty; | ||
| import org.geysermc.geyser.entity.properties.type.PropertyType; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| @EqualsAndHashCode | ||
| @ToString | ||
| public class GeyserEntityProperties { | ||
| private final ObjectArrayList<PropertyType> properties; | ||
| private final Object2IntMap<String> propertyIndices; | ||
|
|
||
| private GeyserEntityProperties(ObjectArrayList<PropertyType> properties, | ||
| Object2IntMap<String> propertyIndices) { | ||
| this.properties = properties; | ||
| this.propertyIndices = propertyIndices; | ||
| } | ||
|
|
||
| public NbtMap toNbtMap(String entityType) { | ||
| NbtMapBuilder mapBuilder = NbtMap.builder(); | ||
| List<NbtMap> nbtProperties = new ArrayList<>(); | ||
|
|
||
| for (PropertyType property : properties) { | ||
| nbtProperties.add(property.nbtMap()); | ||
| } | ||
| mapBuilder.putList("properties", NbtType.COMPOUND, nbtProperties); | ||
|
|
||
| return mapBuilder.putString("type", entityType).build(); | ||
| } | ||
|
|
||
| public @NonNull List<PropertyType> getProperties() { | ||
| return properties; | ||
| } | ||
|
|
||
| public int getPropertyIndex(String name) { | ||
| return propertyIndices.getOrDefault(name, -1); | ||
| } | ||
|
|
||
| public static class Builder { | ||
| private final ObjectArrayList<PropertyType> properties = new ObjectArrayList<>(); | ||
| private final Object2IntMap<String> propertyIndices = new Object2IntOpenHashMap<>(); | ||
|
|
||
| public Builder addInt(@NonNull String name, int min, int max) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new IntProperty(name, min, max); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addInt(@NonNull String name) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new IntProperty(name, Integer.MIN_VALUE, Integer.MAX_VALUE); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addFloat(@NonNull String name, float min, float max) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new FloatProperty(name, min, max); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addFloat(@NonNull String name) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new FloatProperty(name, Float.MIN_NORMAL, Float.MAX_VALUE); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addBoolean(@NonNull String name) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new BooleanProperty(name); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addEnum(@NonNull String name, List<String> values) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| PropertyType property = new EnumProperty(name, values); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addEnum(@NonNull String name, String... values) { | ||
| if (propertyIndices.containsKey(name)) { | ||
| throw new IllegalArgumentException( | ||
| "Property with name " + name + " already exists on builder!"); | ||
| } | ||
| List<String> valuesList = Arrays.asList(values); // Convert array to list | ||
| PropertyType property = new EnumProperty(name, valuesList); | ||
| this.properties.add(property); | ||
| propertyIndices.put(name, properties.size() - 1); | ||
| return this; | ||
| } | ||
|
|
||
| public GeyserEntityProperties build() { | ||
| return new GeyserEntityProperties(properties, propertyIndices); | ||
| } | ||
| } | ||
| } |
98 changes: 98 additions & 0 deletions
98
core/src/main/java/org/geysermc/geyser/entity/properties/GeyserEntityPropertyManager.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,98 @@ | ||
| /* | ||
| * Copyright (c) 2019-2023 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.entity.properties; | ||
|
|
||
| import it.unimi.dsi.fastutil.objects.ObjectArrayList; | ||
| import org.cloudburstmc.protocol.bedrock.data.entity.FloatEntityProperty; | ||
| import org.cloudburstmc.protocol.bedrock.data.entity.IntEntityProperty; | ||
| import org.geysermc.geyser.entity.properties.type.EnumProperty; | ||
| import org.geysermc.geyser.entity.properties.type.PropertyType; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class GeyserEntityPropertyManager { | ||
|
|
||
| private final GeyserEntityProperties properties; | ||
|
|
||
| private final ObjectArrayList<IntEntityProperty> intEntityProperties = new ObjectArrayList<>(); | ||
| private final ObjectArrayList<FloatEntityProperty> floatEntityProperties = new ObjectArrayList<>(); | ||
|
|
||
| public GeyserEntityPropertyManager(GeyserEntityProperties properties) { | ||
| this.properties = properties; | ||
| } | ||
|
|
||
| public void add(String propertyName, int value) { | ||
| int index = properties.getPropertyIndex(propertyName); | ||
| intEntityProperties.add(new IntEntityProperty(index, value)); | ||
| } | ||
|
|
||
| public void add(String propertyName, boolean value) { | ||
| int index = properties.getPropertyIndex(propertyName); | ||
| intEntityProperties.add(new IntEntityProperty(index, value ? 1 : 0)); | ||
| } | ||
|
|
||
| public void add(String propertyName, String value) { | ||
| int index = properties.getPropertyIndex(propertyName); | ||
| PropertyType property = properties.getProperties().get(index); | ||
| int enumIndex = ((EnumProperty) property).getIndex(value); | ||
| intEntityProperties.add(new IntEntityProperty(index, enumIndex)); | ||
| } | ||
|
|
||
| public void add(String propertyName, float value) { | ||
| int index = properties.getPropertyIndex(propertyName); | ||
| floatEntityProperties.add(new FloatEntityProperty(index, value)); | ||
| } | ||
|
|
||
| public boolean hasFloatProperties() { | ||
| return !this.floatEntityProperties.isEmpty(); | ||
| } | ||
|
|
||
| public boolean hasIntProperties() { | ||
| return !this.intEntityProperties.isEmpty(); | ||
| } | ||
|
|
||
| public boolean hasProperties() { | ||
| return hasFloatProperties() || hasIntProperties(); | ||
| } | ||
|
|
||
| public ObjectArrayList<IntEntityProperty> intProperties() { | ||
| return this.intEntityProperties; | ||
| } | ||
|
|
||
| public void applyIntProperties(List<IntEntityProperty> properties) { | ||
| properties.addAll(intEntityProperties); | ||
| intEntityProperties.clear(); | ||
| } | ||
|
|
||
| public ObjectArrayList<FloatEntityProperty> floatProperties() { | ||
| return this.floatEntityProperties; | ||
| } | ||
|
|
||
| public void applyFloatProperties(List<FloatEntityProperty> properties) { | ||
| properties.addAll(floatEntityProperties); | ||
| floatEntityProperties.clear(); | ||
| } | ||
| } |
Oops, something went wrong.