Make 1.16 ObjectHolders nicer (#2612)

src/main/java/com/refinedmods/refinedstorage/RSBlocks.java

@@ -3,85 +3,86 @@ package com.refinedmods.refinedstorage;
 import com.refinedmods.refinedstorage.block.*;
 import net.minecraftforge.registries.ObjectHolder;
 
+@ObjectHolder(RS.ID)
 public final class RSBlocks {
-    @ObjectHolder(RS.ID + ":importer")
+    @ObjectHolder("importer")
     public static final ImporterBlock IMPORTER = null;
-    @ObjectHolder(RS.ID + ":exporter")
+    @ObjectHolder("exporter")
     public static final ExporterBlock EXPORTER = null;
-    @ObjectHolder(RS.ID + ":detector")
+    @ObjectHolder("detector")
     public static final DetectorBlock DETECTOR = null;
-    @ObjectHolder(RS.ID + ":relay")
+    @ObjectHolder("relay")
     public static final RelayBlock RELAY = null;
-    @ObjectHolder(RS.ID + ":network_transmitter")
+    @ObjectHolder("network_transmitter")
     public static final NetworkTransmitterBlock NETWORK_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":network_receiver")
+    @ObjectHolder("network_receiver")
     public static final NetworkReceiverBlock NETWORK_RECEIVER = null;
-    @ObjectHolder(RS.ID + ":quartz_enriched_iron_block")
+    @ObjectHolder("quartz_enriched_iron_block")
     public static final QuartzEnrichedIronBlock QUARTZ_ENRICHED_IRON = null;
-    @ObjectHolder(RS.ID + ":machine_casing")
+    @ObjectHolder("machine_casing")
     public static final MachineCasingBlock MACHINE_CASING = null;
-    @ObjectHolder(RS.ID + ":controller")
+    @ObjectHolder("controller")
     public static final ControllerBlock CONTROLLER = null;
-    @ObjectHolder(RS.ID + ":creative_controller")
+    @ObjectHolder("creative_controller")
     public static final ControllerBlock CREATIVE_CONTROLLER = null;
-    @ObjectHolder(RS.ID + ":cable")
+    @ObjectHolder("cable")
     public static final CableBlock CABLE = null;
-    @ObjectHolder(RS.ID + ":disk_drive")
+    @ObjectHolder("disk_drive")
     public static final DiskDriveBlock DISK_DRIVE = null;
-    @ObjectHolder(RS.ID + ":external_storage")
+    @ObjectHolder("external_storage")
     public static final ExternalStorageBlock EXTERNAL_STORAGE = null;
-    @ObjectHolder(RS.ID + ":grid")
+    @ObjectHolder("grid")
     public static final GridBlock GRID = null;
-    @ObjectHolder(RS.ID + ":crafting_grid")
+    @ObjectHolder("crafting_grid")
     public static final GridBlock CRAFTING_GRID = null;
-    @ObjectHolder(RS.ID + ":pattern_grid")
+    @ObjectHolder("pattern_grid")
     public static final GridBlock PATTERN_GRID = null;
-    @ObjectHolder(RS.ID + ":fluid_grid")
+    @ObjectHolder("fluid_grid")
     public static final GridBlock FLUID_GRID = null;
-    @ObjectHolder(RS.ID + ":1k_storage_block")
+    @ObjectHolder("1k_storage_block")
     public static final StorageBlock ONE_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":4k_storage_block")
+    @ObjectHolder("4k_storage_block")
     public static final StorageBlock FOUR_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":16k_storage_block")
+    @ObjectHolder("16k_storage_block")
     public static final StorageBlock SIXTEEN_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":64k_storage_block")
+    @ObjectHolder("64k_storage_block")
     public static final StorageBlock SIXTY_FOUR_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":creative_storage_block")
+    @ObjectHolder("creative_storage_block")
     public static final StorageBlock CREATIVE_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":64k_fluid_storage_block")
+    @ObjectHolder("64k_fluid_storage_block")
     public static final FluidStorageBlock SIXTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":256k_fluid_storage_block")
+    @ObjectHolder("256k_fluid_storage_block")
     public static final FluidStorageBlock TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":1024k_fluid_storage_block")
+    @ObjectHolder("1024k_fluid_storage_block")
     public static final FluidStorageBlock THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":4096k_fluid_storage_block")
+    @ObjectHolder("4096k_fluid_storage_block")
     public static final FluidStorageBlock FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":creative_fluid_storage_block")
