Merge branch 'GregTechCEu:1.20.1' into 1.20.1

RELEASE.md

@@ -1,34 +1,7 @@
 ## What's Changed
 
-### Added
-- Compressor recipe for snowballs to snow blocks ([#1969](https://github.com/GregTechCEu/GregTech-Modern/pull/1969))
-- Rubber Wood and Treated Wood boats ([#1980](https://github.com/GregTechCEu/GregTech-Modern/pull/1980))
-
 ### Fixed
-- Coke Oven Hatches are now able to be automated again ([#1948](https://github.com/GregTechCEu/GregTech-Modern/pull/1948))
-- All sounds are now mono-audio (you will no longer be haunted by the global Research Station sound) ([#1966](https://github.com/GregTechCEu/GregTech-Modern/pull/1966))
-- Fixed Large Turbine logic which stopped them from running properly ([#1983](https://github.com/GregTechCEu/GregTech-Modern/pull/1983) and [#2010](https://github.com/GregTechCEu/GregTech-Modern/pull/2010))
-- Machine auto-export will now respect attached filter covers ([#1982](https://github.com/GregTechCEu/GregTech-Modern/pull/1982))
-- Quantum Tanks will no longer void fluids that don't match the stored fluid ([#1976](https://github.com/GregTechCEu/GregTech-Modern/pull/1976))
-- Quantum Chests will now properly drop items if your inventory is full rather than just voiding them ([#1976](https://github.com/GregTechCEu/GregTech-Modern/pull/1976))
-- The Multi Smelter now applies overclocks properly ([#2004](https://github.com/GregTechCEu/GregTech-Modern/pull/2004) and [#2008](https://github.com/GregTechCEu/GregTech-Modern/pull/2008))
-- ME Pattern Buffer Proxies now show a hand animation when opened ([#2005](https://github.com/GregTechCEu/GregTech-Modern/pull/2005))
-- Fixed ME parts not showing tooltips ([#1993](https://github.com/GregTechCEu/GregTech-Modern/pull/1993))
-- Rubber log variants now have the burnable tag ([#1914](https://github.com/GregTechCEu/GregTech-Modern/pull/1914))
-- Fixed solid boilers not being able to burn some vanilla furnace fuels ([#1998](https://github.com/GregTechCEu/GregTech-Modern/pull/1998))
-- Various texture fixes ([#1974](https://github.com/GregTechCEu/GregTech-Modern/pull/1974))
-- Other miscellaneous fixes
-
-### Changed
-- **ADDON DEVS:** Recipe Conditions and the GTRegistry class have changed slightly - please take note ([#1955](https://github.com/GregTechCEu/GregTech-Modern/pull/1955))
-- **ADDON DEVS:** We now publish to the official GTCEu Maven - check the updated README for further information
-- Chanced outputs for parallel recipes are now deterministic and guaranteed a minimum amount ([#1948](https://github.com/GregTechCEu/GregTech-Modern/pull/1948))
-- The highlight grid for tools and covers will now only appear if a possible interaction exists ([#1949](https://github.com/GregTechCEu/GregTech-Modern/pull/1949))
-- Optical Pipes can now hold covers ([#1953](https://github.com/GregTechCEu/GregTech-Modern/pull/1953))
-
-
-### Removed
-- Covers that have no plan to be implemented have been removed ([#1961](https://github.com/GregTechCEu/GregTech-Modern/pull/1961))
+- Multiblock machines now calculate their tier correctly ([#2019](https://github.com/GregTechCEu/GregTech-Modern/pull/2019))
+- Recipe fixes 🔥 ([#2022](https://github.com/GregTechCEu/GregTech-Modern/pull/2022) and [#2023](https://github.com/GregTechCEu/GregTech-Modern/pull/2023))
 
-\
-**Full Changelog found [here](https://github.com/GregTechCEu/GregTech-Modern/compare/1.20.1-1.4.1+patch.2...1.20.1-1.4.2)**
+**Full Changelog found [here](https://github.com/GregTechCEu/GregTech-Modern/compare/1.20.1-1.4.2...1.20.1-1.4.3)**

gradle.properties

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

src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java

@@ -81,7 +81,7 @@ public static GTRecipe applyOverclock(OverclockingLogic logic, @NotNull GTRecipe
         }
         EUt = getOutputEUt(recipe);
         if (EUt > 0) {
-            performOverclocking(logic, recipe, EUt, maxOverclockVoltage, params, result);
+            performOverclocking(logic, recipe, -EUt, maxOverclockVoltage, params, result);
         }
         return recipe;
     }
@@ -95,7 +95,7 @@ public static GTRecipe applyOverclock(OverclockingLogic logic, @NotNull GTRecipe
     public static void performOverclocking(OverclockingLogic logic, @NotNull GTRecipe recipe, long EUt,
                                            long maxOverclockVoltage,
                                            @NotNull OCParams params, @NotNull OCResult result) {
-        int recipeTier = GTUtil.getTierByVoltage(EUt);
+        int recipeTier = GTUtil.getTierByVoltage(Math.abs(EUt));
         int maximumTier = logic.getOverclockForTier(maxOverclockVoltage);
         // The maximum number of overclocks is determined by the difference between the tier the recipe is running at,
         // and the maximum tier that the machine can overclock to.

src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/GTRecipeComponents.java

@@ -207,7 +207,7 @@ public RecipeCondition read(RecipeJS recipe, Object from) {
                 if (type != null) {
                     RecipeCondition condition = type.factory.createDefault();
                     if (condition != null) {
-                        return condition.deserialize(GsonHelper.getAsJsonObject(jsonObject, "data", new JsonObject()));
+                        return condition.deserialize(jsonObject);
                     }
                 }
             } else if (from instanceof Tag tag) {

src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java

@@ -223,7 +223,7 @@ public static byte getFloorTierByVoltage(long voltage) {
             return GTValues.MAX_TRUE;
         }
 
-        return (byte) ((60 - Long.numberOfLeadingZeros(voltage - 1)) >> 1);
+        return (byte) ((60 - Long.numberOfLeadingZeros(voltage)) >> 1);
     }
 
     public static ItemStack copy(ItemStack... stacks) {