Merge branch '1.20.1' into bugfix

README.md

@@ -2,8 +2,8 @@
 <h1 align="center">GregTech CEu: Modern</h1>
 <p align="center">GregTech:CEu built on modern Minecraft versions for Forge(1.20.1) & NeoForge(1.21+).</p>
 <h1 align="center">
- <a href="https://www.curseforge.com/minecraft/mc-mods/gregtech-ce-unofficial"><img src="https://img.shields.io/badge/Available%20for-MC%201.20.1+%20-informational?style=for-the-badge" alt="Supported Versions"></a>
- <a href="https://github.com/GregTechCEu/GregTech/blob/master/LICENSE"><img src="https://img.shields.io/github/license/GregTechCEu/GregTech?style=for-the-badge" alt="License"></a>
+ <a href="https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern"><img src="https://img.shields.io/badge/Available%20for-MC%201.20.1+%20-informational?style=for-the-badge" alt="Supported Versions"></a>
+ <a href="https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/LICENSE"><img src="https://img.shields.io/github/license/GregTechCEu/GregTech?style=for-the-badge" alt="License"></a>
  <a href="https://discord.gg/bWSWuYvURP"><img src="https://img.shields.io/discord/701354865217110096?color=5464ec&label=Discord&style=for-the-badge" alt="Discord"></a>
  <br>
  <a href="https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern"><img src="https://cf.way2muchnoise.eu/890405.svg?badge_style=for_the_badge" alt="CurseForge"></a>
