From b8bcd95af3a8f530958d4472c82fa24aa780a5a3 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Sat, 25 Jul 2020 21:12:39 -0500 Subject: [PATCH] Add EnumObject.Builder and use it in the registries Gives me more control over implementation of the map --- .../adapter/EnumRegistryAdapter.java | 17 +++--- .../deferred/DeferredRegisterWrapper.java | 16 ++---- .../registration/object/EnumObject.java | 56 ++++++++++++++++++- 3 files changed, 68 insertions(+), 21 deletions(-) diff --git a/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java index ce51ae1..88f8a7e 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java @@ -6,16 +6,13 @@ import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IRegistryDelegate; import slimeknights.mantle.registration.object.EnumObject; -import java.util.EnumMap; -import java.util.Map; import java.util.function.Function; -import java.util.function.Supplier; /** * Adapter that allows certain registry types to register from a list of values * @param Registry type */ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "WeakerAccess"}) public class EnumRegistryAdapter> extends RegistryAdapter { public EnumRegistryAdapter(IForgeRegistry registry) { @@ -39,13 +36,13 @@ public class EnumRegistryAdapter> extends Regist throw new IllegalArgumentException("Must have at least one value"); } // note this cast only works because you cannot extend an enum - Map> map = new EnumMap<>((Class)values[0].getClass()); + EnumObject.Builder builder = new EnumObject.Builder<>(values[0].getDeclaringClass()); for (E value : values) { // assuming the type will not sub for a different class IRegistryDelegate delegate = register(mapper.apply(value), value.getString() + "_" + name).delegate; - map.put(value, () -> (I) delegate.get()); + builder.put(value, () -> (I) delegate.get()); } - return new EnumObject<>(map); + return builder.build(); } /** @@ -61,12 +58,12 @@ public class EnumRegistryAdapter> extends Regist throw new IllegalArgumentException("Must have at least one value"); } // note this cast only works because you cannot extend an enum - Map> map = new EnumMap<>((Class)values[0].getClass()); + EnumObject.Builder builder = new EnumObject.Builder<>(values[0].getDeclaringClass()); for (E value : values) { // assuming the type will not sub for a different class IRegistryDelegate delegate = register(mapper.apply(value), name + "_" + value.getString()).delegate; - map.put(value, () -> (I) delegate.get()); + builder.put(value, () -> (I) delegate.get()); } - return new EnumObject<>(map); + return builder.build(); } } diff --git a/src/main/java/slimeknights/mantle/registration/deferred/DeferredRegisterWrapper.java b/src/main/java/slimeknights/mantle/registration/deferred/DeferredRegisterWrapper.java index e5a2360..76707bc 100644 --- a/src/main/java/slimeknights/mantle/registration/deferred/DeferredRegisterWrapper.java +++ b/src/main/java/slimeknights/mantle/registration/deferred/DeferredRegisterWrapper.java @@ -7,8 +7,6 @@ import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import slimeknights.mantle.registration.object.EnumObject; -import java.util.EnumMap; -import java.util.Map; import java.util.function.BiFunction; import java.util.function.Supplier; @@ -56,17 +54,16 @@ public abstract class DeferredRegisterWrapper> * @param register Function to register an entry * @return EnumObject mapping between different block types */ - @SuppressWarnings("unchecked") protected static & IStringSerializable, V extends T, T extends IForgeRegistryEntry> EnumObject registerEnum(E[] values, String name, BiFunction> register) { if (values.length == 0) { throw new IllegalArgumentException("Must have at least one value"); } // note this cast only works because you cannot extend an enum - Map> map = new EnumMap<>((Class)values[0].getClass()); + EnumObject.Builder builder = new EnumObject.Builder<>(values[0].getDeclaringClass()); for (E value : values) { - map.put(value, register.apply(value.getString() + "_" + name, value)); + builder.put(value, register.apply(value.getString() + "_" + name, value)); } - return new EnumObject<>(map); + return builder.build(); } /** @@ -76,16 +73,15 @@ public abstract class DeferredRegisterWrapper> * @param register Function to register an entry * @return EnumObject mapping between different block types */ - @SuppressWarnings("unchecked") protected static & IStringSerializable, V extends T, T extends IForgeRegistryEntry> EnumObject registerEnum(String name, E[] values, BiFunction> register) { if (values.length == 0) { throw new IllegalArgumentException("Must have at least one value"); } // note this cast only works because you cannot extend an enum - Map> map = new EnumMap<>((Class)values[0].getClass()); + EnumObject.Builder builder = new EnumObject.Builder<>(values[0].getDeclaringClass()); for (E value : values) { - map.put(value, register.apply(name + "_" + value.getString(), value)); + builder.put(value, register.apply(name + "_" + value.getString(), value)); } - return new EnumObject<>(map); + return builder.build(); } } diff --git a/src/main/java/slimeknights/mantle/registration/object/EnumObject.java b/src/main/java/slimeknights/mantle/registration/object/EnumObject.java index 89bb3b4..a2c45f0 100644 --- a/src/main/java/slimeknights/mantle/registration/object/EnumObject.java +++ b/src/main/java/slimeknights/mantle/registration/object/EnumObject.java @@ -1,9 +1,11 @@ package slimeknights.mantle.registration.object; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import net.minecraftforge.registries.IForgeRegistryEntry; import javax.annotation.Nullable; +import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.function.Supplier; @@ -14,7 +16,7 @@ import java.util.stream.Collectors; * @param Enum type * @param Entry type */ -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PROTECTED) @SuppressWarnings("WeakerAccess") public class EnumObject, I extends IForgeRegistryEntry> { private final Map> map; @@ -57,4 +59,56 @@ public class EnumObject, I extends IForgeRegistryEntry values() { return this.map.values().stream().map(Supplier::get).collect(Collectors.toList()); } + + /** + * Enum object builder, to more conveiently create it from items, a map, or another enum object + * @param Enum type + * @param Entry type + */ + @SuppressWarnings({"UnusedReturnValue", "unused"}) + public static class Builder, I extends IForgeRegistryEntry> { + private final Map> map; + public Builder(Class clazz) { + this.map = new EnumMap<>(clazz); + } + + /** + * Adds the given key and value to the object + * @param key Key + * @param value Value + * @return Builder instance + */ + public Builder put(T key, Supplier value) { + this.map.put(key, value); + return this; + } + + /** + * Adds all values from the given map + * @param map Map + * @return Builder instance + */ + public Builder putAll(Map> map) { + this.map.putAll(map); + return this; + } + + /** + * Adds all values from the given enum object + * @param object Enum object + * @return Builder instance + */ + public Builder putAll(EnumObject object) { + this.map.putAll(object.map); + return this; + } + + /** + * Creates the final enum object + * @return Constructed enum object + */ + public EnumObject build() { + return new EnumObject<>(map); + } + } }