Add support for muffling upgrades to Resistive Heaters (mekanism/Meka…

…nism-Feature-Requests#634)
mekanism · Feb 28, 2024 · c8412f5 · c8412f5
1 parent 812e145
commit c8412f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-20T18:43:25.8754045	Loot Tables
+// 1.20.4	2024-02-28T13:59:07.0276977	Loot Tables
 b4a05e7ba50da33988cfbf7827826c6dc5a141d9 data/mekanism/loot_tables/blocks/advanced_bin.json
 cd266e7b4a5bde833aa11e1caf17d86631197626 data/mekanism/loot_tables/blocks/advanced_chemical_tank.json
 6829ad29ae722d1ef741fc103dfd5704c1874a66 data/mekanism/loot_tables/blocks/advanced_combining_factory.json
@@ -140,7 +140,7 @@ e173588162075874da89da6450bf3111572a13c8 data/mekanism/loot_tables/blocks/qio_dr
 e622d5379b909f769c4c910c33cd27248aab5a3a data/mekanism/loot_tables/blocks/qio_redstone_adapter.json
 5f09276294e2367e32102c287f0e2a61facee062 data/mekanism/loot_tables/blocks/quantum_entangloporter.json
 a83942e741e98eec7bb60a34fc43be78b599a64e data/mekanism/loot_tables/blocks/radioactive_waste_barrel.json
-79ae3b9bd0f0c556b9bc6d5b3066c0d8b8ddda29 data/mekanism/loot_tables/blocks/resistive_heater.json
+3c2da914833207168dafcef0869a603f10e54c95 data/mekanism/loot_tables/blocks/resistive_heater.json
 354838cf33780c27e749c4f0e7828ed764db3375 data/mekanism/loot_tables/blocks/restrictive_transporter.json
 7adeb1b053faea5475d649b9bc42765db019674b data/mekanism/loot_tables/blocks/rotary_condensentrator.json
 eb9e9397a5bf4fab49ed838768feac8a8418aa93 data/mekanism/loot_tables/blocks/security_desk.json

diff --git a/src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/resistive_heater.json b/src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/resistive_heater.json
@@ -10,6 +10,9 @@
             {
               "function": "mekanism:copy_security"
             },
+            {
+              "function": "mekanism:copy_upgrades"
+            },
             {
               "function": "minecraft:copy_name",
               "source": "block_entity"

diff --git a/src/main/java/mekanism/common/registries/MekanismBlockTypes.java b/src/main/java/mekanism/common/registries/MekanismBlockTypes.java
@@ -418,10 +418,11 @@ private MekanismBlockTypes() {
           .createMachine(() -> MekanismTileEntityTypes.RESISTIVE_HEATER, MekanismLang.DESCRIPTION_RESISTIVE_HEATER)
           .withGui(() -> MekanismContainerTypes.RESISTIVE_HEATER)
           .withEnergyConfig(() -> RESISTIVE_HEATER_BASE_USAGE, null)
-          .without(AttributeComparator.class, AttributeUpgradeSupport.class)
+          .without(AttributeComparator.class)
           .withCustomShape(BlockShapes.RESISTIVE_HEATER)
           .withSound(MekanismSounds.RESISTIVE_HEATER)
           .withComputerSupport("resistiveHeater")
+          .replace(new AttributeUpgradeSupport(EnumSet.of(Upgrade.MUFFLING)))
           .replace(Attributes.ACTIVE_MELT_LIGHT)
           .build();
     // Seismic Vibrator