FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add test for nested dynamic objects

Browse source
This commit is contained in:
Juuz 2023-07-07 23:49:06 +03:00
parent 741bd52c1e
commit 486e3e1ce0
No known key found for this signature in database
GPG key ID: 698A49B11130C4E5
4 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java
View file

@ -56,6 +56,8 @@ public class RegistrySyncTest implements ModInitializer {
public static final RegistryKey<Registry<TestDynamicObject>> TEST_DYNAMIC_REGISTRY_KEY =
RegistryKey.ofRegistry(new Identifier("fabric", "test_dynamic"));
public static final RegistryKey<Registry<TestNestedDynamicObject>> TEST_NESTED_DYNAMIC_REGISTRY_KEY =
RegistryKey.ofRegistry(new Identifier("fabric", "test_dynamic_nested"));
public static final RegistryKey<Registry<TestDynamicObject>> TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY =
RegistryKey.ofRegistry(new Identifier("fabric", "test_dynamic_synced_1"));
public static final RegistryKey<Registry<TestDynamicObject>> TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY =
@ -104,6 +106,10 @@ public class RegistrySyncTest implements ModInitializer {
.synced();
DynamicRegistries.register(TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY, TestDynamicObject.CODEC)
.synced(TestDynamicObject.NETWORK_CODEC);
// A registry that is loaded before its dependency that is used in a RegistryEntry.
DynamicRegistries.register(TEST_NESTED_DYNAMIC_REGISTRY_KEY, TestNestedDynamicObject.CODEC)
.synced()
.sortBefore(TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY);
DynamicRegistrySetupCallback.EVENT.register(registryManager -> {
setupCalled.set(true);
@ -113,6 +119,7 @@ public class RegistrySyncTest implements ModInitializer {
addListenerForDynamic(registryManager, TEST_DYNAMIC_REGISTRY_KEY);
addListenerForDynamic(registryManager, TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY);
addListenerForDynamic(registryManager, TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY);
addListenerForDynamic(registryManager, TEST_NESTED_DYNAMIC_REGISTRY_KEY);
});
ServerLifecycleEvents.SERVER_STARTING.register(server -> {

31
fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/TestNestedDynamicObject.java Normal file
View file

@ -0,0 +1,31 @@
/*
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.fabricmc.fabric.test.registry.sync;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.registry.entry.RegistryElementCodec;
import net.minecraft.registry.entry.RegistryEntry;
public record TestNestedDynamicObject(RegistryEntry<TestDynamicObject> nested) {
public static final Codec<TestNestedDynamicObject> CODEC = RecordCodecBuilder.create(instance -> instance.group(
RegistryElementCodec.of(RegistrySyncTest.TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY, TestDynamicObject.CODEC)
.fieldOf("nested")
.forGetter(TestNestedDynamicObject::nested)
).apply(instance, TestNestedDynamicObject::new));
}

3
fabric-registry-sync-v0/src/testmod/resources/data/fabric-registry-sync-v0-testmod/fabric/test_dynamic_nested/synced.json Normal file
View file

@ -0,0 +1,3 @@
{
"nested": "fabric-registry-sync-v0-testmod:synced"
}

12
fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncClientTest.java
View file

@ -25,6 +25,7 @@ import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.test.registry.sync.RegistrySyncTest;
import net.fabricmc.fabric.test.registry.sync.TestDynamicObject;
import net.fabricmc.fabric.test.registry.sync.TestNestedDynamicObject;
public final class RegistrySyncClientTest implements ClientModInitializer {
private static final Logger LOGGER = LogUtils.getLogger();
@ -41,6 +42,9 @@ public final class RegistrySyncClientTest implements ClientModInitializer {
TestDynamicObject synced2 = handler.getRegistryManager()
.get(RegistrySyncTest.TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY)
.get(SYNCED_ID);
TestNestedDynamicObject synced3 = handler.getRegistryManager()
.get(RegistrySyncTest.TEST_NESTED_DYNAMIC_REGISTRY_KEY)
.get(SYNCED_ID);
if (synced1 == null) {
throw new AssertionError("Did not receive " + RegistrySyncTest.TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY + "/" + SYNCED_ID);
@ -60,6 +64,14 @@ public final class RegistrySyncClientTest implements ClientModInitializer {
throw new AssertionError("Entries in " + RegistrySyncTest.TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY + " should use network codec");
}
if (synced3 == null) {
throw new AssertionError("Did not receive " + RegistrySyncTest.TEST_NESTED_DYNAMIC_REGISTRY_KEY + "/" + SYNCED_ID);
}
if (synced3.nested().value() != synced1) {
throw new AssertionError("Did not match up synced nested entry to the other synced value");
}
LOGGER.info("Dynamic registry sync tests passed!");
});
}