@@ -52,7 +52,7 @@ Additionally, the [Minecraft Development plugin](https://plugins.jetbrains.com/p
 - Some textures are originally from the **[ZedTech GTCEu Resourcepack](https://github.com/brachy84/zedtech-ceu)**, with some changes made by the community.
 - New material item textures by @TTFTCUTS and @Rosethorns.
 - Wooden Forms, World Accelerators, and the Extreme Combustion Engine are from the **[GregTech: New Horizons Modpack](https://www.curseforge.com/minecraft/modpacks/gt-new-horizons)**.
-- Primitive Water Pump is from the **[IMPACT: GREGTECH EDITION Modpack](https://gtimpact.space/)**.
+- Primitive Water Pump is from the **[IMPACT: GREGTECH EDITION Modpack](https://gt-impact.github.io/#/)**.
 - Ender Fluid Link Cover, Auto-Maintenance Hatch, Optical Fiber, and Data Bank Textures are from **[TecTech](https://github.com/Technus/TecTech)**.
 - Steam Grinder is from **[GregTech++](https://www.curseforge.com/minecraft/mc-mods/gregtech-gt-gtplusplus)**.
 - Certificate of Not Being a Noob Anymore is from **[Crops++](https://www.curseforge.com/minecraft/mc-mods/berries)**.

dependencies.gradle

@@ -57,8 +57,7 @@ dependencies {
  jarJar(forge.configuration)
 
  // Shimmer
- modCompileOnly(forge.shimmer.forge) { transitive = false }
- modCompileOnly("maven.modrinth:embeddium:0.3.19+mc1.20.1")
+ modImplementation("maven.modrinth:embeddium:0.3.31+mc1.20.1")
  modCompileOnly("maven.modrinth:oculus:1.20.1-1.7.0")
 
  // JAVD

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1131,6 +1131,8 @@
  "block.gtceu.stripped_rubber_log": "boꞀ ɹǝqqnᴚ pǝddıɹʇS",
  "block.gtceu.stripped_rubber_wood": "pooM ɹǝqqnᴚ pǝddıɹʇS",
  "block.gtceu.sturdy_machine_casing": "buısɐƆ ǝuıɥɔɐW Ǝ-SSH ʎpɹnʇS",
+ "block.gtceu.substation_capacitor.tooltip_empty": "uoıʇɐʇsqnS ɹǝʍoԀ ɹnoʎ uı ǝɔɐds buıןןıɟ ɹoℲㄥ§",
+ "block.gtceu.substation_capacitor.tooltip_filled": "∩Ǝ %dɟ§ :ʎʇıɔɐdɐƆ ʎbɹǝuƎɔ§",
  "block.gtceu.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS",
  "block.gtceu.tempered_glass": "ssɐן⅁ pǝɹǝdɯǝ⟘",
  "block.gtceu.the_end_marker": "puƎ ǝɥ⟘",
@@ -2220,8 +2222,11 @@
  "config.gtceu.option.allUniqueStoneTypes": "sǝdʎ⟘ǝuoʇSǝnbıu∩ןןɐ",
  "config.gtceu.option.animationTime": "ǝɯı⟘uoıʇɐɯıuɐ",
  "config.gtceu.option.armorHud": "pnHɹoɯɹɐ",
+ "config.gtceu.option.assemblyLineParticles": "sǝןɔıʇɹɐԀǝuıꞀʎןqɯǝssɐ",
+ "config.gtceu.option.baseBrightness": "ssǝuʇɥbıɹᗺǝsɐq",
  "config.gtceu.option.bedrockOreDistance": "ǝɔuɐʇsıᗡǝɹOʞɔoɹpǝq",
  "config.gtceu.option.bedrockOreDropTagPrefix": "xıɟǝɹԀbɐ⟘doɹᗡǝɹOʞɔoɹpǝq",
+ "config.gtceu.option.bloomStyle": "ǝןʎʇSɯooןq",
  "config.gtceu.option.bronzeBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺǝzuoɹq",
  "config.gtceu.option.bronzeBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺǝzuoɹq",
  "config.gtceu.option.casingsPerCraft": "ʇɟɐɹƆɹǝԀsbuısɐɔ",
@@ -2241,6 +2246,7 @@
  "config.gtceu.option.doesExplosionDamagesTerrain": "uıɐɹɹǝ⟘sǝbɐɯɐᗡuoısoןdxƎsǝop",
  "config.gtceu.option.dumpAssets": "sʇǝssⱯdɯnp",
  "config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp",
+ "config.gtceu.option.emissiveTexturesBloom": "ɯooןᗺsǝɹnʇxǝ⟘ǝʌıssıɯǝ",
  "config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
  "config.gtceu.option.enableCompass": "ssɐdɯoƆǝןqɐuǝ",
  "config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ",
@@ -2257,6 +2263,7 @@
  "config.gtceu.option.environmentalHazards": "spɹɐzɐHןɐʇuǝɯuoɹıʌuǝ",
  "config.gtceu.option.euToPlatformRatio": "oıʇɐᴚɯɹoɟʇɐןԀo⟘nǝ",
  "config.gtceu.option.flintAndSteelRequireSteel": "ןǝǝʇSǝɹınbǝᴚןǝǝʇSpuⱯʇuıןɟ",
+ "config.gtceu.option.fusionBloom": "ɯooןᗺuoısnɟ",
  "config.gtceu.option.gameplay": "ʎɐןdǝɯɐb",
  "config.gtceu.option.generateLowQualityGems": "sɯǝ⅁ʎʇıןɐnὉʍoꞀǝʇɐɹǝuǝb",
  "config.gtceu.option.ghostCircuit": "ʇınɔɹıƆʇsoɥb",
@@ -2276,10 +2283,13 @@
  "config.gtceu.option.harderRods": "spoᴚɹǝpɹɐɥ",
  "config.gtceu.option.harmlessActiveTransformers": "sɹǝɯɹoɟsuɐɹ⟘ǝʌıʇɔⱯssǝןɯɹɐɥ",
  "config.gtceu.option.hazardsEnabled": "pǝןqɐuƎspɹɐzɐɥ",
+ "config.gtceu.option.heatEffectBloom": "ɯooןᗺʇɔǝɟɟƎʇɐǝɥ",
  "config.gtceu.option.hideFacadesInJEI": "IƎſuIsǝpɐɔɐℲǝpıɥ",
  "config.gtceu.option.hideFilledCellsInJEI": "IƎſuIsןןǝƆpǝןןıℲǝpıɥ",
  "config.gtceu.option.hideOreProcessingDiagrams": "sɯɐɹbɐıᗡbuıssǝɔoɹԀǝɹOǝpıɥ",
+ "config.gtceu.option.highBrightnessThreshold": "pןoɥsǝɹɥ⟘ssǝuʇɥbıɹᗺɥbıɥ",
  "config.gtceu.option.highTierContent": "ʇuǝʇuoƆɹǝı⟘ɥbıɥ",
+ "config.gtceu.option.hookDepthTexture": "ǝɹnʇxǝ⟘ɥʇdǝᗡʞooɥ",
  "config.gtceu.option.hpLiquidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpınbıꞀdɥ",
  "config.gtceu.option.hpSolarBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺɹɐןoSdɥ",
  "config.gtceu.option.hpSolidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpıןoSdɥ",
@@ -2293,12 +2303,14 @@
  "config.gtceu.option.ldFluidPipeMinDistance": "ǝɔuɐʇsıᗡuıWǝdıԀpınןℲpן",
  "config.gtceu.option.ldItemPipeMinDistance": "ǝɔuɐʇsıᗡuıWǝdıԀɯǝʇIpן",
  "config.gtceu.option.liquidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpınbıן",
+ "config.gtceu.option.lowBrightnessThreshold": "pןoɥsǝɹɥ⟘ssǝuʇɥbıɹᗺʍoן",
  "config.gtceu.option.machineOwnerBreak": "ʞɐǝɹᗺɹǝuʍOǝuıɥɔɐɯ",
  "config.gtceu.option.machineOwnerGUI": "I∩⅁ɹǝuʍOǝuıɥɔɐɯ",
  "config.gtceu.option.machineSounds": "spunoSǝuıɥɔɐɯ",
  "config.gtceu.option.machines": "sǝuıɥɔɐɯ",
  "config.gtceu.option.machinesEmissiveTextures": "sǝɹnʇxǝ⟘ǝʌıssıɯƎsǝuıɥɔɐɯ",
  "config.gtceu.option.meHatchEnergyUsage": "ǝbɐs∩ʎbɹǝuƎɥɔʇɐHǝɯ",
+ "config.gtceu.option.nMips": "sdıWu",
  "config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu",
  "config.gtceu.option.nanoSaberBaseDamage": "ǝbɐɯɐᗡǝsɐᗺɹǝqɐSouɐu",
  "config.gtceu.option.nanoSaberDamageBoost": "ʇsooᗺǝbɐɯɐᗡɹǝqɐSouɐu",
@@ -2327,6 +2339,7 @@
  "config.gtceu.option.rngDamageElectricTools": "sןoo⟘ɔıɹʇɔǝןƎǝbɐɯɐᗡbuɹ",
  "config.gtceu.option.rubberTreeSpawnChance": "ǝɔuɐɥƆuʍɐdSǝǝɹ⟘ɹǝqqnɹ",
  "config.gtceu.option.sandOresFall": "ןןɐℲsǝɹOpuɐs",
+ "config.gtceu.option.shader": "ɹǝpɐɥs",
  "config.gtceu.option.showDimensionTier": "ɹǝı⟘uoısuǝɯıᗡʍoɥs",
  "config.gtceu.option.smallBoilers": "sɹǝןıoᗺןןɐɯs",
  "config.gtceu.option.solarBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺɹɐןos",
@@ -2337,6 +2350,8 @@
  "config.gtceu.option.steelBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺןǝǝʇs",
  "config.gtceu.option.steelBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺןǝǝʇs",
  "config.gtceu.option.steelSteamMultiblocks": "sʞɔoןqıʇןnWɯɐǝʇSןǝǝʇs",
+ "config.gtceu.option.step": "dǝʇs",
+ "config.gtceu.option.strength": "ɥʇbuǝɹʇs",
  "config.gtceu.option.titaniumBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺɯnıuɐʇıʇ",
  "config.gtceu.option.titaniumBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺɯnıuɐʇıʇ",
  "config.gtceu.option.toolCraftingSounds": "spunoSbuıʇɟɐɹƆןooʇ",
@@ -2346,6 +2361,7 @@
  "config.gtceu.option.tungstensteelBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺןǝǝʇsuǝʇsbunʇ",
  "config.gtceu.option.universalHazards": "spɹɐzɐHןɐsɹǝʌıun",
  "config.gtceu.option.updateIntervals": "sןɐʌɹǝʇuIǝʇɐpdn",
+ "config.gtceu.option.useShader": "ɹǝpɐɥSǝsn",
  "config.gtceu.option.useVBO": "OᗺΛǝsn",
  "config.gtceu.option.voltageTierAdvImpeller": "ɹǝןןǝdɯIʌpⱯɹǝı⟘ǝbɐʇןoʌ",
  "config.gtceu.option.voltageTierAdvNanoSuit": "ʇınSouɐNʌpⱯɹǝı⟘ǝbɐʇןoʌ",
@@ -5263,6 +5279,7 @@
  "material.gtceu.einsteinium": "ɯnıuıǝʇsuıƎ",
  "material.gtceu.electrotine": "ǝuıʇoɹʇɔǝןƎ",
  "material.gtceu.electrum": "ɯnɹʇɔǝןƎ",
+ "material.gtceu.elementium": "ɯnıʇuǝɯǝןƎ",
  "material.gtceu.emerald": "pןɐɹǝɯƎ",
  "material.gtceu.ender_air": "ɹıⱯ ɹǝpuƎ",
  "material.gtceu.ender_eye": "ǝʎƎ ɹǝpuƎ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1131,6 +1131,8 @@
  "block.gtceu.stripped_rubber_log": "Stripped Rubber Log",
  "block.gtceu.stripped_rubber_wood": "Stripped Rubber Wood",
  "block.gtceu.sturdy_machine_casing": "Sturdy HSS-E Machine Casing",
+ "block.gtceu.substation_capacitor.tooltip_empty": "§7For filling space in your Power Substation",
+ "block.gtceu.substation_capacitor.tooltip_filled": "§cEnergy Capacity: §f%d EU",
  "block.gtceu.superconducting_coil": "Superconducting Coil Block",
  "block.gtceu.tempered_glass": "Tempered Glass",
  "block.gtceu.the_end_marker": "The End",
@@ -2220,8 +2222,11 @@
  "config.gtceu.option.allUniqueStoneTypes": "allUniqueStoneTypes",
  "config.gtceu.option.animationTime": "animationTime",
  "config.gtceu.option.armorHud": "armorHud",
+ "config.gtceu.option.assemblyLineParticles": "assemblyLineParticles",
+ "config.gtceu.option.baseBrightness": "baseBrightness",
  "config.gtceu.option.bedrockOreDistance": "bedrockOreDistance",
  "config.gtceu.option.bedrockOreDropTagPrefix": "bedrockOreDropTagPrefix",
+ "config.gtceu.option.bloomStyle": "bloomStyle",
  "config.gtceu.option.bronzeBoilerHeatSpeed": "bronzeBoilerHeatSpeed",
  "config.gtceu.option.bronzeBoilerMaxTemperature": "bronzeBoilerMaxTemperature",
  "config.gtceu.option.casingsPerCraft": "casingsPerCraft",
@@ -2241,6 +2246,7 @@
  "config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain",
  "config.gtceu.option.dumpAssets": "dumpAssets",
  "config.gtceu.option.dumpRecipes": "dumpRecipes",
+ "config.gtceu.option.emissiveTexturesBloom": "emissiveTexturesBloom",
  "config.gtceu.option.enableCleanroom": "enableCleanroom",
  "config.gtceu.option.enableCompass": "enableCompass",
  "config.gtceu.option.enableMaintenance": "enableMaintenance",
@@ -2257,6 +2263,7 @@
  "config.gtceu.option.environmentalHazards": "environmentalHazards",
  "config.gtceu.option.euToPlatformRatio": "euToPlatformRatio",
  "config.gtceu.option.flintAndSteelRequireSteel": "flintAndSteelRequireSteel",
+ "config.gtceu.option.fusionBloom": "fusionBloom",
  "config.gtceu.option.gameplay": "gameplay",
  "config.gtceu.option.generateLowQualityGems": "generateLowQualityGems",
  "config.gtceu.option.ghostCircuit": "ghostCircuit",
@@ -2276,10 +2283,13 @@
  "config.gtceu.option.harderRods": "harderRods",
  "config.gtceu.option.harmlessActiveTransformers": "harmlessActiveTransformers",
  "config.gtceu.option.hazardsEnabled": "hazardsEnabled",
+ "config.gtceu.option.heatEffectBloom": "heatEffectBloom",
  "config.gtceu.option.hideFacadesInJEI": "hideFacadesInJEI",
  "config.gtceu.option.hideFilledCellsInJEI": "hideFilledCellsInJEI",
  "config.gtceu.option.hideOreProcessingDiagrams": "hideOreProcessingDiagrams",
+ "config.gtceu.option.highBrightnessThreshold": "highBrightnessThreshold",
  "config.gtceu.option.highTierContent": "highTierContent",
+ "config.gtceu.option.hookDepthTexture": "hookDepthTexture",
  "config.gtceu.option.hpLiquidBoilerBaseOutput": "hpLiquidBoilerBaseOutput",
  "config.gtceu.option.hpSolarBoilerBaseOutput": "hpSolarBoilerBaseOutput",
  "config.gtceu.option.hpSolidBoilerBaseOutput": "hpSolidBoilerBaseOutput",
@@ -2293,12 +2303,14 @@
  "config.gtceu.option.ldFluidPipeMinDistance": "ldFluidPipeMinDistance",
  "config.gtceu.option.ldItemPipeMinDistance": "ldItemPipeMinDistance",
  "config.gtceu.option.liquidBoilerBaseOutput": "liquidBoilerBaseOutput",
+ "config.gtceu.option.lowBrightnessThreshold": "lowBrightnessThreshold",
  "config.gtceu.option.machineOwnerBreak": "machineOwnerBreak",
  "config.gtceu.option.machineOwnerGUI": "machineOwnerGUI",
  "config.gtceu.option.machineSounds": "machineSounds",
  "config.gtceu.option.machines": "machines",
  "config.gtceu.option.machinesEmissiveTextures": "machinesEmissiveTextures",
  "config.gtceu.option.meHatchEnergyUsage": "meHatchEnergyUsage",
+ "config.gtceu.option.nMips": "nMips",
  "config.gtceu.option.nanoSaber": "nanoSaber",
  "config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage",
  "config.gtceu.option.nanoSaberDamageBoost": "nanoSaberDamageBoost",
@@ -2327,6 +2339,7 @@
  "config.gtceu.option.rngDamageElectricTools": "rngDamageElectricTools",
  "config.gtceu.option.rubberTreeSpawnChance": "rubberTreeSpawnChance",
  "config.gtceu.option.sandOresFall": "sandOresFall",
+ "config.gtceu.option.shader": "shader",
  "config.gtceu.option.showDimensionTier": "showDimensionTier",
  "config.gtceu.option.smallBoilers": "smallBoilers",
  "config.gtceu.option.solarBoilerBaseOutput": "solarBoilerBaseOutput",
@@ -2337,6 +2350,8 @@
  "config.gtceu.option.steelBoilerHeatSpeed": "steelBoilerHeatSpeed",
  "config.gtceu.option.steelBoilerMaxTemperature": "steelBoilerMaxTemperature",
  "config.gtceu.option.steelSteamMultiblocks": "steelSteamMultiblocks",
+ "config.gtceu.option.step": "step",
+ "config.gtceu.option.strength": "strength",
  "config.gtceu.option.titaniumBoilerHeatSpeed": "titaniumBoilerHeatSpeed",
  "config.gtceu.option.titaniumBoilerMaxTemperature": "titaniumBoilerMaxTemperature",
  "config.gtceu.option.toolCraftingSounds": "toolCraftingSounds",
@@ -2346,6 +2361,7 @@
  "config.gtceu.option.tungstensteelBoilerMaxTemperature": "tungstensteelBoilerMaxTemperature",
  "config.gtceu.option.universalHazards": "universalHazards",
  "config.gtceu.option.updateIntervals": "updateIntervals",
+ "config.gtceu.option.useShader": "useShader",
  "config.gtceu.option.useVBO": "useVBO",
  "config.gtceu.option.voltageTierAdvImpeller": "voltageTierAdvImpeller",
  "config.gtceu.option.voltageTierAdvNanoSuit": "voltageTierAdvNanoSuit",
@@ -5263,6 +5279,7 @@
  "material.gtceu.einsteinium": "Einsteinium",
  "material.gtceu.electrotine": "Electrotine",
  "material.gtceu.electrum": "Electrum",
+ "material.gtceu.elementium": "Elementium",
  "material.gtceu.emerald": "Emerald",
  "material.gtceu.ender_air": "Ender Air",
  "material.gtceu.ender_eye": "Ender Eye",

src/main/java/com/gregtechceu/gtceu/GTCEu.java

@@ -65,9 +65,8 @@ public static boolean isIrisOculusLoaded() {
  return LDLib.isModLoaded(GTValues.MODID_IRIS) || LDLib.isModLoaded(GTValues.MODID_OCULUS);
  }
 
- public static boolean isSodiumRubidiumEmbeddiumLoaded() {
- return LDLib.isModLoaded(GTValues.MODID_SODIUM) || LDLib.isModLoaded(GTValues.MODID_RUBIDIUM) ||
- LDLib.isModLoaded(GTValues.MODID_EMBEDDIUM);
+ public static boolean isEmbeddiumLoaded() {
+ return LDLib.isModLoaded(GTValues.MODID_EMBEDDIUM);
  }
 
  public static boolean isAE2Loaded() {
@@ -78,10 +77,6 @@ public static boolean isCuriosLoaded() {
  return LDLib.isModLoaded(GTValues.MODID_CURIOS);
  }
 
- public static boolean isShimmerLoaded() {
- return LDLib.isModLoaded(GTValues.MODID_SHIMMER);
- }
-
  public static boolean isJAVDLoaded() {
  return LDLib.isModLoaded(GTValues.MODID_JAVD);
  }

src/main/java/com/gregtechceu/gtceu/api/GTValues.java

@@ -42,12 +42,6 @@ public class GTValues {
  public static final int L = 144;
  public static final RandomSource RNG = RandomSource.createThreadSafe();
 
- /**
- * The Item WildCard Tag. Even shorter than the "-1" of the past
- */
-
- // public static final short W = OreDictionary.WILDCARD_VALUE;
-
  /** Current time on the Client. Will always be zero on the server. */
  public static long CLIENT_TIME = 0;
 
@@ -116,18 +110,14 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) {
  MODID_KUBEJS = "kubejs",
  MODID_IRIS = "iris",
  MODID_OCULUS = "oculus",
- MODID_SODIUM = "sodium",
- MODID_RUBIDIUM = "rubidium",
  MODID_EMBEDDIUM = "embeddium",
  MODID_CREATE = "create",
- MODID_REBORN_ENERGY = "team_reborn_energy",
- MODID_ALMOSTUNIFIED = "almostunified",
  MODID_CURIOS = "curios",
  MODID_AE2WTLIB = "ae2wtlib",
- MODID_SHIMMER = "shimmer",
  MODID_JAVD = "javd",
  MODID_FTBTEAMS = "ftbteams",
- MODID_ARGONAUTS = "argonauts";
+ MODID_ARGONAUTS = "argonauts",
+ MODID_OPTIFINE = "optifine";
 
  /**
  * Spray painting compat modids
@@ -226,11 +216,6 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) {
  "Ultra High Voltage", "Ultra Excessive Voltage", "Ultra Immense Voltage", "Ultra Extreme Voltage",
  "Overpowered Voltage", "Maximum Voltage" };
 
- /**
- * Used to tell if any high-tier machine (UHV+) was registered.
- */
- public static boolean HT = false;
-
  public static Supplier<Boolean> FOOLS = () -> {
  String[] yearMonthDay = LocalDate.now().toString().split("-");
  return yearMonthDay[1].equals("04") && yearMonthDay[2].equals("01");