Merge pull request #586 from refinedmods/feat/GH-368/vanilla-materials

Quartz Enriched Copper

CHANGELOG.md

@@ -11,6 +11,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 -   Ported to Minecraft 1.21.
 -   More help information for items.
+-   Quartz Enriched Copper, used to craft cables.
+-   Block of Quartz Enriched Copper
 
 ### Fixed
 

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java

@@ -185,6 +185,8 @@
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_TRANSMITTER;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PROCESSOR_BINDING;
+import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER;
+import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.REGULATOR_UPGRADE;
@@ -323,6 +325,7 @@ protected final void registerBlocks(
         final BiFunction<BlockPos, BlockState, AbstractDiskInterfaceBlockEntity> diskInterfaceBlockEntityFactory
     ) {
         Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new));
+        Blocks.INSTANCE.setQuartzEnrichedCopperBlock(callback.register(QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new));
         Blocks.INSTANCE.setDiskDrive(
             callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory))
         );
@@ -393,10 +396,15 @@ protected final void registerItems(final RegistryCallback<Item> callback) {
 
     private void registerSimpleItems(final RegistryCallback<Item> callback) {
         Items.INSTANCE.setQuartzEnrichedIron(callback.register(QUARTZ_ENRICHED_IRON, SimpleItem::new));
+        Items.INSTANCE.setQuartzEnrichedCopper(callback.register(QUARTZ_ENRICHED_COPPER, SimpleItem::new));
         callback.register(
             QUARTZ_ENRICHED_IRON_BLOCK,
             () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock())
         );
+        callback.register(
+            QUARTZ_ENRICHED_COPPER_BLOCK,
+            () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock())
+        );
         Items.INSTANCE.setSilicon(callback.register(SILICON, SimpleItem::new));
         Items.INSTANCE.setProcessorBinding(callback.register(PROCESSOR_BINDING, SimpleItem::new));
         callback.register(DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem());

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java

@@ -162,6 +162,8 @@ public final class Blocks {
     @Nullable
     private Supplier<SimpleBlock> quartzEnrichedIronBlock;
     @Nullable
+    private Supplier<SimpleBlock> quartzEnrichedCopperBlock;
+    @Nullable
     private Supplier<DiskDriveBlock> diskDrive;
     @Nullable
     private Supplier<SimpleBlock> machineCasing;
@@ -189,6 +191,10 @@ public SimpleBlock getQuartzEnrichedIronBlock() {
         return requireNonNull(quartzEnrichedIronBlock).get();
     }
 
+    public SimpleBlock getQuartzEnrichedCopperBlock() {
+        return requireNonNull(quartzEnrichedCopperBlock).get();
+    }
+
     public DiskDriveBlock getDiskDrive() {
         return requireNonNull(diskDrive).get();
     }
@@ -219,6 +225,10 @@ public void setQuartzEnrichedIronBlock(final Supplier<SimpleBlock> quartzEnriche
         this.quartzEnrichedIronBlock = quartzEnrichedIronBlockSupplier;
     }
 
+    public void setQuartzEnrichedCopperBlock(final Supplier<SimpleBlock> quartzEnrichedCopperBlockSupplier) {
+        this.quartzEnrichedCopperBlock = quartzEnrichedCopperBlockSupplier;
+    }
+
     public void setDiskDrive(final Supplier<DiskDriveBlock> diskDriveSupplier) {
         this.diskDrive = diskDriveSupplier;
     }

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java

@@ -13,7 +13,11 @@ public final class ContentIds {
     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");
     public static final ResourceLocation PROCESSOR_BINDING = createIdentifier("processor_binding");
     public static final ResourceLocation WRENCH = createIdentifier("wrench");

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java

@@ -50,6 +50,7 @@ private static void appendBlocks(final Consumer<ItemStack> consumer) {
         ));
         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);