+    @ObjectHolder("creative_fluid_storage_block")
     public static final FluidStorageBlock CREATIVE_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":security_manager")
+    @ObjectHolder("security_manager")
     public static final SecurityManagerBlock SECURITY_MANAGER = null;
-    @ObjectHolder(RS.ID + ":interface")
+    @ObjectHolder("interface")
     public static final InterfaceBlock INTERFACE = null;
-    @ObjectHolder(RS.ID + ":fluid_interface")
+    @ObjectHolder("fluid_interface")
     public static final FluidInterfaceBlock FLUID_INTERFACE = null;
-    @ObjectHolder(RS.ID + ":wireless_transmitter")
+    @ObjectHolder("wireless_transmitter")
     public static final WirelessTransmitterBlock WIRELESS_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":storage_monitor")
+    @ObjectHolder("storage_monitor")
     public static final StorageMonitorBlock STORAGE_MONITOR = null;
-    @ObjectHolder(RS.ID + ":constructor")
+    @ObjectHolder("constructor")
     public static final ConstructorBlock CONSTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":destructor")
+    @ObjectHolder("destructor")
     public static final DestructorBlock DESTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":disk_manipulator")
+    @ObjectHolder("disk_manipulator")
     public static final DiskManipulatorBlock DISK_MANIPULATOR = null;
-    @ObjectHolder(RS.ID + ":portable_grid")
+    @ObjectHolder("portable_grid")
     public static final PortableGridBlock PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":creative_portable_grid")
+    @ObjectHolder("creative_portable_grid")
     public static final PortableGridBlock CREATIVE_PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":crafter")
+    @ObjectHolder("crafter")
     public static final CrafterBlock CRAFTER = null;
-    @ObjectHolder(RS.ID + ":crafter_manager")
+    @ObjectHolder("crafter_manager")
     public static final CrafterManagerBlock CRAFTER_MANAGER = null;
-    @ObjectHolder(RS.ID + ":crafting_monitor")
+    @ObjectHolder("crafting_monitor")
     public static final CraftingMonitorBlock CRAFTING_MONITOR = null;
 }

src/main/java/com/refinedmods/refinedstorage/RSContainers.java

@@ -4,53 +4,54 @@ import com.refinedmods.refinedstorage.container.*;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.registries.ObjectHolder;
 
+@ObjectHolder(RS.ID)
 public final class RSContainers {
-    @ObjectHolder(RS.ID + ":controller")
+    @ObjectHolder("controller")
     public static final ContainerType<ControllerContainer> CONTROLLER = null;
-    @ObjectHolder(RS.ID + ":grid")
+    @ObjectHolder("grid")
     public static final ContainerType<GridContainer> GRID = null;
-    @ObjectHolder(RS.ID + ":detector")
+    @ObjectHolder("detector")
     public static final ContainerType<DetectorContainer> DETECTOR = null;
-    @ObjectHolder(RS.ID + ":exporter")
+    @ObjectHolder("exporter")
     public static final ContainerType<ExporterContainer> EXPORTER = null;
-    @ObjectHolder(RS.ID + ":external_storage")
+    @ObjectHolder("external_storage")
     public static final ContainerType<ExternalStorageContainer> EXTERNAL_STORAGE = null;
-    @ObjectHolder(RS.ID + ":filter")
+    @ObjectHolder("filter")
     public static final ContainerType<FilterContainer> FILTER = null;
-    @ObjectHolder(RS.ID + ":importer")
+    @ObjectHolder("importer")
     public static final ContainerType<ImporterContainer> IMPORTER = null;
-    @ObjectHolder(RS.ID + ":network_transmitter")
+    @ObjectHolder("network_transmitter")
     public static final ContainerType<NetworkTransmitterContainer> NETWORK_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":relay")
+    @ObjectHolder("relay")
     public static final ContainerType<RelayContainer> RELAY = null;
-    @ObjectHolder(RS.ID + ":disk_drive")
+    @ObjectHolder("disk_drive")
     public static final ContainerType<DiskDriveContainer> DISK_DRIVE = null;
-    @ObjectHolder(RS.ID + ":storage_block")
+    @ObjectHolder("storage_block")
     public static final ContainerType<StorageContainer> STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":fluid_storage_block")
+    @ObjectHolder("fluid_storage_block")
     public static final ContainerType<FluidStorageContainer> FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":security_manager")
