Skip to content

Commit 7fe8372

Browse files
committed
Port fabric-serialization-api-v1
1 parent 151b1b5 commit 7fe8372

5 files changed

Lines changed: 25 additions & 3 deletions

File tree

buildSrc/src/main/kotlin/ffapi.neo-setup.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ val testmod: SourceSet by sourceSets.creating {
3030
}
3131
}
3232

33+
sourceSets.named("test") {
34+
compileClasspath += testmod.compileClasspath
35+
runtimeClasspath += testmod.runtimeClasspath
36+
}
37+
3338
dependencies {
3439
"compileOnly"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
3540
"runtimeOnly"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader:full")
@@ -45,6 +50,7 @@ dependencies {
4550
"testImplementation"("org.mockito:mockito-core:5.4.0")
4651
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.8.1")
4752
"testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.8.1")
53+
"testRuntimeOnly"("org.junit.platform:junit-platform-launcher")
4854

4955
if (project.name != "fabric-gametest-api-v1") {
5056
"testmodImplementation"(project(":fabric-gametest-api-v1"))
@@ -64,7 +70,6 @@ tasks {
6470

6571
named<Test>("test") {
6672
useJUnitPlatform()
67-
enabled = false
6873
}
6974

7075
named<ProcessResources>("processResources") {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package net.fabricmc.fabric.mixin.serialization;
2+
3+
import net.fabricmc.fabric.api.serialization.v1.value.FabricValueInput;
4+
5+
import net.neoforged.neoforge.common.extensions.ValueInputExtension;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
8+
@Mixin(ValueInputExtension.class)
9+
public interface ValueInputExtensionMixin extends FabricValueInput {
10+
}

fabric-serialization-api-v1/src/main/resources/fabric-serialization-api-v1.mixins.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"TagValueInputMixin",
77
"TagValueOutputMixin",
88
"ValueInputMixin",
9-
"ValueOutputMixin"
9+
"ValueOutputMixin",
10+
"ValueInputExtensionMixin"
1011
],
1112
"injectors": {
1213
"defaultRequire": 1

fabric-serialization-api-v1/src/test/java/net/fabricmc/fabric/test/serialization/DelegateValueInput.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package net.fabricmc.fabric.test.serialization;
1818

1919
import java.util.Optional;
20+
import java.util.Set;
2021

2122
import com.mojang.serialization.Codec;
2223
import com.mojang.serialization.MapCodec;
@@ -132,4 +133,9 @@ public Optional<int[]> getIntArray(String key) {
132133
public HolderLookup.Provider lookup() {
133134
return input.lookup();
134135
}
136+
137+
@Override
138+
public Set<String> keySet() {
139+
return ValueInput.super.keySet();
140+
}
135141
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ include("fabric-lifecycle-events-v1")
7272
include("fabric-resource-conditions-api-v1")
7373
include("fabric-resource-loader-v1")
7474
include("fabric-screen-api-v1")
75-
//include 'fabric-serialization-api-v1'
75+
include("fabric-serialization-api-v1")
7676
include("fabric-sound-api-v1")
7777
//include 'fabric-tag-api-v1'
7878
//include 'fabric-transfer-api-v1'

0 commit comments

Comments
 (0)