Merge branch '1.20.1' into bugfixes

.github/actions/build_setup/action.yml

@@ -31,7 +31,6 @@ runs:
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
       with:
-        gradle-home-cache-cleanup: true
         cache-write-only: ${{ inputs.update-cache }}
         generate-job-summary: false
         gradle-home-cache-includes: |

.github/workflows/auto-build.yml

@@ -35,10 +35,10 @@ jobs:
       - name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls build/libs/* | grep dev.jar -v | grep sources.jar -v | grep slim.jar -v | awk -F 'gtceu-|-SNAPSHOT.jar' '{print $2}')
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT.jar"
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-slim.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-slim.jar"
-          echo "version=$MESSAGE-build_${{ github.run_number }}" >> $GITHUB_OUTPUT
+          VER=$(./gradlew -q printVersion)
+          BUILD_VER=$VER-build_${{ github.run_number }}
+          for jar in ./build/libs/*; do mv "$jar" "${jar/${VER}-SNAPSHOT/${BUILD_VER}-SNAPSHOT}";done 2>/dev/null
+          echo "version=$BUILD_VER" >> $GITHUB_OUTPUT
 
       - name: Release
         id: release

.github/workflows/auto-publish.yml

@@ -49,9 +49,7 @@ jobs:
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: Get Version
         id: var
-        run: |
-          MESSAGE=$(ls build/libs/* | grep dev.jar -v | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
-          echo version=$MESSAGE >> $GITHUB_OUTPUT
+        run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: mc-publish-forge

gradle/scripts/publishing.gradle

@@ -9,7 +9,7 @@ publishing {
         mavenJava(MavenPublication) {
             groupId = project.maven_group
             artifactId = project.archivesBaseName
-            version = project.mod_version
+            version = project.version
 
             from components.java
 

gradle/scripts/resources.gradle

@@ -10,6 +10,12 @@ def mod_description = getConfig("mod_description")
 def mod_url = getConfig("mod_url")
 def mod_issue_tracker = getConfig("mod_issue_tracker")
 
+task printVersion {
+    doLast {
+        println libs.versions.minecraft.get() + "-" + mod_version
+    }
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {

settings.gradle

@@ -54,7 +54,7 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def ldLibVersion = "1.0.27.b"
+        def ldLibVersion = "1.0.28.a"
         def mixinextrasVersion = "0.2.0"
         def shimmerVersion = "0.2.4"
         def lombokPluginVersion = "8.7.1"

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

@@ -2587,6 +2587,8 @@
   "enchantment.gtceu.disjunction.desc": "˙sqoɯ pǝʇɐןǝɹ-ɹǝpuƎ oʇ ssǝuʍoןS puɐ ssǝuʞɐǝM sǝıןddⱯ",
   "enchantment.gtceu.hard_hammer.desc": "˙ɹǝɯɯɐH ɥɔǝ⟘bǝɹ⅁ ɐ ɥʇıʍ pǝuıɯ ǝɹǝʍ ʎǝɥʇ ɟı sɐ sʞɔoןq sʞɐǝɹᗺ",
   "enchantment.hard_hammer": "buıɹǝɯɯɐH",
+  "entity.gtceu.boat": "ʇɐoᗺ",
+  "entity.gtceu.chest_boat": "ʇɐoᗺ ʇsǝɥƆ",
   "entity.gtceu.dynamite": "ǝʇıɯɐuʎᗡ",
   "entity.gtceu.industrial_tnt": "⟘N⟘ ןɐıɹʇsnpuI",
   "entity.gtceu.powderbarrel": "ןǝɹɹɐqɹǝpʍoԀ",
@@ -4717,6 +4719,8 @@
   "item.gtceu.rotor_casting_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ pןoWㄥ§",
   "item.gtceu.rotor_extruder_mold": ")ɹoʇoᴚ( pןoW ɹǝpnɹʇxƎ",
   "item.gtceu.rotor_extruder_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
+  "item.gtceu.rubber_boat": "ʇɐoᗺ ɹǝqqnᴚ",
+  "item.gtceu.rubber_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ ɹǝqqnᴚ",
   "item.gtceu.rubber_gloves": "sǝʌoן⅁ ɹǝqqnᴚ",
   "item.gtceu.salt_dust": "ʇןɐS",
   "item.gtceu.saw_extruder_mold.tooltip": "sʍɐS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
@@ -4930,7 +4934,9 @@
   "item.gtceu.tool.wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp oʇ ʞɔıןɔ ʇɟǝן pןoH8§",
   "item.gtceu.transistor": "ɹoʇsısuɐɹ⟘",
   "item.gtceu.transistor.tooltip": "ʇuǝuodɯoƆ ɔıuoɹʇɔǝןƎ ɔısɐᗺㄥ§",
+  "item.gtceu.treated_wood_boat": "ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
   "item.gtceu.treated_wood_bolt": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ ʇɹoɥS",
+  "item.gtceu.treated_wood_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
   "item.gtceu.treated_wood_dust": "dןnԀ pooM pǝʇɐǝɹ⟘",
   "item.gtceu.treated_wood_plate": "ʞuɐןԀ pooM pǝʇɐǝɹ⟘",
   "item.gtceu.treated_wood_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘",
@@ -5236,7 +5242,7 @@
   "material.gtceu.dubnium": "ɯnıuqnᗡ",
   "material.gtceu.duranium": "ɯnıuɐɹnᗡ",
   "material.gtceu.dysprosium": "ɯnısoɹdsʎᗡ",
-  "material.gtceu.echo": "oɥɔƎ",
+  "material.gtceu.echo_shard": "pɹɐɥS oɥɔƎ",
   "material.gtceu.einsteinium": "ɯnıuıǝʇsuıƎ",
   "material.gtceu.electrotine": "ǝuıʇoɹʇɔǝןƎ",
   "material.gtceu.electrum": "ɯnɹʇɔǝןƎ",

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

@@ -2587,6 +2587,8 @@
   "enchantment.gtceu.disjunction.desc": "Applies Weakness and Slowness to Ender-related mobs.",
   "enchantment.gtceu.hard_hammer.desc": "Breaks blocks as if they were mined with a GregTech Hammer.",
   "enchantment.hard_hammer": "Hammering",
+  "entity.gtceu.boat": "Boat",
+  "entity.gtceu.chest_boat": "Chest Boat",
   "entity.gtceu.dynamite": "Dynamite",
   "entity.gtceu.industrial_tnt": "Industrial TNT",
   "entity.gtceu.powderbarrel": "Powderbarrel",
@@ -4717,6 +4719,8 @@
   "item.gtceu.rotor_casting_mold.tooltip": "§7Mold for making Rotors",
   "item.gtceu.rotor_extruder_mold": "Extruder Mold (Rotor)",
   "item.gtceu.rotor_extruder_mold.tooltip": "§7Extruder Shape for making Rotors",
+  "item.gtceu.rubber_boat": "Rubber Boat",
+  "item.gtceu.rubber_chest_boat": "Rubber Boat with Chest",
   "item.gtceu.rubber_gloves": "Rubber Gloves",
   "item.gtceu.salt_dust": "Salt",
   "item.gtceu.saw_extruder_mold.tooltip": "§7Extruder Shape for making Saws",
@@ -4930,7 +4934,9 @@
   "item.gtceu.tool.wrench.tooltip": "§8Hold left click to dismantle Machines",
   "item.gtceu.transistor": "Transistor",
   "item.gtceu.transistor.tooltip": "§7Basic Electronic Component",
+  "item.gtceu.treated_wood_boat": "Treated Wood Boat",
   "item.gtceu.treated_wood_bolt": "Short Treated Wood Stick",
+  "item.gtceu.treated_wood_chest_boat": "Treated Wood Boat with Chest",
   "item.gtceu.treated_wood_dust": "Treated Wood Pulp",
   "item.gtceu.treated_wood_plate": "Treated Wood Plank",
   "item.gtceu.treated_wood_rod": "Treated Wood Stick",
@@ -5236,7 +5242,7 @@
   "material.gtceu.dubnium": "Dubnium",
   "material.gtceu.duranium": "Duranium",
   "material.gtceu.dysprosium": "Dysprosium",
-  "material.gtceu.echo": "Echo",
+  "material.gtceu.echo_shard": "Echo Shard",
   "material.gtceu.einsteinium": "Einsteinium",
   "material.gtceu.electrotine": "Electrotine",
   "material.gtceu.electrum": "Electrum",

src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_i/top",
-    "side": "gtceu:block/casings/battery/empty_tier_i/top",
-    "top": "gtceu:block/casings/battery/empty_tier_i/side"
+    "side": "gtceu:block/casings/battery/empty_tier_i/side",
+    "top": "gtceu:block/casings/battery/empty_tier_i/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_ii/top",
-    "side": "gtceu:block/casings/battery/empty_tier_ii/top",
-    "top": "gtceu:block/casings/battery/empty_tier_ii/side"
+    "side": "gtceu:block/casings/battery/empty_tier_ii/side",
+    "top": "gtceu:block/casings/battery/empty_tier_ii/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_iii/top",
-    "side": "gtceu:block/casings/battery/empty_tier_iii/top",
-    "top": "gtceu:block/casings/battery/empty_tier_iii/side"
+    "side": "gtceu:block/casings/battery/empty_tier_iii/side",
+    "top": "gtceu:block/casings/battery/empty_tier_iii/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/ev_lapotronic/top",
-    "side": "gtceu:block/casings/battery/ev_lapotronic/top",
-    "top": "gtceu:block/casings/battery/ev_lapotronic/side"
+    "side": "gtceu:block/casings/battery/ev_lapotronic/side",
+    "top": "gtceu:block/casings/battery/ev_lapotronic/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/industrial_tnt.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "minecraft:block/tnt_bottom",
-    "side": "gtceu:block/industrial_tnt_side",
+    "side": "gtceu:block/misc/industrial_tnt_side",
     "top": "minecraft:block/tnt_top"
   }
 }

src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/iv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/iv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/iv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/iv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/iv_lapotronic/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/luv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/luv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/luv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/luv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/luv_lapotronic/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/uhv_ultimate/top",
-    "side": "gtceu:block/casings/battery/uhv_ultimate/top",
-    "top": "gtceu:block/casings/battery/uhv_ultimate/side"
+    "side": "gtceu:block/casings/battery/uhv_ultimate/side",
+    "top": "gtceu:block/casings/battery/uhv_ultimate/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/uv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/uv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/uv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/uv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/uv_lapotronic/top"
   }
 }

src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/zpm_lapotronic/top",
-    "side": "gtceu:block/casings/battery/zpm_lapotronic/top",
-    "top": "gtceu:block/casings/battery/zpm_lapotronic/side"
+    "side": "gtceu:block/casings/battery/zpm_lapotronic/side",
+    "top": "gtceu:block/casings/battery/zpm_lapotronic/top"
   }
 }

src/generated/resources/assets/gtceu/models/item/crafting_table_cover.json → src/generated/resources/assets/gtceu/models/item/rubber_boat.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "gtceu:item/crafting_table_cover"
+    "layer0": "gtceu:item/rubber_boat"
   }
 }

src/generated/resources/assets/gtceu/models/item/digital_interface_cover.json → src/generated/resources/assets/gtceu/models/item/rubber_chest_boat.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "gtceu:item/digital_interface_cover"
+    "layer0": "gtceu:item/rubber_chest_boat"
   }
 }

src/generated/resources/assets/gtceu/models/item/wireless_digital_interface_cover.json → src/generated/resources/assets/gtceu/models/item/treated_wood_boat.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "gtceu:item/wireless_digital_interface_cover"
+    "layer0": "gtceu:item/treated_wood_boat"
   }
 }

src/generated/resources/assets/gtceu/models/item/treated_wood_chest_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/treated_wood_chest_boat"
+  }
+}

src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json

@@ -1,5 +1,8 @@
 {
   "values": [
-    "gtceu:rubber_log"
+    "gtceu:rubber_log",
+    "gtceu:stripped_rubber_log",
+    "gtceu:rubber_wood",
+    "gtceu:stripped_rubber_wood"
   ]
-}
+}

src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java

@@ -66,11 +66,6 @@ default void registerCovers() {}
      */
     default void registerRecipeCapabilities() {}
 