+    @ObjectHolder("security_manager")
     public static final ContainerType<SecurityManagerContainer> SECURITY_MANAGER = null;
-    @ObjectHolder(RS.ID + ":interface")
+    @ObjectHolder("interface")
     public static final ContainerType<InterfaceContainer> INTERFACE = null;
-    @ObjectHolder(RS.ID + ":fluid_interface")
+    @ObjectHolder("fluid_interface")
     public static final ContainerType<FluidInterfaceContainer> FLUID_INTERFACE = null;
-    @ObjectHolder(RS.ID + ":wireless_transmitter")
+    @ObjectHolder("wireless_transmitter")
     public static final ContainerType<WirelessTransmitterContainer> WIRELESS_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":storage_monitor")
+    @ObjectHolder("storage_monitor")
     public static final ContainerType<StorageMonitorContainer> STORAGE_MONITOR = null;
-    @ObjectHolder(RS.ID + ":constructor")
+    @ObjectHolder("constructor")
     public static final ContainerType<ConstructorContainer> CONSTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":destructor")
+    @ObjectHolder("destructor")
     public static final ContainerType<DestructorContainer> DESTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":disk_manipulator")
+    @ObjectHolder("disk_manipulator")
     public static final ContainerType<DiskManipulatorContainer> DISK_MANIPULATOR = null;
-    @ObjectHolder(RS.ID + ":crafter")
+    @ObjectHolder("crafter")
     public static final ContainerType<CrafterContainer> CRAFTER = null;
-    @ObjectHolder(RS.ID + ":crafter_manager")
+    @ObjectHolder("crafter_manager")
     public static final ContainerType<CrafterManagerContainer> CRAFTER_MANAGER = null;
-    @ObjectHolder(RS.ID + ":crafting_monitor")
+    @ObjectHolder("crafting_monitor")
     public static final ContainerType<CraftingMonitorContainer> CRAFTING_MONITOR = null;
-    @ObjectHolder(RS.ID + ":wireless_crafting_monitor")
+    @ObjectHolder("wireless_crafting_monitor")
     public static final ContainerType<CraftingMonitorContainer> WIRELESS_CRAFTING_MONITOR = null;
 }

src/main/java/com/refinedmods/refinedstorage/RSItems.java

@@ -4,109 +4,110 @@ import com.refinedmods.refinedstorage.item.*;
 import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem;
 import net.minecraftforge.registries.ObjectHolder;
 
+@ObjectHolder(RS.ID)
 public final class RSItems {
-    @ObjectHolder(RS.ID + ":quartz_enriched_iron")
+    @ObjectHolder("quartz_enriched_iron")
     public static final QuartzEnrichedIronItem QUARTZ_ENRICHED_IRON = null;
-    @ObjectHolder(RS.ID + ":silicon")
+    @ObjectHolder("silicon")
     public static final SiliconItem SILICON = null;
-    @ObjectHolder(RS.ID + ":processor_binding")
+    @ObjectHolder("processor_binding")
     public static final ProcessorBindingItem PROCESSOR_BINDING = null;
-    @ObjectHolder(RS.ID + ":wrench")
+    @ObjectHolder("wrench")
     public static final WrenchItem WRENCH = null;
-    @ObjectHolder(RS.ID + ":pattern")
+    @ObjectHolder("pattern")
     public static final PatternItem PATTERN = null;
-    @ObjectHolder(RS.ID + ":filter")
+    @ObjectHolder("filter")
     public static final FilterItem FILTER = null;
-    @ObjectHolder(RS.ID + ":storage_housing")
+    @ObjectHolder("storage_housing")
     public static final StorageHousingItem STORAGE_HOUSING = null;
-    @ObjectHolder(RS.ID + ":network_card")
+    @ObjectHolder("network_card")
     public static final NetworkCardItem NETWORK_CARD = null;
-    @ObjectHolder(RS.ID + ":security_card")
+    @ObjectHolder("security_card")
     public static final SecurityCardItem SECURITY_CARD = null;
-    @ObjectHolder(RS.ID + ":construction_core")
+    @ObjectHolder("construction_core")
     public static final CoreItem CONSTRUCTION_CORE = null;
-    @ObjectHolder(RS.ID + ":destruction_core")
+    @ObjectHolder("destruction_core")
     public static final CoreItem DESTRUCTION_CORE = null;
-    @ObjectHolder(RS.ID + ":raw_basic_processor")
+    @ObjectHolder("raw_basic_processor")
     public static final ProcessorItem RAW_BASIC_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":raw_improved_processor")