@@ -65,6 +66,7 @@ private static void appendBlockColors(final Consumer<ItemStack> consumer, final
     private static void appendItems(final Consumer<ItemStack> consumer) {
         final Consumer<ItemLike> itemConsumer = item -> consumer.accept(new ItemStack(item));
         itemConsumer.accept(Items.INSTANCE.getQuartzEnrichedIron());
+        itemConsumer.accept(Items.INSTANCE.getQuartzEnrichedCopper());
         itemConsumer.accept(Items.INSTANCE.getSilicon());
         itemConsumer.accept(Items.INSTANCE.getProcessorBinding());
         itemConsumer.accept(Items.INSTANCE.getWrench());

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java

@@ -53,6 +53,8 @@ public final class Items {
     @Nullable
     private Supplier<Item> quartzEnrichedIron;
     @Nullable
+    private Supplier<Item> quartzEnrichedCopper;
+    @Nullable
     private Supplier<Item> silicon;
     @Nullable
     private Supplier<Item> processorBinding;
@@ -145,6 +147,14 @@ public Item getQuartzEnrichedIron() {
         return requireNonNull(quartzEnrichedIron).get();
     }
 
+    public void setQuartzEnrichedCopper(final Supplier<Item> supplier) {
+        this.quartzEnrichedCopper = supplier;
+    }
+
+    public Item getQuartzEnrichedCopper() {
+        return requireNonNull(quartzEnrichedCopper).get();
+    }
+
     public void setSilicon(final Supplier<Item> supplier) {
         this.silicon = supplier;
     }

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java → refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java

@@ -9,19 +9,17 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
 
-public class ControllerModelPredicateProvider implements ClampedItemPropertyFunction {
+public class ControllerItemPropertyFunction implements ClampedItemPropertyFunction {
     @Override
     public float unclampedCall(final ItemStack stack,
                                @Nullable final ClientLevel level,
                                @Nullable final LivingEntity entity,
                                final int seed) {
-        return PlatformApi.INSTANCE.getEnergyStorage(stack)
-            .map(energyStorage -> {
-                if (energyStorage.getStored() == 0) {
-                    return 1F;
-                }
-                return (float) energyStorage.getStored() / (float) energyStorage.getCapacity();
-            })
-            .orElse(1F);
+        return PlatformApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> {
+            if (energyStorage.getStored() == 0) {
+                return 1F;
+            }
+            return (float) energyStorage.getStored() / (float) energyStorage.getCapacity();
+        }).orElse(1F);
     }
 }

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "refinedstorage2:block/quartz_enriched_copper_block"
+    }
+  }
+}

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json

@@ -2,6 +2,7 @@
   "mod.refinedstorage2": "Refined Storage 2",
   "block.refinedstorage2.cable": "Cable",
   "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron",
+  "block.refinedstorage2.quartz_enriched_copper_block": "Block of Quartz Enriched Copper",
   "block.refinedstorage2.disk_drive": "Disk Drive",
   "block.refinedstorage2.machine_casing": "Machine Casing",
   "block.refinedstorage2.grid": "Grid",
@@ -178,6 +179,7 @@
   "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.",
   "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.",
   "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron",
+  "item.refinedstorage2.quartz_enriched_copper": "Quartz Enriched Copper",
   "item.refinedstorage2.processor_binding": "Processor Binding",
   "item.refinedstorage2.silicon": "Silicon",
   "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor",

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "refinedstorage2:block/quartz_enriched_copper_block"
+  }
+}

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage2:item/quartz_enriched_copper"
+  }
+}

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "refinedstorage2:block/quartz_enriched_copper_block"
+}

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json

@@ -17,9 +17,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "refinedstorage2:storage_monitor"
-            ]
+            "items": "refinedstorage2:storage_monitor"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:relays"
+            "items": "#refinedstorage2:relays"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:cables"
+            "items": "#refinedstorage2:cables"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:constructors"
+            "items": "#refinedstorage2:constructors"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:destructors"
+            "items": "#refinedstorage2:destructors"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:detectors"
+            "items": "#refinedstorage2:detectors"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json

@@ -17,9 +17,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "refinedstorage2:disk_drive"
-            ]
+            "items": "refinedstorage2:disk_drive"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:exporters"
+            "items": "#refinedstorage2:exporters"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:importers"
+            "items": "#refinedstorage2:importers"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json

@@ -17,9 +17,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "refinedstorage2:interface"
-            ]
+            "items": "refinedstorage2:interface"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:disk_interfaces"
+            "items": "#refinedstorage2:disk_interfaces"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json

@@ -17,10 +17,10 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:network_transmitters"
+            "items": "#refinedstorage2:network_transmitters"
           },
           {
-            "tag": "refinedstorage2:network_receivers"
+            "items": "#refinedstorage2:network_receivers"
           },
           {
             "items": [

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json

@@ -17,9 +17,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "refinedstorage2:portable_grid"
-            ]
+            "items": "refinedstorage2:portable_grid"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:controllers"
+            "items": "#refinedstorage2:controllers"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:security_managers"
+            "items": "#refinedstorage2:security_managers"
           },
           {
             "items": [

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:external_storages"
+            "items": "#refinedstorage2:external_storages"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:fluid_storage_disks"
+            "items": "#refinedstorage2:fluid_storage_disks"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:storage_disks"
+            "items": "#refinedstorage2:storage_disks"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json

@@ -17,9 +17,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "refinedstorage2:upgrade"
-            ]
+            "items": "refinedstorage2:upgrade"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:crafting_grids"
+            "items": "#refinedstorage2:crafting_grids"
           }
         ]
       }

refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json

@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "refinedstorage2:grids"
+            "items": "#refinedstorage2:grids"
           }
         ]
       }