Merge branch '1.20.1' into sc/remove-brine

CHANGELOG.md

@@ -1,5 +1,37 @@
 # ChangeLog
 
+## Version [v1.6.2](https://github.com/GregTechCEu/GregTech-Modern/compare/v1.6.1-1.20.1...v1.6.2-1.20.1)
+### Added
+
+- Add High Pressure Variation of The Steam Miner Singleblock. by @Ghostipedia in [#2637](https://github.com/GregTechCEu/GregTech-Modern/pull/2637)
+- Add Production Efficiency Modifier by @krossgg in [#2621](https://github.com/GregTechCEu/GregTech-Modern/pull/2621)
+- Add multiblock constructors to KJS + lang by @krossgg in [#2667](https://github.com/GregTechCEu/GregTech-Modern/pull/2667)
+- Updates registrate dependency by @Spicierspace153 in [#2625](https://github.com/GregTechCEu/GregTech-Modern/pull/2625)
+
+### Fixed
+
+- Fix Distillation Tower machines crashing by @krossgg in [#2646](https://github.com/GregTechCEu/GregTech-Modern/pull/2646)
+- Fix Machine Recipe Modifiers by @krossgg in [#2647](https://github.com/GregTechCEu/GregTech-Modern/pull/2647)
+- Fix Smart Filter not saving mode by @krossgg in [#2648](https://github.com/GregTechCEu/GregTech-Modern/pull/2648)
+- Fix  builder overwriting values by @krossgg in [#2649](https://github.com/GregTechCEu/GregTech-Modern/pull/2649)
+- Add LEVEL state to PotionFluid by @loving2 in [#2650](https://github.com/GregTechCEu/GregTech-Modern/pull/2650)
+- Fix KJS replacement order & custom json recipes by @krossgg in [#2653](https://github.com/GregTechCEu/GregTech-Modern/pull/2653)
+- Fix Cleanroom floor check by @krossgg in [#2654](https://github.com/GregTechCEu/GregTech-Modern/pull/2654)
+- Fix Overclocking Logic not using correct tier for OCs by @Spicierspace153 in [#2661](https://github.com/GregTechCEu/GregTech-Modern/pull/2661)
+- Fix Steam and Plasma turbines requiring mufflers by @Luexa in [#2655](https://github.com/GregTechCEu/GregTech-Modern/pull/2655)
+- Fix oil spouts not updating the fluid on generation by @screret in [#2659](https://github.com/GregTechCEu/GregTech-Modern/pull/2659)
+- Fix furnace recipe serialization by @krossgg in [#2657](https://github.com/GregTechCEu/GregTech-Modern/pull/2657)
+- Fix MultiParts not calling  on unload by @krossgg in [#2663](https://github.com/GregTechCEu/GregTech-Modern/pull/2663)
+- Fix Stone Variant maceration having conflicting recipes by @YoungOnionMC in [#2664](https://github.com/GregTechCEu/GregTech-Modern/pull/2664)
+- Fix bucket being voided by TankWidget with not enough space by @Natanaelel in [#2643](https://github.com/GregTechCEu/GregTech-Modern/pull/2643)
+- Change pipes to force connections to covers by @krossgg in [#2666](https://github.com/GregTechCEu/GregTech-Modern/pull/2666)
+
+### Changed
+
+- Fix typo in temperature parameter of BlastProperty builder by @Luexa in [#2636](https://github.com/GregTechCEu/GregTech-Modern/pull/2636)
+- update ru_ru.json by @marisathewitch in [#2662](https://github.com/GregTechCEu/GregTech-Modern/pull/2662)
+
+
 ## Version [v1.6.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v1.6.0-1.20.1...v1.6.1-1.20.1)
 ### Added
 

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.6.2
+mod_version = 1.6.3
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

settings.gradle

@@ -29,7 +29,7 @@ dependencyResolutionManagement {
 
         // Forge
         def forgeVersion = "47.1.47"
-        def registrateForgeVersion = "MC1.20-1.3.3"
+        def registrateForgeVersion = "MC1.20-1.3.11"
         def topForgeVersion = "1.20.1-10.0.1-3"
         def jadeForgeVersion = "11.6.3"
         def curiosForgeVersion = "5.9.1"

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

@@ -321,6 +321,7 @@
   "block.gtceu.hp_steam_furnace": "ǝɔɐuɹnℲ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
   "block.gtceu.hp_steam_liquid_boiler": "ɹǝןıoᗺ pınbıꞀ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
   "block.gtceu.hp_steam_macerator": "ɹoʇɐɹǝɔɐW ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
+  "block.gtceu.hp_steam_miner": "ɹǝuıW ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
   "block.gtceu.hp_steam_rock_crusher": "ɹǝɥsnɹƆ ʞɔoᴚ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
   "block.gtceu.hp_steam_solar_boiler": "ɹǝןıoᗺ ɹɐןoS ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
   "block.gtceu.hp_steam_solid_boiler": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
@@ -573,6 +574,7 @@
   "block.gtceu.lp_steam_furnace": "ǝɔɐuɹnℲ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
   "block.gtceu.lp_steam_liquid_boiler": "ɹǝןıoᗺ pınbıꞀ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
   "block.gtceu.lp_steam_macerator": "ɹoʇɐɹǝɔɐW ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
+  "block.gtceu.lp_steam_miner": "ɹǝuıW ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
   "block.gtceu.lp_steam_rock_crusher": "ɹǝɥsnɹƆ ʞɔoᴚ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
   "block.gtceu.lp_steam_solar_boiler": "ɹǝןıoᗺ ɹɐןoS ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
   "block.gtceu.lp_steam_solid_boiler": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ",
@@ -1086,7 +1088,6 @@
   "block.gtceu.steam_large_turbine": "ǝuıqɹn⟘ ɯɐǝʇS ǝbɹɐꞀ",
   "block.gtceu.steam_liquid_boiler.bronze": "ɹǝןıoᗺ pınbıꞀ ɯɐǝʇS ןןɐɯS",
   "block.gtceu.steam_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯɐǝʇS",
-  "block.gtceu.steam_miner": "ɹǝuıW ɯɐǝʇS",
   "block.gtceu.steam_output_bus": ")ɯɐǝʇS( snᗺ ʇndʇnO",
   "block.gtceu.steam_oven": "uǝʌO ɯɐǝʇS",
   "block.gtceu.steam_solid_boiler.bronze": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ןןɐɯS",
@@ -2125,6 +2126,8 @@
   "gtceu.arc_furnace": "ǝɔɐuɹnℲ ɔɹⱯ",
   "gtceu.assembler": "ɹǝןqɯǝssⱯ",
   "gtceu.assembly_line": "ǝuıꞀ ʎןqɯǝssⱯ",
+  "gtceu.auto_decomp.rotor": "ɹoʇoᴚ ǝuıqɹn⟘",
+  "gtceu.auto_decomp.tool": "ןooʇ ɔıɹʇɔǝןǝ-uoN",
   "gtceu.autoclave": "ǝʌɐןɔoʇnⱯ",
   "gtceu.battery_buffer.average_input": "ʇ/∩Ǝ %s :ʇnduı ǝbɐɹǝʌⱯ",
   "gtceu.battery_buffer.average_output": "ʇ/∩Ǝ %s :ʇndʇno ǝbɐɹǝʌⱯ",

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

@@ -321,6 +321,7 @@
   "block.gtceu.hp_steam_furnace": "High Pressure Steam Furnace",
   "block.gtceu.hp_steam_liquid_boiler": "High Pressure Steam Liquid Boiler",
   "block.gtceu.hp_steam_macerator": "High Pressure Steam Macerator",
+  "block.gtceu.hp_steam_miner": "High Pressure Steam Miner",
   "block.gtceu.hp_steam_rock_crusher": "High Pressure Steam Rock Crusher",
   "block.gtceu.hp_steam_solar_boiler": "High Pressure Steam Solar Boiler",
   "block.gtceu.hp_steam_solid_boiler": "High Pressure Steam Solid Boiler",
@@ -573,6 +574,7 @@
   "block.gtceu.lp_steam_furnace": "Low Pressure Steam Furnace",
   "block.gtceu.lp_steam_liquid_boiler": "Low Pressure Steam Liquid Boiler",
   "block.gtceu.lp_steam_macerator": "Low Pressure Steam Macerator",
+  "block.gtceu.lp_steam_miner": "Low Pressure Steam Miner",
   "block.gtceu.lp_steam_rock_crusher": "Low Pressure Steam Rock Crusher",
   "block.gtceu.lp_steam_solar_boiler": "Low Pressure Steam Solar Boiler",
   "block.gtceu.lp_steam_solid_boiler": "Low Pressure Steam Solid Boiler",
@@ -1086,7 +1088,6 @@
   "block.gtceu.steam_large_turbine": "Large Steam Turbine",
   "block.gtceu.steam_liquid_boiler.bronze": "Small Steam Liquid Boiler",
   "block.gtceu.steam_machine_casing": "Steam Machine Casing",
-  "block.gtceu.steam_miner": "Steam Miner",
   "block.gtceu.steam_output_bus": "Output Bus (Steam)",
   "block.gtceu.steam_oven": "Steam Oven",
   "block.gtceu.steam_solid_boiler.bronze": "Small Steam Solid Boiler",
@@ -2125,6 +2126,8 @@
   "gtceu.arc_furnace": "Arc Furnace",
   "gtceu.assembler": "Assembler",
   "gtceu.assembly_line": "Assembly Line",
+  "gtceu.auto_decomp.rotor": "Turbine Rotor",
+  "gtceu.auto_decomp.tool": "Non-electric tool",
   "gtceu.autoclave": "Autoclave",
   "gtceu.battery_buffer.average_input": "Average input: %s EU/t",
   "gtceu.battery_buffer.average_output": "Average output: %s EU/t",

src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java

@@ -270,6 +270,12 @@ public void setConnection(Direction side, boolean connected, boolean fromNeighbo
                     pipeTile.getPipeType().getClass() != this.getPipeType().getClass()) {
                 return;
             }
+
+            if (!connected) {
+                var cover = getCoverContainer().getCoverAtSide(side);
+                if (cover != null && cover.canPipePassThrough()) return;
+            }
+
             connections = withSideConnection(connections, side, connected);
 
             updateNetworkConnection(side, connected);

src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java

@@ -148,7 +148,8 @@ private void loadFilterFromItem() {
         if (!this.filterItem.isEmpty()) {
             this.filter = loadFilter(this.filterItem);
             filter.setOnUpdated(this.onFilterUpdated);
-            if (this.filter instanceof SmartItemFilter smart && container instanceof CoverBehavior cover &&
+            if (filter instanceof SmartItemFilter smart &&
+                    container instanceof CoverBehavior cover &&
                     cover.coverHolder instanceof MachineCoverContainer mcc) {
                 var machine = MetaMachine.getMachine(mcc.getLevel(), mcc.getPos());
                 if (machine != null) {

src/main/java/com/gregtechceu/gtceu/api/cover/filter/SmartItemFilter.java

@@ -17,7 +17,6 @@
 import net.minecraft.world.item.ItemStack;
 
 import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap;
-import lombok.Setter;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -27,7 +26,6 @@ public class SmartItemFilter implements ItemFilter {
     protected Consumer<ItemFilter> itemWriter = filter -> {};
     protected Consumer<ItemFilter> onUpdated = filter -> itemWriter.accept(filter);
 
-    @Setter
     private SmartFilteringMode filterMode = SmartFilteringMode.ELECTROLYZER;
 
     protected SmartItemFilter() {}
@@ -58,6 +56,11 @@ public CompoundTag saveFilter() {
         return tag;
     }
 
+    private void setFilterMode(SmartFilteringMode filterMode) {
+        this.filterMode = filterMode;
+        onUpdated.accept(this);
+    }
+
     @Override
     public WidgetGroup openConfigurator(int x, int y) {
         WidgetGroup group = new WidgetGroup(x, y, 18 * 3 + 25, 18 * 3);
@@ -94,7 +97,7 @@ private int lookup(ItemStack itemStack) {
     public void setModeFromMachine(String machineName) {
         for (SmartFilteringMode mode : SmartFilteringMode.VALUES) {
             if (machineName.contains(mode.localeName)) {
-                this.filterMode = mode;
+                setFilterMode(mode);
                 return;
             }
         }

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java

@@ -136,13 +136,13 @@ public static class Builder {
 
         public Builder() {}
 
-        public Builder temp(int tempurature) {
-            this.temp = tempurature;
+        public Builder temp(int temperature) {
+            this.temp = temperature;
             return this;
         }
 
-        public Builder temp(int tempurature, GasTier gasTier) {
-            this.temp = tempurature;
+        public Builder temp(int temperature, GasTier gasTier) {
+            this.temp = temperature;
             this.gasTier = gasTier;
             return this;
         }

src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java

@@ -708,7 +708,7 @@ public static TagPrefix get(String name) {
             .defaultTagPath("%s")
             .langValue("%s")
             .miningToolTag(BlockTags.MINEABLE_WITH_PICKAXE)
-            .unificationEnabled(true)
+            .unificationEnabled(false)
             .generateBlock(true) // generate a block but not really, for TagPrefix#setIgnoredBlock
             .generationCondition((material) -> false);
 
@@ -867,6 +867,7 @@ public record BlockProperties(Supplier<Supplier<RenderType>> renderType,
     private long materialAmount = -1;
 
     @Setter
+    @Getter
     private boolean unificationEnabled;
     @Setter
     private boolean generateItem;

src/main/java/com/gregtechceu/gtceu/api/gui/widget/TankWidget.java

@@ -537,11 +537,14 @@ private int tryClickContainer(boolean isShiftKeyDown) {
             boolean performedEmptying = false;
             ItemStack drainedResult = ItemStack.EMPTY;
             for (int i = 0; i < maxAttempts; i++) {
-                FluidActionResult result = FluidUtil.tryEmptyContainer(currentStack, fluidTank, Integer.MAX_VALUE, null,
+                int remainingCapacity = fluidTank.getTankCapacity(tank) - fluidTank.getFluidInTank(tank).getAmount();
+                FluidActionResult result = FluidUtil.tryEmptyContainer(currentStack, fluidTank, remainingCapacity, null,
                         false);
                 if (!result.isSuccess()) break;
+
                 ItemStack remainingStack = FluidUtil
-                        .tryEmptyContainer(currentStack, fluidTank, Integer.MAX_VALUE, null, true).getResult();
+                        .tryEmptyContainer(currentStack, fluidTank, remainingCapacity, null, true)
+                        .getResult();
                 performedEmptying = true;
 
                 currentStack.shrink(1);