+    @ObjectHolder("raw_improved_processor")
     public static final ProcessorItem RAW_IMPROVED_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":raw_advanced_processor")
+    @ObjectHolder("raw_advanced_processor")
     public static final ProcessorItem RAW_ADVANCED_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":basic_processor")
+    @ObjectHolder("basic_processor")
     public static final ProcessorItem BASIC_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":improved_processor")
+    @ObjectHolder("improved_processor")
     public static final ProcessorItem IMPROVED_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":advanced_processor")
+    @ObjectHolder("advanced_processor")
     public static final ProcessorItem ADVANCED_PROCESSOR = null;
-    @ObjectHolder(RS.ID + ":upgrade")
+    @ObjectHolder("upgrade")
     public static final UpgradeItem UPGRADE = null;
-    @ObjectHolder(RS.ID + ":speed_upgrade")
+    @ObjectHolder("speed_upgrade")
     public static final UpgradeItem SPEED_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":range_upgrade")
+    @ObjectHolder("range_upgrade")
     public static final UpgradeItem RANGE_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":crafting_upgrade")
+    @ObjectHolder("crafting_upgrade")
     public static final UpgradeItem CRAFTING_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":stack_upgrade")
+    @ObjectHolder("stack_upgrade")
     public static final UpgradeItem STACK_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":silk_touch_upgrade")
+    @ObjectHolder("silk_touch_upgrade")
     public static final UpgradeItem SILK_TOUCH_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":fortune_1_upgrade")
+    @ObjectHolder("fortune_1_upgrade")
     public static final UpgradeItem FORTUNE_1_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":fortune_2_upgrade")
+    @ObjectHolder("fortune_2_upgrade")
     public static final UpgradeItem FORTUNE_2_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":fortune_3_upgrade")
+    @ObjectHolder("fortune_3_upgrade")
     public static final UpgradeItem FORTUNE_3_UPGRADE = null;
-    @ObjectHolder(RS.ID + ":wireless_grid")
+    @ObjectHolder("wireless_grid")
     public static final WirelessGridItem WIRELESS_GRID = null;
-    @ObjectHolder(RS.ID + ":creative_wireless_grid")
+    @ObjectHolder("creative_wireless_grid")
     public static final WirelessGridItem CREATIVE_WIRELESS_GRID = null;
-    @ObjectHolder(RS.ID + ":wireless_fluid_grid")
+    @ObjectHolder("wireless_fluid_grid")
     public static final WirelessFluidGridItem WIRELESS_FLUID_GRID = null;
-    @ObjectHolder(RS.ID + ":creative_wireless_fluid_grid")
+    @ObjectHolder("creative_wireless_fluid_grid")
     public static final WirelessFluidGridItem CREATIVE_WIRELESS_FLUID_GRID = null;
-    @ObjectHolder(RS.ID + ":1k_storage_part")
+    @ObjectHolder("1k_storage_part")
     public static final StoragePartItem ONE_K_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":4k_storage_part")
+    @ObjectHolder("4k_storage_part")
     public static final StoragePartItem FOUR_K_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":16k_storage_part")
+    @ObjectHolder("16k_storage_part")
     public static final StoragePartItem SIXTEEN_K_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":64k_storage_part")
+    @ObjectHolder("64k_storage_part")
     public static final StoragePartItem SIXTY_FOUR_K_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":1k_storage_disk")
+    @ObjectHolder("1k_storage_disk")
     public static final StorageDiskItem ONE_K_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":4k_storage_disk")
+    @ObjectHolder("4k_storage_disk")
     public static final StorageDiskItem FOUR_K_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":16k_storage_disk")
+    @ObjectHolder("16k_storage_disk")
     public static final StorageDiskItem SIXTEEN_K_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":64k_storage_disk")
+    @ObjectHolder("64k_storage_disk")
     public static final StorageDiskItem SIXTY_FOUR_K_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":creative_storage_disk")
+    @ObjectHolder("creative_storage_disk")
     public static final StorageDiskItem CREATIVE_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":64k_fluid_storage_part")
+    @ObjectHolder("64k_fluid_storage_part")
     public static final FluidStoragePartItem SIXTY_FOUR_K_FLUID_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":256k_fluid_storage_part")
+    @ObjectHolder("256k_fluid_storage_part")
     public static final FluidStoragePartItem TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":1024k_fluid_storage_part")
