Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests.

Browse Source
This commit is contained in:
Florian Nücke
2022-04-07 19:33:12 +02:00
parent 78ae75a557
commit 6a003fc64c
8 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java
View File

@@ -2,12 +2,8 @@
package li.cil.oc2.api.bus.device.data;
import li.cil.oc2.api.API;
import li.cil.sedna.api.device.BlockDevice;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.IForgeRegistryEntry;
/**
@@ -30,11 +26,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry;
* </pre>
*/
public interface BlockDeviceData extends IForgeRegistryEntry<BlockDeviceData> {
/**
* The registry name of the registry holding block device bases.
*/
ResourceKey<Registry<BlockDeviceData>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "block_device_data"));
/**
* Gets the read-only base block device this implementation describes.
*

9
src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java
View File

@@ -2,12 +2,8 @@
package li.cil.oc2.api.bus.device.data;
import li.cil.oc2.api.API;
import li.cil.sedna.api.memory.MemoryMap;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.IForgeRegistryEntry;
/**
@@ -25,11 +21,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry;
* </pre>
*/
public interface Firmware extends IForgeRegistryEntry<Firmware> {
/**
* The registry name of the registry holding firmwares.
*/
ResourceKey<Registry<Firmware>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "firmware"));
/**
* Runs this firmware.
* <p>

9
src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java
View File

@@ -2,15 +2,11 @@
package li.cil.oc2.api.bus.device.provider;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.Device;
import li.cil.oc2.api.bus.device.rpc.RPCDevice;
import li.cil.oc2.api.bus.device.vm.VMDevice;
import li.cil.oc2.api.util.Invalidatable;
import net.minecraft.core.Registry;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.IForgeRegistryEntry;
/**
@@ -50,11 +46,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry;
* @see BlockDeviceQuery
*/
public interface BlockDeviceProvider extends IForgeRegistryEntry<BlockDeviceProvider> {
/**
* The registry name of the registry holding block device providers.
*/
ResourceKey<Registry<BlockDeviceProvider>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "block_device_provider"));
/**
* Get a device for the specified query.
*

9
src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java
View File

@@ -2,14 +2,10 @@
package li.cil.oc2.api.bus.device.provider;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.ItemDevice;
import li.cil.oc2.api.bus.device.rpc.RPCDevice;
import li.cil.oc2.api.bus.device.vm.VMDevice;
import net.minecraft.core.Registry;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.IForgeRegistryEntry;
import javax.annotation.Nullable;
@@ -47,11 +43,6 @@ import java.util.Optional;
* @see ItemDeviceQuery
*/
public interface ItemDeviceProvider extends IForgeRegistryEntry<ItemDeviceProvider> {
/**
* The registry name of the registry holding item device providers.
*/
ResourceKey<Registry<ItemDeviceProvider>> REGISTRY = ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, "item_device_provider"));
/**
* Get a device for the specified query.
*

43
src/main/java/li/cil/oc2/api/util/Registries.java Normal file
View File

@@ -0,0 +1,43 @@
/* SPDX-License-Identifier: MIT */
package li.cil.oc2.api.util;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.data.BlockDeviceData;
import li.cil.oc2.api.bus.device.data.Firmware;
import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider;
import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
/**
* {@link ResourceKey}s for registries created by the mod.
*/
public final class Registries {
/**
* The registry name of the registry holding block device providers.
*/
public static final ResourceKey<Registry<BlockDeviceProvider>> BLOCK_DEVICE_PROVIDER = key("block_device_provider");
/**
* The registry name of the registry holding item device providers.
*/
public static final ResourceKey<Registry<ItemDeviceProvider>> ITEM_DEVICE_PROVIDER = key("item_device_provider");
/**
* The registry name of the registry holding block device bases.
*/
public static final ResourceKey<Registry<BlockDeviceData>> BLOCK_DEVICE_DATA = key("block_device_data");
/**
* The registry name of the registry holding firmwares.
*/
public static final ResourceKey<Registry<Firmware>> FIRMWARE = key("firmware");
///////////////////////////////////////////////////////////////////
private static <T> ResourceKey<Registry<T>> key(final String name) {
return ResourceKey.createRegistryKey(new ResourceLocation(API.MOD_ID, name));
}
}

3
src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java
View File

@@ -3,6 +3,7 @@
package li.cil.oc2.common.bus.device.data;
import li.cil.oc2.api.bus.device.data.BlockDeviceData;
import li.cil.oc2.api.util.Registries;
import li.cil.oc2.common.util.RegistryUtils;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.DeferredRegister;
@@ -15,7 +16,7 @@ import java.util.function.Supplier;
import java.util.stream.Stream;
public final class BlockDeviceDataRegistry {
private static final DeferredRegister<BlockDeviceData> INITIALIZER = RegistryUtils.getInitializerFor(BlockDeviceData.REGISTRY);
private static final DeferredRegister<BlockDeviceData> INITIALIZER = RegistryUtils.getInitializerFor(Registries.BLOCK_DEVICE_DATA);
///////////////////////////////////////////////////////////////////

3
src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java
View File

@@ -3,6 +3,7 @@
package li.cil.oc2.common.bus.device.data;
import li.cil.oc2.api.bus.device.data.Firmware;
import li.cil.oc2.api.util.Registries;
import li.cil.oc2.common.util.RegistryUtils;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.DeferredRegister;
@@ -15,7 +16,7 @@ import java.util.function.Supplier;
import java.util.stream.Stream;
public final class FirmwareRegistry {
private static final DeferredRegister<Firmware> INITIALIZER = RegistryUtils.getInitializerFor(Firmware.REGISTRY);
private static final DeferredRegister<Firmware> INITIALIZER = RegistryUtils.getInitializerFor(Registries.FIRMWARE);
///////////////////////////////////////////////////////////////////

5
src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java
View File

@@ -4,6 +4,7 @@ package li.cil.oc2.common.bus.device.provider;
import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider;
import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider;
import li.cil.oc2.api.util.Registries;
import li.cil.oc2.common.util.RegistryUtils;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.IForgeRegistry;
@@ -12,12 +13,12 @@ import net.minecraftforge.registries.RegistryBuilder;
import java.util.function.Supplier;
public final class ProviderRegistry {
private static final DeferredRegister<BlockDeviceProvider> BLOCK_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(BlockDeviceProvider.REGISTRY);
private static final DeferredRegister<BlockDeviceProvider> BLOCK_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(Registries.BLOCK_DEVICE_PROVIDER);
public static final Supplier<IForgeRegistry<BlockDeviceProvider>> BLOCK_DEVICE_PROVIDER_REGISTRY = BLOCK_DEVICE_PROVIDERS.makeRegistry(BlockDeviceProvider.class, RegistryBuilder::new);
///////////////////////////////////////////////////////////////////
private static final DeferredRegister<ItemDeviceProvider> ITEM_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(ItemDeviceProvider.REGISTRY);
private static final DeferredRegister<ItemDeviceProvider> ITEM_DEVICE_PROVIDERS = RegistryUtils.getInitializerFor(Registries.ITEM_DEVICE_PROVIDER);
public static final Supplier<IForgeRegistry<ItemDeviceProvider>> ITEM_DEVICE_PROVIDER_REGISTRY = ITEM_DEVICE_PROVIDERS.makeRegistry(ItemDeviceProvider.class, RegistryBuilder::new);
///////////////////////////////////////////////////////////////////