Custom Items & Blocks

README.md

@@ -1,2 +1,2 @@
-# SpongeToolsAPI
+# SpongeTools
 Various useful utilities for SpongeAPI

api/src/main/java/net/hellheim/spongetools/SpongeTools.java

@@ -0,0 +1,152 @@
+package net.hellheim.spongetools;
+
+import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.block.BlockSoundGroup;
+import org.spongepowered.api.data.Key;
+import org.spongepowered.api.data.value.ListValue;
+import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.effect.sound.SoundType;
+import org.spongepowered.api.item.inventory.equipment.EquipmentType;
+import org.spongepowered.api.map.color.MapColorType;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryRoots;
+import org.spongepowered.api.registry.RegistryType;
+
+import com.mojang.serialization.MapCodec;
+
+import net.hellheim.spongetools.custom.type.block.BlockTypeArchetype;
+import net.hellheim.spongetools.custom.type.block.ModeledBlock;
+import net.hellheim.spongetools.custom.type.entity.EntityTypeArchetype;
+import net.hellheim.spongetools.custom.type.entity.ModeledEntity;
+import net.hellheim.spongetools.custom.type.item.CustomItemAction;
+import net.hellheim.spongetools.custom.type.item.ItemTypeArchetype;
+import net.hellheim.spongetools.custom.type.item.LoreProcessor;
+import net.hellheim.spongetools.custom.type.item.LoreProvider;
+import net.hellheim.spongetools.custom.type.item.ModeledItem;
+import net.hellheim.spongetools.resourcepack.Model;
+import net.hellheim.spongetools.resourcepack.block.BlockDefinition;
+import net.hellheim.spongetools.resourcepack.item.ItemDefinition;
+
+public final class SpongeTools {
+
+	public static final String NAMESPACE = "spongetools";
+
+	public static ResourceKey key(final String value) {
+		return ResourceKey.of(SpongeTools.NAMESPACE, value);
+	}
+
+	public static final class Registries {
+
+		// Archetypes
+
+		public static final DefaultedRegistryType<BlockTypeArchetype> BLOCK_TYPE_ARCHETYPE = Registries.key("block_type_archetype");
+
+		public static final DefaultedRegistryType<EntityTypeArchetype> ENTITY_TYPE_ARCHETYPE = Registries.key("entity_type_archetype");
+
+		public static final DefaultedRegistryType<ItemTypeArchetype> ITEM_TYPE_ARCHETYPE = Registries.key("item_type_archetype");
+
+		// Modeled types
+
+		public static final DefaultedRegistryType<ModeledBlock> MODELED_BLOCK = Registries.key("modeled_block");
+
+		public static final DefaultedRegistryType<ModeledEntity> MODELED_ENTITY = Registries.key("modeled_entity");
+
+		public static final DefaultedRegistryType<ModeledItem> MODELED_ITEM = Registries.key("modeled_item");
+
+		/**
+		 * Definitions from this registry will be included in built ResourcePack.
+		 */
+		public static final DefaultedRegistryType<BlockDefinition> BLOCK_DEFINITION = Registries.key("blockstates");
+
+		/**
+		 * Definitions from this registry will be included in built ResourcePack.
+		 */
+		public static final DefaultedRegistryType<ItemDefinition> ITEM_DEFINITION = Registries.key("items");
+
+		/**
+		 * Models from this registry will be included in built ResourcePack.
+		 */
+		public static final DefaultedRegistryType<Model> MODEL = Registries.key("models");
+
+		public static final DefaultedRegistryType<MapCodec<? extends LoreProcessor>> LORE_PROCESSOR_TYPE = Registries.key("lore_processor_type");
+
+		public static final DefaultedRegistryType<MapCodec<? extends LoreProvider>> LORE_PROVIDER_TYPE = Registries.key("lore_provider_type");
+
+		public static final DefaultedRegistryType<MapCodec<? extends CustomItemAction.Config>> ITEM_ACTION_CONFIG_TYPE = Registries.key("item_action_config_type");
+
+	    private static <V> DefaultedRegistryType<V> key(final String key) {
+	        return RegistryType.of(RegistryRoots.SPONGE, SpongeTools.key(key)).asDefaultedType(Sponge::game);
+	    }
+
+		private Registries() {
+		}
+	}
+
+	public static final class Keys {
+
+		public static final Key<Value<BlockSoundGroup>> BLOCK_SOUND_GROUP = Keys.key("block_sound_group", BlockSoundGroup.class);
+
+		public static final Key<Value<ResourceKey>> EQUIPMENT_ASSET = Keys.key("equipment_asset", ResourceKey.class);
+
+		public static final Key<Value<ResourceKey>> EQUIPMENT_CAMERA_OVERLAY = Keys.key("equipment_camera_overlay", ResourceKey.class);
+
+		public static final Key<Value<Boolean>> EQUIPMENT_DAMAGEABLE = Keys.key("equipment_damageable", Boolean.class);
+
+		public static final Key<Value<Boolean>> EQUIPMENT_DISPENSABLE = Keys.key("equipment_dispensable", Boolean.class);
+
+		public static final Key<Value<SoundType>> EQUIPMENT_SOUND = Keys.key("equipment_sound", SoundType.class);
+
+		public static final Key<Value<Boolean>> EQUIPMENT_SWAPPABLE = Keys.key("equipment_swappable", Boolean.class);
+
+		public static final Key<Value<EquipmentType>> EQUIPMENT_TYPE = Keys.key("equipment_type", EquipmentType.class);
+
+		public static final Key<Value<Double>> FRICTION_FACTOR = Keys.key("friction_factor", Double.class);
+
+		public static final Key<Value<Boolean>> HAS_COLLISION = Keys.key("collision", Boolean.class);
+
+		public static final Key<Value<Boolean>> HAS_DYNAMIC_SHAPE = Keys.key("dynamic_shape", Boolean.class);
+
+		public static final Key<Value<Boolean>> HAS_OCCLUSION = Keys.key("occlusion", Boolean.class);
+
+		public static final Key<Value<Double>> JUMP_FACTOR = Keys.key("jump_factor", Double.class);
+
+		public static final Key<Value<ResourceKey>> LOOT_TABLE_KEY = Keys.key("loot_table_key", ResourceKey.class);
+
+		public static final Key<Value<LoreProcessor>> LORE_PROCESSOR = Keys.key("lore_processor", LoreProcessor.class);
+
+		public static final Key<ListValue<LoreProvider>> LORE_PROVIDERS = Keys.listKey("lore_providers", LoreProvider.class);
+
+		public static final Key<Value<MapColorType>> MAP_COLOR_TYPE = Keys.key("map_color_type", MapColorType.class);
+
+		public static final Key<Value<Boolean>> REQUIRE_TOOL = Keys.key("require_tool", Boolean.class);
+
+		public static final Key<Value<Double>> SPEED_FACTOR = Keys.key("speed_factor", Double.class);
+
+		private static <E> Key<Value<E>> key(final String key, final Class<E> type) {
+			return Key.from(SpongeTools.key(key), type);
+		}
+
+		private static <E> Key<ListValue<E>> listKey(final String key, final Class<E> type) {
+			return Key.fromList(SpongeTools.key(key), type);
+		}
+
+		private Keys() {
+		}
+	}
+
+	public static final class Queries {
+
+		private Queries() {
+		}
+	}
+
+	public static final class Versions {
+
+		private Versions() {
+		}
+	}
+
+	private SpongeTools() {
+	}
+}

