From e5f36974dd0f4625ad670419b1f828b8e762363a Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:12:50 +1100 Subject: [PATCH] Hide Higher Tier Muffler Hatches (#1065) [FEATURE] [DETAILS] details = [ "Higher Tier Muffler Hatches have No Uses, Especially Since Ashes Cannot be Extracted via Automation", "Existing Higher Tier Hatches Will Not Disappear, Recycling Recipes for Them Still Exist", ] [DETAILS] --- .../expert/betterquesting/DefaultQuests.json | 2 +- .../normal/betterquesting/DefaultQuests.json | 2 +- overrides/config/betterquesting/DefaultQuests.json | 2 +- .../config/betterquesting/saved_quests/ExpertQuests.json | 2 +- overrides/config/nomilabs.cfg | 1 + .../postInit/Post-Initial/Main/Mod-Specific/jei.groovy | 9 +++++++++ overrides/resources/gregtech/lang/en_us.lang | 1 + tools/storage/savedQBPorter.json | 4 ++++ 8 files changed, 19 insertions(+), 4 deletions(-) diff --git a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json index ce64c62..34d1a8d 100644 --- a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json +++ b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json @@ -48036,7 +48036,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§1IV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, and you can\u0027t extract it by automation, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6IV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", "globalshare:1": 0, "icon:10": { "Count:3": 1, diff --git a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json index 9beb83d..70a5bec 100644 --- a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json +++ b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json @@ -56499,7 +56499,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, and you can\u0027t extract it by automation, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", "globalshare:1": 0, "icon:10": { "Count:3": 1, diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 9beb83d..70a5bec 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -56499,7 +56499,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, and you can\u0027t extract it by automation, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", "globalshare:1": 0, "icon:10": { "Count:3": 1, diff --git a/overrides/config/betterquesting/saved_quests/ExpertQuests.json b/overrides/config/betterquesting/saved_quests/ExpertQuests.json index ce64c62..34d1a8d 100644 --- a/overrides/config/betterquesting/saved_quests/ExpertQuests.json +++ b/overrides/config/betterquesting/saved_quests/ExpertQuests.json @@ -48036,7 +48036,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§1IV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, and you can\u0027t extract it by automation, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch.\n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that all start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6IV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it. Note that the Automatic Filtration Maintenance Hatch does not work for Sterile Cleanroom recipes.", "globalshare:1": 0, "icon:10": { "Count:3": 1, diff --git a/overrides/config/nomilabs.cfg b/overrides/config/nomilabs.cfg index 2554c56..97e15f5 100755 --- a/overrides/config/nomilabs.cfg +++ b/overrides/config/nomilabs.cfg @@ -53,6 +53,7 @@ advanced { gregtech/api/recipes/recipeproperties/TotalComputationProperty@drawInfo@(Lnet/minecraft/client/Minecraft;IIILjava/lang/Object;)V gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest@getParticleTexture@()Lorg/apache/commons/lang3/tuple/Pair; gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank@getParticleTexture@()Lorg/apache/commons/lang3/tuple/Pair; + gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockPart@getParticleTexture@()Lorg/apache/commons/lang3/tuple/Pair; > # Whether to disable the Narrator. diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/jei.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/jei.groovy index 501954a..1902e16 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/jei.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/jei.groovy @@ -1,7 +1,9 @@ import com.nomiceu.nomilabs.util.LabsModeHelper +import gregtech.common.metatileentities.MetaTileEntities import net.minecraft.item.ItemStack import static com.nomiceu.nomilabs.groovy.GroovyHelpers.JEIHelpers.* +import static gregtech.api.GTValues.* /* Item Removals */ @@ -27,6 +29,13 @@ if (LabsModeHelper.expert) { mods.jei.ingredient.removeAndHide(item('nomilabs:impossiblerealmdata')) } +// GregTech +// Higher Tier Muffler Hatches +for (var tier : [MV, HV, EV, IV, LuV, ZPM, UV]) { + mods.jei.ingredient.removeAndHide(MetaTileEntities.MUFFLER_HATCH[tier].getStackForm()) +} + + // Better Questing List lootBoxes = [ item('bq_standard:loot_chest'), diff --git a/overrides/resources/gregtech/lang/en_us.lang b/overrides/resources/gregtech/lang/en_us.lang index 2ac3224..62fa861 100644 --- a/overrides/resources/gregtech/lang/en_us.lang +++ b/overrides/resources/gregtech/lang/en_us.lang @@ -1 +1,2 @@ gregtech.material.rhodium_plated_palladium=Rhodium Plated Lumium-Palladium +gregtech.machine.muffler_hatch.lv.name=Muffler Hatch diff --git a/tools/storage/savedQBPorter.json b/tools/storage/savedQBPorter.json index 24df50d..a4ff68d 100644 --- a/tools/storage/savedQBPorter.json +++ b/tools/storage/savedQBPorter.json @@ -544,6 +544,10 @@ "normal": 880, "expert": 880 }, + { + "normal": 893, + "expert": 893 + }, { "normal": 895, "expert": 895