Skip to content

Commit 6a003fc

Browse files
fnueckefnuecke
committed
Fixed tests.
1 parent 78ae75a commit 6a003fc

File tree

8 files changed

+50
-40
lines changed

8 files changed

+50
-40
lines changed

‎src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
package li.cil.oc2.api.bus.device.data;
44

5-
import li.cil.oc2.api.API;
65
import li.cil.sedna.api.device.BlockDevice;
7-
import net.minecraft.core.Registry;
86
import net.minecraft.network.chat.Component;
9-
import net.minecraft.resources.ResourceKey;
10-
import net.minecraft.resources.ResourceLocation;
117
import net.minecraftforge.registries.IForgeRegistryEntry;
128

139
/**
@@ -30,11 +26,6 @@
3026
* </pre>
3127
*/
3228
public interface BlockDeviceData extends IForgeRegistryEntry<BlockDeviceData> {
33-
/**
34-
* The registry name of the registry holding block device bases.
35-
*/
36-
ResourceKey<Registry<BlockDeviceData>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "block_device_data"));
37-
3829
/**
3930
* Gets the read-only base block device this implementation describes.
4031
*

‎src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
package li.cil.oc2.api.bus.device.data;
44

5-
import li.cil.oc2.api.API;
65
import li.cil.sedna.api.memory.MemoryMap;
7-
import net.minecraft.core.Registry;
86
import net.minecraft.network.chat.Component;
9-
import net.minecraft.resources.ResourceKey;
10-
import net.minecraft.resources.ResourceLocation;
117
import net.minecraftforge.registries.IForgeRegistryEntry;
128

139
/**
@@ -25,11 +21,6 @@
2521
* </pre>
2622
*/
2723
public interface Firmware extends IForgeRegistryEntry<Firmware> {
28-
/**
29-
* The registry name of the registry holding firmwares.
30-
*/
31-
ResourceKey<Registry<Firmware>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "firmware"));
32-
3324
/**
3425
* Runs this firmware.
3526
* <p>

‎src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
package li.cil.oc2.api.bus.device.provider;
44

5-
import li.cil.oc2.api.API;
65
import li.cil.oc2.api.bus.device.Device;
76
import li.cil.oc2.api.bus.device.rpc.RPCDevice;
87
import li.cil.oc2.api.bus.device.vm.VMDevice;
98
import li.cil.oc2.api.util.Invalidatable;
10-
import net.minecraft.core.Registry;
119
import net.minecraft.nbt.CompoundTag;
12-
import net.minecraft.resources.ResourceKey;
13-
import net.minecraft.resources.ResourceLocation;
1410
import net.minecraftforge.registries.IForgeRegistryEntry;
1511

1612
/**
@@ -50,11 +46,6 @@
5046
* @see BlockDeviceQuery
5147
*/
5248
public interface BlockDeviceProvider extends IForgeRegistryEntry<BlockDeviceProvider> {
53-
/**
54-
* The registry name of the registry holding block device providers.
55-
*/
56-
ResourceKey<Registry<BlockDeviceProvider>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "block_device_provider"));
57-
5849
/**
5950
* Get a device for the specified query.
6051
*

‎src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
package li.cil.oc2.api.bus.device.provider;
44

5-
import li.cil.oc2.api.API;
65
import li.cil.oc2.api.bus.device.ItemDevice;
76
import li.cil.oc2.api.bus.device.rpc.RPCDevice;
87
import li.cil.oc2.api.bus.device.vm.VMDevice;
9-
import net.minecraft.core.Registry;
108
import net.minecraft.nbt.CompoundTag;
11-
import net.minecraft.resources.ResourceKey;
12-
import net.minecraft.resources.ResourceLocation;
139
import net.minecraftforge.registries.IForgeRegistryEntry;
1410

1511
import javax.annotation.Nullable;
@@ -47,11 +43,6 @@
4743
* @see ItemDeviceQuery
4844
*/
4945
public interface ItemDeviceProvider extends IForgeRegistryEntry<ItemDeviceProvider> {
50-
/**
51-
* The registry name of the registry holding item device providers.
52-
*/
53-
ResourceKey<Registry<ItemDeviceProvider>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "item_device_provider"));
54-
5546
/**
5647
* Get a device for the specified query.
5748
*

‎src/main/java/li/cil/oc2/api/util/Registries.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/* SPDX-License-Identifier: MIT */
2+
3+
package li.cil.oc2.api.util;
4+
5+
import li.cil.oc2.api.API;
6+
import li.cil.oc2.api.bus.device.data.BlockDeviceData;
7+
import li.cil.oc2.api.bus.device.data.Firmware;
8+
import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider;
9+
import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider;
10+
import net.minecraft.core.Registry;
11+
import net.minecraft.resources.ResourceKey;
12+
import net.minecraft.resources.ResourceLocation;
13+
14+
/**
15+
* {@link ResourceKey}s for registries created by the mod.
16+
*/
17+
public final class Registries {
18+
/**
19+
* The registry name of the registry holding block device providers.
20+
*/
21+
public static final ResourceKey<Registry<BlockDeviceProvider>> BLOCK_DEVICE_PROVIDER = key("block_device_provider");
22+
23+
/**
24+
* The registry name of the registry holding item device providers.
25+
*/
26+
public static final ResourceKey<Registry<ItemDeviceProvider>> ITEM_DEVICE_PROVIDER = key("item_device_provider");
27+
28+
/**
29+
* The registry name of the registry holding block device bases.
30+
*/
31+
public static final ResourceKey<Registry<BlockDeviceData>> BLOCK_DEVICE_DATA = key("block_device_data");
32+
33+
/**
34+
* The registry name of the registry holding firmwares.
35+
*/
36+
public static final ResourceKey<Registry<Firmware>> FIRMWARE = key("firmware");
37+
38+
///////////////////////////////////////////////////////////////////
39+
40+
private static <T> ResourceKey<Registry<T>> key(final String name) {
41+
return ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, name));
42+
}
43+
}