src/main/java/net/hellheim/spongetools/codec/CodecMapper.java → api/src/main/java/net/hellheim/spongetools/codec/CodecMapper.java

@@ -4,6 +4,8 @@
 
 import com.mojang.serialization.Codec;
 
+import net.hellheim.spongetools.codec.list.TypeCodecs;
+
 public interface CodecMapper<R> {
 
 	interface M1<R> extends CodecMapper<R> {

src/main/java/net/hellheim/spongetools/codec/CodecMapperDispatcher.java → api/src/main/java/net/hellheim/spongetools/codec/CodecMapperDispatcher.java

@@ -8,6 +8,8 @@
 
 import com.mojang.serialization.Codec;
 
+import net.hellheim.spongetools.codec.list.ExtraCodecs;
+
 public final class CodecMapperDispatcher<I, V> {
 
 	private final LateBoundIdMapper<I, MapCodecMapper.M1<? extends V>> idMapper = new LateBoundIdMapper<>();

src/main/java/net/hellheim/spongetools/codec/LateBoundIdMapper.java → api/src/main/java/net/hellheim/spongetools/codec/LateBoundIdMapper.java

@@ -6,12 +6,14 @@
 import com.google.common.collect.HashBiMap;
 import com.mojang.serialization.Codec;
 
+import net.hellheim.spongetools.codec.list.ExtraCodecs;
+
 public class LateBoundIdMapper<I, V> {
 
 	protected final BiMap<I, V> idToValue = HashBiMap.create();
 
 	public Codec<V> codec(final Codec<I> idCodec) {
-		BiMap<V, I> bimap = this.idToValue.inverse();
+		final BiMap<V, I> bimap = this.idToValue.inverse();
 		return ExtraCodecs.idResolver(idCodec, this.idToValue::get, bimap::get);
 	}
 

src/main/java/net/hellheim/spongetools/codec/MapCodecMapper.java → api/src/main/java/net/hellheim/spongetools/codec/MapCodecMapper.java

@@ -5,6 +5,8 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 
+import net.hellheim.spongetools.codec.list.TypeCodecs;
+
 public interface MapCodecMapper<R> {
 
 	interface M1<R> extends MapCodecMapper<R> {

src/main/java/net/hellheim/spongetools/codec/StringRepresentableCodec.java → api/src/main/java/net/hellheim/spongetools/codec/StringRepresentableCodec.java

@@ -13,6 +13,8 @@
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;
 
+import net.hellheim.spongetools.codec.list.ExtraCodecs;
+
 public class StringRepresentableCodec<S extends StringRepresentable> implements Codec<S> {
 
 	private final Supplier<S[]> memoized;
@@ -30,7 +32,11 @@ public StringRepresentableCodec(
 				);
 	}
 
-	static <S extends StringRepresentable> StringRepresentableCodec<S> fromValues(final Supplier<S[]> values) {
+	public static <S extends StringRepresentable> StringRepresentableCodec<S> fromValues(final S[] values) {
+		return StringRepresentableCodec.fromValues(() -> values);
+	}
+
+	public static <S extends StringRepresentable> StringRepresentableCodec<S> fromValues(final Supplier<S[]> values) {
 		final Supplier<S[]> memoized = Suppliers.memoize(values::get);
         final Supplier<List<S>> memoizedList = Suppliers.memoize(() -> List.of(memoized.get()));
 
@@ -40,7 +46,7 @@ static <S extends StringRepresentable> StringRepresentableCodec<S> fromValues(fi
         return new StringRepresentableCodec<>(memoized, nameLookup, indexLookup);
     }
 
-	static <S extends StringRepresentable> Function<String, S> nameLookup(
+	public static <S extends StringRepresentable> Function<String, S> nameLookup(
 		final Supplier<S[]> values, final Function<String, String> keyFunction
 	) {
 		final Supplier<S[]> memoized = Suppliers.memoize(values::get);

src/main/java/net/hellheim/spongetools/codec/dispatched/TableEntryCodecs.java → api/src/main/java/net/hellheim/spongetools/codec/dispatched/TableEntryCodecs.java

@@ -18,7 +18,7 @@
 
 import net.hellheim.spongetools.codec.CodecMapperDispatcher;
 import net.hellheim.spongetools.codec.MapCodecMapper;
-import net.hellheim.spongetools.codec.SpongeCodecs;
+import net.hellheim.spongetools.codec.list.SpongeCodecs;
 
 public final class TableEntryCodecs {
 

src/main/java/net/hellheim/spongetools/codec/dispatched/VariableAmountCodecs.java → api/src/main/java/net/hellheim/spongetools/codec/dispatched/VariableAmountCodecs.java

@@ -9,7 +9,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
 import net.hellheim.spongetools.codec.CodecDispatcher;
-import net.hellheim.spongetools.codec.SpongeCodecs;
+import net.hellheim.spongetools.codec.list.SpongeCodecs;
 
 public class VariableAmountCodecs {
 

src/main/java/net/hellheim/spongetools/codec/AdventureCodecs.java → api/src/main/java/net/hellheim/spongetools/codec/list/AdventureCodecs.java

@@ -1,4 +1,4 @@
-package net.hellheim.spongetools.codec;
+package net.hellheim.spongetools.codec.list;
 
 import org.spongepowered.api.Sponge;
 
@@ -63,7 +63,7 @@ public final class AdventureCodecs {
 	public static final Codec<ChatType> CHAT_TYPE = AdventureCodecs.factory().chatType();
 
 	public static Codec<Key> key(final String defaultNamespace) {
-		if (Key.parseableNamespace(defaultNamespace)) {
+		if (!Key.parseableNamespace(defaultNamespace)) {
 			throw new IllegalArgumentException("Invalid namespace: " + defaultNamespace);
 		}
 

src/main/java/net/hellheim/spongetools/codec/BuildableCodecs.java → api/src/main/java/net/hellheim/spongetools/codec/list/BuildableCodecs.java

@@ -1,4 +1,4 @@
-package net.hellheim.spongetools.codec;
+package net.hellheim.spongetools.codec.list;
 
 import java.util.Optional;
 import java.util.function.Function;