+    @ObjectHolder("1024k_fluid_storage_part")
     public static final FluidStoragePartItem THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":4096k_fluid_storage_part")
+    @ObjectHolder("4096k_fluid_storage_part")
     public static final FluidStoragePartItem FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_PART = null;
-    @ObjectHolder(RS.ID + ":64k_fluid_storage_disk")
+    @ObjectHolder("64k_fluid_storage_disk")
     public static final FluidStorageDiskItem SIXTY_FOUR_K_FLUID_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":256k_fluid_storage_disk")
+    @ObjectHolder("256k_fluid_storage_disk")
     public static final FluidStorageDiskItem TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":1024k_fluid_storage_disk")
+    @ObjectHolder("1024k_fluid_storage_disk")
     public static final FluidStorageDiskItem THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":4096k_fluid_storage_disk")
+    @ObjectHolder("4096k_fluid_storage_disk")
     public static final FluidStorageDiskItem FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":creative_fluid_storage_disk")
+    @ObjectHolder("creative_fluid_storage_disk")
     public static final FluidStorageDiskItem CREATIVE_FLUID_STORAGE_DISK = null;
-    @ObjectHolder(RS.ID + ":portable_grid")
+    @ObjectHolder("portable_grid")
     public static final PortableGridBlockItem PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":creative_portable_grid")
+    @ObjectHolder("creative_portable_grid")
     public static final PortableGridBlockItem CREATIVE_PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":wireless_crafting_monitor")
+    @ObjectHolder("wireless_crafting_monitor")
     public static final WirelessCraftingMonitorItem WIRELESS_CRAFTING_MONITOR = null;
-    @ObjectHolder(RS.ID + ":creative_wireless_crafting_monitor")
+    @ObjectHolder("creative_wireless_crafting_monitor")
     public static final WirelessCraftingMonitorItem CREATIVE_WIRELESS_CRAFTING_MONITOR = null;
 }

src/main/java/com/refinedmods/refinedstorage/RSTiles.java

@@ -7,81 +7,82 @@ import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraftforge.registries.ObjectHolder;
 
+@ObjectHolder(RS.ID)
 public final class RSTiles {
-    @ObjectHolder(RS.ID + ":controller")
+    @ObjectHolder("controller")
     public static final TileEntityType<ControllerTile> CONTROLLER = null;
-    @ObjectHolder(RS.ID + ":creative_controller")
+    @ObjectHolder("creative_controller")
     public static final TileEntityType<ControllerTile> CREATIVE_CONTROLLER = null;
-    @ObjectHolder(RS.ID + ":detector")
+    @ObjectHolder("detector")
     public static final TileEntityType<DetectorTile> DETECTOR = null;
-    @ObjectHolder(RS.ID + ":disk_drive")
+    @ObjectHolder("disk_drive")
     public static final TileEntityType<DiskDriveTile> DISK_DRIVE = null;
-    @ObjectHolder(RS.ID + ":exporter")
+    @ObjectHolder("exporter")
     public static final TileEntityType<ExporterTile> EXPORTER = null;
-    @ObjectHolder(RS.ID + ":external_storage")
+    @ObjectHolder("external_storage")
     public static final TileEntityType<ExternalStorageTile> EXTERNAL_STORAGE = null;
-    @ObjectHolder(RS.ID + ":grid")
+    @ObjectHolder("grid")
     public static final TileEntityType<GridTile> GRID = null;
-    @ObjectHolder(RS.ID + ":crafting_grid")
+    @ObjectHolder("crafting_grid")
     public static final TileEntityType<GridTile> CRAFTING_GRID = null;
-    @ObjectHolder(RS.ID + ":pattern_grid")
+    @ObjectHolder("pattern_grid")
     public static final TileEntityType<GridTile> PATTERN_GRID = null;
-    @ObjectHolder(RS.ID + ":fluid_grid")
+    @ObjectHolder("fluid_grid")
     public static final TileEntityType<GridTile> FLUID_GRID = null;
-    @ObjectHolder(RS.ID + ":importer")
+    @ObjectHolder("importer")
     public static final TileEntityType<ImporterTile> IMPORTER = null;
-    @ObjectHolder(RS.ID + ":network_transmitter")
+    @ObjectHolder("network_transmitter")
     public static final TileEntityType<NetworkTransmitterTile> NETWORK_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":network_receiver")
+    @ObjectHolder("network_receiver")
     public static final TileEntityType<NetworkReceiverTile> NETWORK_RECEIVER = null;
