Add AdvancedContainer#register(Registry, String, Object) & AdvancedContainer#register(RegistryKey, Registerable, String, Object)

Remove StaticElement

Author: FirstMegaGame4

mmodding-block/build.gradle

@@ -6,7 +6,6 @@ mmodding {
 		addMixin("mmodding_block.mixins.json")
 		withInjectedInterfaces {
 			it.injectTo("net/minecraft/class_2248", Set.of(
-				"com/mmodding/library/core/api/registry/StaticElement<Lnet/minecraft/block/Block;>",
 				"com/mmodding/library/block/api/BlockWithItem",
 				"com/mmodding/library/block/api/MModdingBlock"
 			))

mmodding-block/src/main/java/com/mmodding/library/block/api/catalog/GrowsDownPlantBlock.java

@@ -1,11 +1,10 @@
 package com.mmodding.library.block.api.catalog;
 
-import com.mmodding.library.core.api.registry.IdentifierUtil;
-import com.mmodding.library.core.api.registry.StaticElement;
+import com.mmodding.library.core.api.AdvancedContainer;
 import net.minecraft.block.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.Registries;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.BooleanProperty;
@@ -18,7 +17,7 @@
 
 import java.util.function.Predicate;
 
-public class GrowsDownPlantBlock implements StaticElement<Block> {
+public class GrowsDownPlantBlock {
 
 	private final Head head;
 	private final Body body;
@@ -45,9 +44,9 @@ public BlockState withFruits(BlockState state) {
 		return state;
 	}
 
-	public void register(RegistryKey<Block> key) {
-		this.head.register(key.mapValue(value -> IdentifierUtil.extend(value, "head")));
-		this.body.register(key);
+	public void register(AdvancedContainer mod, String path) {
+		mod.register(Registries.BLOCK, path + "_head", this.head);
+		mod.register(Registries.BLOCK, path, this.body);
 	}
 
 	/* @ClientOnly

mmodding-block/src/main/java/com/mmodding/library/block/mixin/BlockMixin.java

@@ -3,13 +3,10 @@
 import com.mmodding.library.block.api.BlockWithItem;
 import com.mmodding.library.block.api.MModdingBlock;
 import com.mmodding.library.block.impl.BlockWithItemImpl;
-import com.mmodding.library.core.api.registry.StaticElement;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -20,17 +17,17 @@
 
 @Mixin(Block.class)
 @SuppressWarnings("AddedMixinMembersNamePattern")
-public class BlockMixin implements BlockWithItem, MModdingBlock, StaticElement<Block>, BlockWithItemImpl.Getter {
+public class BlockMixin implements BlockWithItem, MModdingBlock, BlockWithItemImpl.Getter {
 
 	@Unique
 	private Item item = null;
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "DataFlowIssue"})
 	public <T extends Block> T withItem(Item.@NotNull Settings settings, @NotNull BiFunction<T, Item.Settings, Item> factory,  @NotNull Function<Item, Item> tweaker) {
 		if (this.item == null) {
-			this.item = tweaker.apply(factory.apply((T) this.mmodding$as(), settings));
-			return (T) this.mmodding$as();
+			this.item = tweaker.apply(factory.apply((T) (Object) this, settings));
+			return (T) (Object) this;
 		}
 		else {
 			throw new RuntimeException("Tried to link a new item to a block that already had one");
@@ -42,16 +39,6 @@ public boolean canBeReplaced(BlockState state, @Nullable ItemPlacementContext co
 		return context != null ? state.canReplace(context) : state.isReplaceable();
 	}
 
-	@Override
-	public Registry<Block> mmodding$getRegistry() {
-		return Registries.BLOCK;
-	}
-
-	@Override
-	public Block mmodding$as() {
-		return (Block) (Object) this;
-	}
-
 	@Override
 	public Item mmodding$getItem() {
 		return this.item;

mmodding-core/src/main/java/com/mmodding/library/core/api/AdvancedContainer.java

@@ -67,6 +67,23 @@ default <T> RegistryKeyFactory<T> keyFactory(RegistryKey<? extends Registry<T>>
 		return RegistryKeyFactory.create(registry, this.getMetadata().getId());
 	}
 
+	/**
+	 * A registration method filling the mod namespace automatically.
+	 * @see Registry#register(Registry, Identifier, Object)
+	 */
+	default <T> T register(Registry<T> registry, String path, T element) {
+		return Registry.register(registry, RegistryKey.of(registry.getKey(), Identifier.of(this.getMetadata().getId(), path)), element);
+	}
+
+	/**
+	 * A registration method filling the mod namespace automatically.
+	 * @see Registerable#register(RegistryKey, Object)
+	 */
+	default <T> T register(RegistryKey<? extends Registry<T>> registry, Registerable<T> registerable, String path, T element) {
+		registerable.register(RegistryKey.of(registry, Identifier.of(this.getMetadata().getId(), path)), element);
+		return element;
+	}
+
 	/**
 	 * Allows to make a bunch of registrations for a specified {@link Registry}.
 	 * @param registry the registry

mmodding-core/src/main/java/com/mmodding/library/core/api/registry/StaticElement.java

@@ -8,7 +8,6 @@
 
 public interface RegistrationFactory<T> {
 
-
 	/**
 	 * Creates a {@link RegistrationFactory}.
 	 * @param registry the registry

mmodding-core/src/main/java/com/mmodding/library/core/api/registry/factory/RegistrationFactory.java

@@ -5,10 +5,7 @@ mmodding {
 		environment = EnvironmentTarget.ANY
 		addMixin("mmodding_item.mixins.json")
 		withInjectedInterfaces {
-			it.injectTo("net/minecraft/class_1792", Set.of(
-				"com/mmodding/library/core/api/registry/StaticElement<Lnet/minecraft/item/Item;>",
-				"com/mmodding/library/item/api/category/ItemCategoryContainer"
-			))
+			it.injectTo("net/minecraft/class_1792", "com/mmodding/library/item/api/category/ItemCategoryContainer")
 		}
 	}
 	modules {

mmodding-core/src/main/java/com/mmodding/library/core/impl/registry/StaticElementImpl.java

@@ -1,32 +1,24 @@
 package com.mmodding.library.item.mixin;
 
-import com.mmodding.library.core.api.registry.StaticElement;
 import com.mmodding.library.item.api.category.ItemCategory;
 import com.mmodding.library.item.api.category.ItemCategoryContainer;
 import com.mmodding.library.item.impl.category.ItemCategoryImpl;
 import net.minecraft.item.Item;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
+import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Item.class)
 @SuppressWarnings("AddedMixinMembersNamePattern")
-public class ItemMixin implements StaticElement<Item>, ItemCategoryContainer {
+public abstract class ItemMixin implements ItemCategoryContainer {
 
-	@Override
-	public Registry<Item> mmodding$getRegistry() {
-		return Registries.ITEM;
-	}
-
-	@Override
-	public Item mmodding$as() {
-		return (Item) (Object) this;
-	}
+	@Shadow
+	public abstract ItemStack getDefaultStack();
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "DataFlowIssue"})
 	public <T extends Item> T setCategory(ItemCategory category) {
-		ItemCategoryImpl.addEntries(category, this.mmodding$as().getDefaultStack());
-		return (T) this.mmodding$as();
+		ItemCategoryImpl.addEntries(category, this.getDefaultStack());
+		return (T) (Object) this;
 	}
 }

mmodding-item/build.gradle

@@ -1,7 +1,6 @@
 package com.mmodding.library.worldgen.api.vein;
 
 import com.mmodding.library.block.api.util.RandomStateContainer;
-import com.mmodding.library.core.api.registry.StaticElement;
 import com.mmodding.library.core.api.registry.companion.DynamicRegistryCompanion;
 import com.mmodding.library.worldgen.impl.vein.VeinTypeImpl;
 import net.minecraft.block.BlockState;
@@ -12,7 +11,7 @@
 import net.minecraft.world.gen.chunk.ChunkNoiseSampler;
 import net.minecraft.world.gen.densityfunction.DensityFunction;
 
-public interface VeinType extends StaticElement<VeinType> {
+public interface VeinType {
 
 	DynamicRegistryCompanion<ChunkGeneratorSettings, VeinType> REGISTRY = DynamicRegistryCompanion.create(RegistryKeys.CHUNK_GENERATOR_SETTINGS);