Remove unnecessary structure registry and make providers provide structures directly

Signed-off-by: HellFirePvP <7419378+HellFirePvP@users.noreply.github.com>

Author: HellFirePvP

src/main/java/hellfirepvp/observerlib/api/structure/MatchableStructure.java

@@ -105,6 +105,4 @@ default public boolean matchesSingleBlock(@Nullable BlockGetter reader,
                     (tileEntity == null || (tileMatch == null || tileMatch.matches(reader, center.offset(centerOffset), tileEntity)));
         }
     }
-
-    public ResourceLocation getRegistryName();
 }

src/main/java/hellfirepvp/observerlib/api/util/PatternBlockArray.java

@@ -1,19 +1,16 @@
 package hellfirepvp.observerlib.api.util;
 
-import hellfirepvp.observerlib.api.structure.PlaceableStructure;
-import net.minecraft.resources.ResourceLocation;
+import hellfirepvp.observerlib.api.structure.MatchableStructure;
 
 /**
+ * This class is an exemplary simple implementation of the matchable structure interface.
+ * Can be used to observe structure integrity with observers.
+ *
  * This class is part of the ObserverLib Mod
  * The complete source code for this mod can be found on github.
  * Class: StructureBlockArray
  * Created by HellFirePvP
- * Date: 11.08.2019 / 09:38
+ * Date: 11.08.2019 / 09:12
  */
-public class StructureBlockArray extends PatternBlockArray implements PlaceableStructure {
-
-    public StructureBlockArray(ResourceLocation registryName) {
-        super(registryName);
-    }
-
+public class StructureBlockArray extends BlockArray implements MatchableStructure {
 }

src/main/java/hellfirepvp/observerlib/api/util/StructureBlockArray.java

@@ -9,7 +9,6 @@
 import hellfirepvp.observerlib.common.event.BlockChangeNotifier;
 import hellfirepvp.observerlib.common.event.handler.EventHandlerIO;
 import hellfirepvp.observerlib.common.registry.RegistryProviders;
-import hellfirepvp.observerlib.common.registry.RegistryStructures;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
@@ -43,7 +42,6 @@ private void registerBlocks(IEventBus modEventBus) {
 
     private void registerRegistries(NewRegistryEvent event) {
         RegistryProviders.initialize(event);
-        RegistryStructures.initialize(event);
     }
 
     public void attachEventHandlers(IEventBus eventBus) {

src/main/java/hellfirepvp/observerlib/common/CommonProxy.java

@@ -3,17 +3,13 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import hellfirepvp.observerlib.api.ChangeObserver;
 import hellfirepvp.observerlib.api.structure.MatchableStructure;
 import hellfirepvp.observerlib.api.ObserverProvider;
 import hellfirepvp.observerlib.common.registry.RegistryProviders;
-import hellfirepvp.observerlib.common.registry.RegistryStructures;
+import hellfirepvp.observerlib.common.util.CodecUtil;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
 import java.util.function.Function;
 
 /**
@@ -25,19 +21,21 @@
  */
 public class ObserverProviderStructure extends ObserverProvider<ChangeObserverStructure> {
 
+    public static final Codec<ObserverProviderStructure> PROVIDER_CODEC = RegistryProviders.getRegistry().byNameCodec()
+            .xmap(provider -> CodecUtil.informedCast(provider, ObserverProviderStructure.class), Function.identity());
     public static final MapCodec<ChangeObserverStructure> OBSERVER_CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-            ResourceLocation.CODEC.fieldOf("structure").forGetter(observer -> observer.getProvider().getStructureName()),
+            PROVIDER_CODEC.fieldOf("provider").forGetter(ChangeObserverStructure::getProvider),
             BlockPos.CODEC.listOf().fieldOf("mismatches").forGetter(ChangeObserverStructure::getMismatches)
-    ).apply(builder, (structure, mismatches) -> new ObserverProviderStructure(structure).newObserver().addMismatches(mismatches)));
+    ).apply(builder, (provider, mismatches) -> provider.newObserver().addMismatches(mismatches)));
 
-    private final ResourceLocation structureName;
+    private final MatchableStructure structure;
 
-    public ObserverProviderStructure(ResourceLocation structureName) {
-        this.structureName = structureName;
+    public ObserverProviderStructure(MatchableStructure structure) {
+        this.structure = structure;
     }
 
-    public ResourceLocation getStructureName() {
-        return this.structureName;
+    public MatchableStructure getStructure() {
+        return structure;
     }
 
     @Override
@@ -48,10 +46,6 @@ public MapCodec<ChangeObserverStructure> codec() {
     @Override
     @Nonnull
     public ChangeObserverStructure newObserver() {
-        MatchableStructure structure = RegistryStructures.getStructure(this.getStructureName());
-        if (structure == null) {
-            throw new IllegalStateException("Tried creating structure observer for unknown structure: " + this.getStructureName());
-        }
-        return new ChangeObserverStructure(this, structure);
+        return new ChangeObserverStructure(this, this.getStructure());
     }
 }

src/main/java/hellfirepvp/observerlib/common/change/ObserverProviderStructure.java

@@ -42,4 +42,12 @@ public static <T> Codec<T> registryNameCodec(Registry<T> registry) {
     public static <T> T cast(Object obj) {
         return (T) obj;
     }
+
+    public static <T> T informedCast(Object obj, Class<T> target) {
+        try {
+            return (T) obj;
+        } catch (ClassCastException e) {
+            throw new RuntimeException("Failed to cast " + obj + " to " + target, e);
+        }
+    }
 }