Merge pull request #724 from refinedmods/fix/NO-ISSUE/remove-block-of…

…-quartz

fix: move quartz enriched iron and copper blocks to addon

CHANGELOG.md

@@ -18,6 +18,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The Autocrafting Monitor now has a sidebar with all tasks instead of using tabs.
 -   The auto-selected search box mode is now a global option used in the Autocrafter Manager as well.
 
+### Removed
+
+-   Block of Quartz Enriched Iron (has been moved to addon mod)
+-   Block of Quartz Enriched Copper (has been moved to addon mod)
+
 ## [2.0.0-milestone.4.9] - 2024-11-01
 
 ### Added

refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java

@@ -300,10 +300,6 @@ private void registerPermissions() {
 
     protected final void registerBlocks(final RegistryCallback<Block> callback,
                                         final BlockEntityProviders blockEntityProviders) {
-        Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(
-            ContentIds.QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new));
-        Blocks.INSTANCE.setQuartzEnrichedCopperBlock(
-            callback.register(ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new));
         Blocks.INSTANCE.setDiskDrive(callback.register(
             ContentIds.DISK_DRIVE,
             () -> new DiskDriveBlock(blockEntityProviders.diskDrive())
@@ -385,14 +381,6 @@ protected final void registerItems(final RegistryCallback<Item> callback) {
     private void registerSimpleItems(final RegistryCallback<Item> callback) {
         Items.INSTANCE.setQuartzEnrichedIron(callback.register(ContentIds.QUARTZ_ENRICHED_IRON, SimpleItem::new));
         Items.INSTANCE.setQuartzEnrichedCopper(callback.register(ContentIds.QUARTZ_ENRICHED_COPPER, SimpleItem::new));
-        callback.register(
-            ContentIds.QUARTZ_ENRICHED_IRON_BLOCK,
-            () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock())
-        );
-        callback.register(
-            ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK,
-            () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock())
-        );
         Items.INSTANCE.setSilicon(callback.register(ContentIds.SILICON, SimpleItem::new));
         Items.INSTANCE.setProcessorBinding(callback.register(ContentIds.PROCESSOR_BINDING, SimpleItem::new));
         callback.register(ContentIds.DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem());

refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java

@@ -166,10 +166,6 @@ public final class Blocks {
         COLOR
     );
 
-    @Nullable
-    private Supplier<SimpleBlock> quartzEnrichedIronBlock;
-    @Nullable
-    private Supplier<SimpleBlock> quartzEnrichedCopperBlock;
     @Nullable
     private Supplier<DiskDriveBlock> diskDrive;
     @Nullable
@@ -205,14 +201,6 @@ public BlockColorMap<CableBlock, BaseBlockItem> getCable() {
         return requireNonNull(cable);
     }
 
-    public SimpleBlock getQuartzEnrichedIronBlock() {
-        return requireNonNull(quartzEnrichedIronBlock).get();
-    }
-
-    public SimpleBlock getQuartzEnrichedCopperBlock() {
-        return requireNonNull(quartzEnrichedCopperBlock).get();
-    }
-
     public DiskDriveBlock getDiskDrive() {
         return requireNonNull(diskDrive).get();
     }
@@ -243,14 +231,6 @@ CreativeControllerBlockItem> getCreativeController() {
         return creativeController;
     }
 
-    public void setQuartzEnrichedIronBlock(final Supplier<SimpleBlock> quartzEnrichedIronBlockSupplier) {
-        this.quartzEnrichedIronBlock = quartzEnrichedIronBlockSupplier;
-    }
-
-    public void setQuartzEnrichedCopperBlock(final Supplier<SimpleBlock> quartzEnrichedCopperBlockSupplier) {
-        this.quartzEnrichedCopperBlock = quartzEnrichedCopperBlockSupplier;
-    }
-
     public void setDiskDrive(final Supplier<DiskDriveBlock> diskDriveSupplier) {
         this.diskDrive = diskDriveSupplier;
     }

refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java

@@ -14,10 +14,6 @@ public final class ContentIds {
     public static final ResourceLocation DISK_DRIVE = createIdentifier("disk_drive");
     public static final ResourceLocation MACHINE_CASING = createIdentifier("machine_casing");
     public static final ResourceLocation CABLE = createIdentifier("cable");
-    public static final ResourceLocation QUARTZ_ENRICHED_IRON_BLOCK = createIdentifier("quartz_enriched_iron_block");
-    public static final ResourceLocation QUARTZ_ENRICHED_COPPER_BLOCK = createIdentifier(
-        "quartz_enriched_copper_block"
-    );
     public static final ResourceLocation QUARTZ_ENRICHED_IRON = createIdentifier("quartz_enriched_iron");
     public static final ResourceLocation QUARTZ_ENRICHED_COPPER = createIdentifier("quartz_enriched_copper");
     public static final ResourceLocation SILICON = createIdentifier("silicon");

refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java

@@ -50,8 +50,6 @@ private static void appendBlocks(final Consumer<ItemStack> consumer) {
             Blocks.INSTANCE.getFluidStorageBlock(variant)
         ));
         itemConsumer.accept(Blocks.INSTANCE.getMachineCasing());
-        itemConsumer.accept(Blocks.INSTANCE.getQuartzEnrichedIronBlock());
-        itemConsumer.accept(Blocks.INSTANCE.getQuartzEnrichedCopperBlock());
         itemConsumer.accept(Blocks.INSTANCE.getStorageMonitor());
         Items.INSTANCE.getNetworkTransmitters().stream().map(Supplier::get).forEach(itemConsumer);
         Items.INSTANCE.getNetworkReceivers().stream().map(Supplier::get).forEach(itemConsumer);

refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json

@@ -1,8 +1,6 @@
 {
   "mod.refinedstorage": "Refined Storage",
   "block.refinedstorage.cable": "Cable",
-  "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron",
-  "block.refinedstorage.quartz_enriched_copper_block": "Block of Quartz Enriched Copper",
   "block.refinedstorage.disk_drive": "Disk Drive",
   "block.refinedstorage.machine_casing": "Machine Casing",
   "block.refinedstorage.grid": "Grid",