-    /**
-     * Call init on your custom Recipe Conditions here
-     */
-    default void registerRecipeConditions() {}
-
     /**
      * Call init on your custom IWorldGenLayer class(es) here
      */

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java

@@ -16,7 +16,7 @@
 import com.gregtechceu.gtceu.api.recipe.lookup.*;
 import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic;
 import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI;
-import com.gregtechceu.gtceu.common.recipe.ResearchCondition;
+import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition;
 import com.gregtechceu.gtceu.common.valueprovider.AddedFloat;
 import com.gregtechceu.gtceu.common.valueprovider.CastedFloat;
 import com.gregtechceu.gtceu.common.valueprovider.FlooredInt;

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java

@@ -1,5 +1,6 @@
 package com.gregtechceu.gtceu.api.capability.recipe;
 
+import com.gregtechceu.gtceu.api.codec.DispatchedMapCodec;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.content.Content;
@@ -8,13 +9,15 @@
 import com.gregtechceu.gtceu.api.recipe.lookup.AbstractMapIngredient;
 import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic;
 import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI;
+import com.gregtechceu.gtceu.api.registry.GTRegistries;
 
 import com.lowdragmc.lowdraglib.gui.widget.Widget;
 import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 
+import com.mojang.serialization.Codec;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -29,6 +32,10 @@
  */
 public abstract class RecipeCapability<T> {
 
+    public static final Codec<RecipeCapability<?>> DIRECT_CODEC = GTRegistries.RECIPE_CAPABILITIES.codec();
+    public static final Codec<Map<RecipeCapability<?>, List<Content>>> CODEC = new DispatchedMapCodec<>(
+            RecipeCapability.DIRECT_CODEC,
+            RecipeCapability::contentCodec);
     public static final Comparator<RecipeCapability<?>> COMPARATOR = Comparator.comparingInt(o -> o.sortIndex);
 
     public final String name;
@@ -46,6 +53,10 @@ protected RecipeCapability(String name, int color, boolean doRenderSlot, int sor
         this.serializer = serializer;
     }
 
+    public static Codec<List<Content>> contentCodec(RecipeCapability<?> capability) {
+        return Content.codec(capability).listOf();
+    }
+
     /**
      * deep copy of this content. recipe need it for searching and such things
      */