‎src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package li.cil.oc2.common.bus.device.data;
44

55
import li.cil.oc2.api.bus.device.data.BlockDeviceData;
6+
import li.cil.oc2.api.util.Registries;
67
import li.cil.oc2.common.util.RegistryUtils;
78
import net.minecraft.resources.ResourceLocation;
89
import net.minecraftforge.registries.DeferredRegister;
@@ -15,7 +16,7 @@
1516
import java.util.stream.Stream;
1617

1718
public final class BlockDeviceDataRegistry {
18-
private static final DeferredRegister<BlockDeviceData> INITIALIZER = RegistryUtils.getInitializerFor(BlockDeviceData.REGISTRY);
19+
private static final DeferredRegister<BlockDeviceData> INITIALIZER = RegistryUtils.getInitializerFor(Registries.BLOCK_DEVICE_DATA);
1920

2021
///////////////////////////////////////////////////////////////////
2122

‎src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package li.cil.oc2.common.bus.device.data;
44

55
import li.cil.oc2.api.bus.device.data.Firmware;
6+
import li.cil.oc2.api.util.Registries;
67
import li.cil.oc2.common.util.RegistryUtils;
78
import net.minecraft.resources.ResourceLocation;
89
import net.minecraftforge.registries.DeferredRegister;
@@ -15,7 +16,7 @@
1516
import java.util.stream.Stream;
1617

1718
public final class FirmwareRegistry {
18-
private static final DeferredRegister<Firmware> INITIALIZER = RegistryUtils.getInitializerFor(Firmware.REGISTRY);
19+
private static final DeferredRegister<Firmware> INITIALIZER = RegistryUtils.getInitializerFor(Registries.FIRMWARE);
1920

2021
///////////////////////////////////////////////////////////////////
2122

‎src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider;
66
import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider;
7+
import li.cil.oc2.api.util.Registries;
78
import li.cil.oc2.common.util.RegistryUtils;
89
import net.minecraftforge.registries.DeferredRegister;
910
import net.minecraftforge.registries.IForgeRegistry;
@@ -12,12 +13,12 @@
1213
import java.util.function.Supplier;
1314

1415
public final class ProviderRegistry {
15-
private static final DeferredRegister<BlockDeviceProvider> BLOCK_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(BlockDeviceProvider.REGISTRY);
16+
private static final DeferredRegister<BlockDeviceProvider> BLOCK_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(Registries.BLOCK_DEVICE_PROVIDER);
1617
public static final Supplier<IForgeRegistry<BlockDeviceProvider>> BLOCK_DEVICE_PROVIDER_REGISTRY = BLOCK_DEVICE_PROVIDERS.makeRegistry(BlockDeviceProvider.class, RegistryBuilder::new);
1718

1819
///////////////////////////////////////////////////////////////////
1920

20-
private static final DeferredRegister<ItemDeviceProvider> ITEM_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(ItemDeviceProvider.REGISTRY);
21+
private static final DeferredRegister<ItemDeviceProvider> ITEM_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(Registries.ITEM_DEVICE_PROVIDER);
2122
public static final Supplier<IForgeRegistry<ItemDeviceProvider>> ITEM_DEVICE_PROVIDER_REGISTRY = ITEM_DEVICE_PROVIDERS.makeRegistry(ItemDeviceProvider.class, RegistryBuilder::new);
2223

2324
///////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)