From ed72af80e34c31863025ce6c78cf3ec291febf39 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 24 Nov 2024 00:26:43 +0100 Subject: [PATCH] fix: move quartz enriched iron and copper blocks to addon --- CHANGELOG.md | 5 +++++ .../common/AbstractModInitializer.java | 12 ----------- .../refinedstorage/common/content/Blocks.java | 20 ------------------ .../common/content/ContentIds.java | 4 ---- .../common/content/CreativeModeTabItems.java | 2 -- .../quartz_enriched_copper_block.json | 7 ------ .../quartz_enriched_iron_block.json | 7 ------ .../assets/refinedstorage/lang/en_us.json | 2 -- .../block/quartz_enriched_copper_block.json | 6 ------ .../block/quartz_enriched_iron_block.json | 6 ------ .../item/quartz_enriched_copper_block.json | 3 --- .../item/quartz_enriched_iron_block.json | 3 --- .../block/quartz_enriched_copper_block.png | Bin 685 -> 0 bytes .../block/quartz_enriched_iron_block.png | Bin 1547 -> 0 bytes .../blocks/quartz_enriched_iron_block.json | 19 ----------------- .../recipe/quartz_enriched_copper_block.json | 16 -------------- .../quartz_enriched_copper_from_block.json | 12 ----------- .../recipe/quartz_enriched_iron_block.json | 16 -------------- .../quartz_enriched_iron_from_block.json | 12 ----------- 19 files changed, 5 insertions(+), 147 deletions(-) delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png delete mode 100644 refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png delete mode 100644 refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json delete mode 100644 refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json delete mode 100644 refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json delete mode 100644 refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json delete mode 100644 refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac22324d..1fb2ffec5 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java index 4e2233a1a..41566deb2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java @@ -300,10 +300,6 @@ private void registerPermissions() { protected final void registerBlocks(final RegistryCallback 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 callback) { private void registerSimpleItems(final RegistryCallback 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()); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java index e07b1276c..2b3bc9a50 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java @@ -166,10 +166,6 @@ public final class Blocks { COLOR ); - @Nullable - private Supplier quartzEnrichedIronBlock; - @Nullable - private Supplier quartzEnrichedCopperBlock; @Nullable private Supplier diskDrive; @Nullable @@ -205,14 +201,6 @@ public BlockColorMap 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 quartzEnrichedIronBlockSupplier) { - this.quartzEnrichedIronBlock = quartzEnrichedIronBlockSupplier; - } - - public void setQuartzEnrichedCopperBlock(final Supplier quartzEnrichedCopperBlockSupplier) { - this.quartzEnrichedCopperBlock = quartzEnrichedCopperBlockSupplier; - } - public void setDiskDrive(final Supplier diskDriveSupplier) { this.diskDrive = diskDriveSupplier; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java index 1c3d9cec2..1350d084e 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java +++ b/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"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java index ae1f7c489..d05ebea7d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java @@ -50,8 +50,6 @@ private static void appendBlocks(final Consumer 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); diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json deleted file mode 100644 index 79ec69bbc..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage:block/quartz_enriched_copper_block" - } - } -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json deleted file mode 100644 index b27fd75da..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage:block/quartz_enriched_iron_block" - } - } -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json index da5e49fda..a3d016f66 100644 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/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", diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json deleted file mode 100644 index 956b8f9a4..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage:block/quartz_enriched_copper_block" - } -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json deleted file mode 100644 index 64fd28d16..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage:block/quartz_enriched_iron_block" - } -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json deleted file mode 100644 index 7fa5d899a..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/quartz_enriched_copper_block" -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json deleted file mode 100644 index 5737f1a5c..000000000 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/quartz_enriched_iron_block" -} diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png deleted file mode 100644 index fb59478b5152335567163dbc44816dc724b13aa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmV;e0#f~nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zyedK~y+T9a6h) z6fqPXzs8=~Wj7EKL6A@=kSHi9_y{QZ4SK$WhJub7J^>^?fr^MCh@eE9ea?($#&2^5 z7nW?_dtTS%{i}zZvy@U%6ha8fsH#;8$y!VPFV4Al9{0hA>4>`5Z{LY};Z4tFE#^nq zUAL!PCU5-E`av@;ST*;<;rpi#l#l||7hk`O`&G_4TI1TCT%7uTM|erNkjrCd^{;QA z$K5K%NR?80{rBwIi|X!!B841Wkz;UOefk*Wxro8^Le^)`Uq)vbr4*=8Cg#g>c0{N^ zP4Lbh*0$L~UXf`EHb*a)C$y|lOr??peT@6Dr5zmQgAUP zidRCg2T+@KLkR~3RN)4WZM#Je5Y1tWhKWJzo|Os=IE1lv`XCp_h$xsbrxc9tZZ4sg zS9OsyJW=n%uwN0%;h0y839Q*rQL<7@GGZW%>D3?jLGKL7hgiD2PKQszaa85V_wbeWD6m-fpMIXH}x&Z`@F@>QI9@%Bn ztf^372T5`+*bxwFeoV^}xsC098XUAi*2G{nCN}P_gB>7}t15ZludkSt?vk&Xbi?Qn_1}xVdjvk!@(l)y=_E2aJx2A2z zb{o9|cDK1cIe$98cOU5F5cAS_pp=loLCOy!S{>~3h3++GEy*tSUl}j8ma+={ zEbL+>p+KaSeB{m!gO%95+EK_*Q9~{jIVCAnzD1x5d@L{9Ehb1g(J~xEqRAP_D2nK? zbR0tvt1%6=5*Zjlq+=LvG#c+ zMGzb+lK&JOj+92FHr|S!H#~JX?$5fP4N-1pHhtc!sa@Upz{c$Bf41E?YqwNon6go2a9 za`E|C`p`L|V(@lD_JoqwnH7_67*uULw;9x`dHK6nFKg;)jvCynO5NJ~zRHwT-Ng+a zTCuwZ=ugsv