-    @ObjectHolder(RS.ID + ":relay")
+    @ObjectHolder("relay")
     public static final TileEntityType<RelayTile> RELAY = null;
-    @ObjectHolder(RS.ID + ":cable")
+    @ObjectHolder("cable")
     public static final TileEntityType<CableTile> CABLE = null;
-    @ObjectHolder(RS.ID + ":1k_storage_block")
+    @ObjectHolder("1k_storage_block")
     public static final TileEntityType<StorageTile> ONE_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":4k_storage_block")
+    @ObjectHolder("4k_storage_block")
     public static final TileEntityType<StorageTile> FOUR_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":16k_storage_block")
+    @ObjectHolder("16k_storage_block")
     public static final TileEntityType<StorageTile> SIXTEEN_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":64k_storage_block")
+    @ObjectHolder("64k_storage_block")
     public static final TileEntityType<StorageTile> SIXTY_FOUR_K_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":creative_storage_block")
+    @ObjectHolder("creative_storage_block")
     public static final TileEntityType<StorageTile> CREATIVE_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":64k_fluid_storage_block")
+    @ObjectHolder("64k_fluid_storage_block")
     public static final TileEntityType<FluidStorageTile> SIXTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":256k_fluid_storage_block")
+    @ObjectHolder("256k_fluid_storage_block")
     public static final TileEntityType<FluidStorageTile> TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":1024k_fluid_storage_block")
+    @ObjectHolder("1024k_fluid_storage_block")
     public static final TileEntityType<FluidStorageTile> THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":4096k_fluid_storage_block")
+    @ObjectHolder("4096k_fluid_storage_block")
     public static final TileEntityType<FluidStorageTile> FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":creative_fluid_storage_block")
+    @ObjectHolder("creative_fluid_storage_block")
     public static final TileEntityType<FluidStorageTile> CREATIVE_FLUID_STORAGE_BLOCK = null;
-    @ObjectHolder(RS.ID + ":security_manager")
+    @ObjectHolder("security_manager")
     public static final TileEntityType<SecurityManagerTile> SECURITY_MANAGER = null;
-    @ObjectHolder(RS.ID + ":interface")
+    @ObjectHolder("interface")
     public static final TileEntityType<InterfaceTile> INTERFACE = null;
-    @ObjectHolder(RS.ID + ":fluid_interface")
+    @ObjectHolder("fluid_interface")
     public static final TileEntityType<FluidInterfaceTile> FLUID_INTERFACE = null;
-    @ObjectHolder(RS.ID + ":wireless_transmitter")
+    @ObjectHolder("wireless_transmitter")
     public static final TileEntityType<WirelessTransmitterTile> WIRELESS_TRANSMITTER = null;
-    @ObjectHolder(RS.ID + ":storage_monitor")
+    @ObjectHolder("storage_monitor")
     public static final TileEntityType<StorageMonitorTile> STORAGE_MONITOR = null;
-    @ObjectHolder(RS.ID + ":constructor")
+    @ObjectHolder("constructor")
     public static final TileEntityType<ConstructorTile> CONSTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":destructor")
+    @ObjectHolder("destructor")
     public static final TileEntityType<DestructorTile> DESTRUCTOR = null;
-    @ObjectHolder(RS.ID + ":disk_manipulator")
+    @ObjectHolder("disk_manipulator")
     public static final TileEntityType<DiskManipulatorTile> DISK_MANIPULATOR = null;
-    @ObjectHolder(RS.ID + ":portable_grid")
+    @ObjectHolder("portable_grid")
     public static final TileEntityType<PortableGridTile> PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":creative_portable_grid")
+    @ObjectHolder("creative_portable_grid")
     public static final TileEntityType<PortableGridTile> CREATIVE_PORTABLE_GRID = null;
-    @ObjectHolder(RS.ID + ":crafter")
+    @ObjectHolder("crafter")
     public static final TileEntityType<CrafterTile> CRAFTER = null;
-    @ObjectHolder(RS.ID + ":crafter_manager")
+    @ObjectHolder("crafter_manager")
     public static final TileEntityType<CrafterManagerTile> CRAFTER_MANAGER = null;
-    @ObjectHolder(RS.ID + ":crafting_monitor")
+    @ObjectHolder("crafting_monitor")
     public static final TileEntityType<CraftingMonitorTile> CRAFTING_MONITOR = null;
 }