cherrypick 1.1.4.b to 1.19.2 (#1043)

* Update lang file (#1035) * Translated using Weblate (Russian) Currently translated at 100.0% (5062 of 5062 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5062 of 5062 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 99.9% (5063 of 5067 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5067 of 5067 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ * Translated using Weblate (Russian) Currently translated at 100.0% (5080 of 5080 strings) Translation: Gregicality/GregTech Modern Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/ --------- Co-authored-by: Western01 <[email protected]> * update LDlib to fix server crashing (#1040) * fix large assembler and circuit assembler energy hatch counts (#1041) * fix error on client when opening multiblock UI for the first time (#1042) --------- Co-authored-by: marisathewitch <[email protected]> Co-authored-by: Western01 <[email protected]>
GregTechCEu · Mar 31, 2024 · f179571 · f179571
1 parent 33aa64d
commit f179571
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,25 +1,12 @@
 # ChangeLog
 
-Version: 1.1.4.a
+Version: 1.1.4.b
 
 ### ADDITIONS:
-- added more wiremill recipes for different wire sizes
-- made rubber saplings & leaves compostable
-- made spray paint able to paint multiple blocks in a chain if crouching
-- added ability to use block/fluid tags in multiblock patterns
 
 ### FIXES:
-- fix AMD driver error in LDlib
-- fixed bucket model
-- fixed PA accepting multiblock machines
-- fixed fluid pipes crashing when connected to other mods' blocks
-- fixed large DT outputs not being ordered
-- fixed wooden brick form disappearing after use
-- fixed pyrolyse oven not getting bonuses if recipe didn't overclock
-- fixed shovels crashing if somehow used to path air
-- fixed full spray paint cans rendering the bar as empty
+- fixed client error when opening multiblock UI for the first time
+- fixed Large assembler & circuit assembler being able to have >1 energy hatch
+- fix server crash in LDlib
 
 ### CHANGES:
-- ported multi-amp energy hatches not giving overclocks. You now always need 2 energy hatches for an overclock.
-- made dynamic data- and resourcepacks appear in the pack list(s) 
-- Use a grid-based UI for the multiblock part switcher
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.1.4.a
+mod_version = 1.1.4.b
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

diff --git a/settings.gradle b/settings.gradle
@@ -42,7 +42,7 @@ dependencyResolutionManagement {
         def architecturyPluginVersion = "3.4-SNAPSHOT"
         def architecturyLoomVersion = "1.5-SNAPSHOT"
         def macheteVersion = "1.+"
-        def ldLibVersion = "1.0.24.b"
+        def ldLibVersion = "1.0.24.c"
         def mixinextrasVersion = "0.2.0"
 
         forge {

diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IDisplayUIMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IDisplayUIMachine.java
@@ -41,6 +41,7 @@ default ModularUI createUI(Player entityPlayer) {
         var screen = new DraggableScrollableWidgetGroup(7, 4, 162, 121).setBackground(getScreenTexture());
         screen.addWidget(new LabelWidget(4, 5, self().getBlockState().getBlock().getDescriptionId()));
         screen.addWidget(new ComponentPanelWidget(4, 17, this::addDisplayText)
+                .textSupplier(this.self().getLevel().isClientSide ? null : this::addDisplayText)
                 .setMaxWidthLimit(150)
                 .clickHandler(this::handleDisplayClick));
         return new ModularUI(176, 216, this, entityPlayer)

diff --git a/.../java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java b/.../java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java
@@ -20,10 +20,8 @@
 import com.gregtechceu.gtceu.utils.GTUtil;
 import com.lowdragmc.lowdraglib.gui.modular.ModularUI;
 import com.lowdragmc.lowdraglib.gui.widget.*;
-import net.minecraft.ChatFormatting;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
 import net.minecraft.world.entity.player.Player;
 
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -97,6 +95,7 @@ public Widget createUIWidget() {
         group.addWidget(new DraggableScrollableWidgetGroup(4, 4, 182, 117).setBackground(getScreenTexture())
                 .addWidget(new LabelWidget(4, 5, self().getBlockState().getBlock().getDescriptionId()))
                 .addWidget(new ComponentPanelWidget(4, 17, this::addDisplayText)
+                        .textSupplier(this.getLevel().isClientSide ? null : this::addDisplayText)
                         .setMaxWidthLimit(150)
                         .clickHandler(this::handleDisplayClick)));
         group.setBackground(GuiTextures.BACKGROUND_INVERSE);
@@ -146,7 +145,9 @@ public void setOverclockTier(int tier) {
 
     @Override
     public long getOverclockVoltage() {
-        IEnergyContainer energyContainer = this.energyContainer;
+        if (this.energyContainer == null) {
+            this.energyContainer = getEnergyContainer();
+        }
         if (energyContainer instanceof EnergyContainerList) {
             long voltage;
             long amperage;
@@ -208,7 +209,6 @@ public IEnergyContainer getEnergyContainer() {
     }
 
     public long getMaxVoltage() {
-        IEnergyContainer energyContainer = this.energyContainer;
         if (this.energyContainer == null) {
             this.energyContainer = getEnergyContainer();
         }

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java
@@ -266,7 +266,8 @@ public static void init() {}
                     .aisle("XXXXXXXXX","XGGGXXSXX","XGGGX###X")
                     .where('S', controller(blocks(definition.get())))
                     .where('X', blocks(CASING_LARGE_SCALE_ASSEMBLING.get()).setMinGlobalLimited(40)
-                            .or(Predicates.autoAbilities(definition.getRecipeTypes()))
+                            .or(Predicates.autoAbilities(definition.getRecipeTypes(), false, false, true, true, true, true))
+                            .or(Predicates.abilities(INPUT_ENERGY).setExactLimit(1))
                             .or(Predicates.autoAbilities(true, false, true)))
                     .where('G', Predicates.blocks(CASING_TEMPERED_GLASS.get()))
                     .where('A', Predicates.air())
@@ -294,7 +295,8 @@ public static void init() {}
                     .aisle("#####XX","#####SX","#####XX")
                     .where('S', controller(blocks(definition.get())))
                     .where('X', blocks(CASING_LARGE_SCALE_ASSEMBLING.get()).setMinGlobalLimited(55)
-                            .or(Predicates.autoAbilities(definition.getRecipeTypes()))
+                            .or(Predicates.autoAbilities(definition.getRecipeTypes(), false, false, true, true, true, true))
+                            .or(Predicates.abilities(INPUT_ENERGY).setExactLimit(1))
                             .or(Predicates.autoAbilities(true, false, true)))
                     .where('T', Predicates.blocks(CASING_TEMPERED_GLASS.get()))
                     .where('G', Predicates.blocks(CASING_GRATE.get()))

diff --git a/src/main/resources/assets/gtceu/lang/ru_ru.json b/src/main/resources/assets/gtceu/lang/ru_ru.json
@@ -6502,5 +6502,17 @@
     "block.gtceu.hv_item_collector": "§6Улучшенный собиратель предметов II§r",
     "block.gtceu.lv_item_collector": "Обычный собиратель предметов §r",
     "block.gtceu.mv_item_collector": "§bУлучшенный собиратель предметов §r",
-    "compass.node.gtceu.machines/item_collector": "Cобиратель предметов"
+    "compass.node.gtceu.machines/item_collector": "Cобиратель предметов",
+    "gtceu.multiblock.fluid_rig.drilled_fluid": "Жидкость: %s",
+    "gtceu.multiblock.fluid_rig.fluid_amount": "Скорость добычи: %s",
+    "gtceu.multiblock.fluid_rig.no_fluid_in_area": "Пусто.",
+    "gtceu.multiblock.fluid_rig.vein_depleted": "Жила опустошена.",
+    "gtceu.multiblock.max_energy_per_tick_hover": "Макс. EU/t, возможный для запуска рецептов или ускорения",
+    "gtceu.multiblock.max_recipe_tier": "Макс. уровень рецепта: %s",
+    "gtceu.multiblock.page_switcher.io.both": "§5Совмещенный Ввод + Вывод",
+    "gtceu.multiblock.page_switcher.io.export": "§4Вывод",
+    "gtceu.multiblock.page_switcher.io.import": "§2Ввод",
+    "gtceu.multiblock.fluid_rig.vein_depletion": "Размер: %s",
+    "gtceu.multiblock.max_energy_per_tick_amps": "Макс. EU/т: %s (%sA %s)",
+    "gtceu.multiblock.max_recipe_tier_hover": "Макс. уровень рецепта возможный для старта"
 }