Add signature to interface injected classes in registry

Author: thecatcore

build.gradle

@@ -255,10 +255,18 @@ def moduleDependencies(Project project, List<String> projectNames) {
 }
 
 def getNestBuild(String mcVersion) {
-	if (mcVersion == "1.7.10") {
-		return "5"
+	if (mcVersion == "1.8") {
+		return "3"
+	} else if (mcVersion == "1.7.10") {
+		return "6"
 	} else if (mcVersion == "1.6.4") {
-		return "2"
+		return "3"
+	} else if (mcVersion == "1.5.2") {
+		return "6"
+	} else if (mcVersion == "1.4.7") {
+		return "8"
+	} else if (mcVersion == "1.3.2") {
+		return "8"
 	}
 
 	return null;

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 base_version = 1.13.2
 loader_version = 0.18.2
 feather_build = 1
-osl_version = 0.17.0-alpha.6
+osl_version = 0.17.0-alpha.7
 
 ## Module versions
 legacy-fabric-api-base.version = 1.2.2

legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/block/versioned/EarlyInitializer.java

@@ -61,8 +61,8 @@ private static void blockRegistryInit(FabricRegistry<?> holder) {
 				boolean useNeighbourLight = false;
 				boolean isStairs = block instanceof StairsBlock;
 				boolean isSlab = block instanceof SlabBlock;
-				boolean isMissingTop = block == RegistryHelper.getValue(Item.REGISTRY, new Identifier("farmland"))
-						|| block == RegistryHelper.getValue(Item.REGISTRY, new Identifier("grass_path"));
+				boolean isMissingTop = block == RegistryHelper.getValue(Block.REGISTRY, new Identifier("farmland"))
+						|| block == RegistryHelper.getValue(Block.REGISTRY, new Identifier("grass_path"));
 				boolean isTranslucent = block.isTranslucent;
 				boolean isNotOpaque = block.opacity == 0;
 

legacy-fabric-block-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/impl/block/versioned/EarlyInitializer.java

@@ -20,7 +20,6 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
 
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
@@ -47,7 +46,7 @@ private static void blockRegistryInit(FabricRegistry<?> holder) {
 				boolean useNeighbourLight = false;
 				boolean isStairs = block.getRenderType() == 10;
 				boolean isSlab = block instanceof SlabBlock;
-				boolean isMissingTop = block == RegistryHelper.getValue(Item.REGISTRY, new Identifier("farmland"));
+				boolean isMissingTop = block == RegistryHelper.getValue(Block.REGISTRY, new Identifier("farmland"));
 				boolean isTranslucent = block.isTranslucent;
 				boolean isNotOpaque = block.getOpacity() == 0;
 

legacy-fabric-block-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/block/versioned/BlockStateRemapper.java

@@ -31,7 +31,6 @@
 import net.legacyfabric.fabric.mixin.block.versioned.BlockAccessor;
 
 public class BlockStateRemapper implements RegistryRemapCallback<Block> {
-
 	@Override
 	public void callback(Map<Integer, FabricRegistryEntry<Block>> changedIdsMap) {
 		IdsHolder<BlockState> newList = Block.STATE_REGISTRY.fabric$new();

legacy-fabric-block-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/block/versioned/EarlyInitializer.java

@@ -61,7 +61,7 @@ private static void blockRegistryInit(FabricRegistry<?> holder) {
 				boolean useNeighbourLight = false;
 				boolean isStairs = block instanceof StairsBlock;
 				boolean isSlab = block instanceof SlabBlock;
-				boolean isMissingTop = block == RegistryHelper.getValue(Item.REGISTRY, new Identifier("farmland"));
+				boolean isMissingTop = block == RegistryHelper.getValue(Block.REGISTRY, new Identifier("farmland"));
 				boolean isTranslucent = block.isTranslucent;
 				boolean isNotOpaque = block.opacity == 0;
 

legacy-fabric-registry-sync-api-v2/1.12.2/src/main/resources/legacy-fabric-registry-sync-api-v2.classtweaker

@@ -1,2 +1,2 @@
 classTweaker	v1	named
-transitive-inject-interface	net/minecraft/util/Id2ObjectBiMap	net/legacyfabric/fabric/api/registry/v2/registry/registrable/IdsHolder
+transitive-inject-interface	net/minecraft/util/Id2ObjectBiMap	net/legacyfabric/fabric/api/registry/v2/registry/registrable/IdsHolder<TT;>

legacy-fabric-registry-sync-api-v2/common/src/main/resources/legacy-fabric-registry-sync-api-v2-common.classtweaker

@@ -1,4 +1,4 @@
 classTweaker	v1	named
-transitive-inject-interface	net/minecraft/util/CrudeIncrementalIntIdentityHashMap	net/legacyfabric/fabric/api/registry/v2/registry/registrable/IdsHolder
-transitive-inject-interface	net/minecraft/util/registry/MappedRegistry	net/legacyfabric/fabric/api/registry/v2/registry/holder/FabricRegistry
-transitive-inject-interface	net/minecraft/util/registry/IdRegistry	net/legacyfabric/fabric/api/registry/v2/registry/holder/SyncedFabricRegistry
+transitive-inject-interface	net/minecraft/util/CrudeIncrementalIntIdentityHashMap	net/legacyfabric/fabric/api/registry/v2/registry/registrable/IdsHolder<TT;>
+transitive-inject-interface	net/minecraft/util/registry/MappedRegistry	net/legacyfabric/fabric/api/registry/v2/registry/holder/FabricRegistry<TV;>
+transitive-inject-interface	net/minecraft/util/registry/IdRegistry	net/legacyfabric/fabric/api/registry/v2/registry/holder/SyncedFabricRegistry<TV;>