1.20.2 Release

.teamcity/settings.kts

@@ -47,8 +47,6 @@ project {
             """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
         text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
         text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
         //These are references and not actually keys
         password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
@@ -76,19 +74,6 @@ object Build : BuildType({
     id("MinecraftForge_MinecraftForge__Build")
     name = "Build"
     description = "Builds and Publishes the main branches of the project."
-
-    features {
-        feature {
-            id = "trigger_fml_only_files_generator"
-            type = "triggerBuildFeature"
-            param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
-            param("parameters", """
-                env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
-                env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
-                env.PUBLISHED_JAVA_GROUP
-            """.trimIndent())
-        }
-    }
 })
 
 object BuildSecondaryBranches : BuildType({

build.gradle

@@ -44,10 +44,10 @@ ext {
         ]
     }
     MAPPING_CHANNEL = 'official'
-    MC_VERSION = '1.20.2-rc2'
+    MC_VERSION = '1.20.2'
     MAPPING_VERSION = MC_VERSION
     MC_NEXT_VERSION = '1.21'
-    MCP_VERSION = '20230918.104552'
+    MCP_VERSION = '20230921.100330'
     SNAPSHOT = false
 
     SPI_VERSION = '7.0.1'
@@ -88,7 +88,7 @@ ext {
     INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
     JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
     FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.5:all'
-    MIN_TAG_FOR_CHANGELOG = '41.0'
+    MIN_TAG_FOR_CHANGELOG = '47.999'
 }
 
 println('Version: ' + VERSION +

patches/minecraft/net/minecraft/world/level/storage/loot/LootPool.java.patch

@@ -10,7 +10,7 @@
 +      net.minecraftforge.common.crafting.conditions.ICondition.OPTIONAL_FEILD_CODEC.forGetter(p -> p.forge_condition)
 +      ).apply(p_297005_, LootPool::new);
     });
-+   public static final Codec<LootPool> CONDITIONAL_CODEC = net.minecraftforge.common.crafting.conditions.ConditionCodec.checkingDecode(CODEC);
++   public static final Codec<LootPool> CONDITIONAL_CODEC = net.minecraftforge.common.crafting.conditions.ConditionCodec.checkingDecode(CODEC, () -> lootPool().build());
     private final List<LootPoolEntryContainer> entries;
     private final List<LootItemCondition> conditions;
     private final Predicate<LootContext> compositeCondition;

src/main/java/net/minecraftforge/common/crafting/conditions/ConditionCodec.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.common.crafting.conditions;
 
 import java.util.Optional;

src/main/java/net/minecraftforge/common/crafting/conditions/ItemExistsCondition.java

@@ -12,7 +12,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public record ItemExistsCondition(ResourceLocation item) implements ICondition {
-    public static Codec<ItemExistsCondition> CODEC = RecordCodecBuilder.create(b -> b.group(
+    public static final Codec<ItemExistsCondition> CODEC = RecordCodecBuilder.create(b -> b.group(
         ResourceLocation.CODEC.fieldOf("item").forGetter(ItemExistsCondition::item)
     ).apply(b, ItemExistsCondition::new));
 

src/main/java/net/minecraftforge/common/crafting/conditions/NotCondition.java

@@ -9,7 +9,7 @@ import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
 public record NotCondition(ICondition child) implements ICondition {
-    public static Codec<NotCondition> CODEC = RecordCodecBuilder.create(b -> b.group(
+    public static final Codec<NotCondition> CODEC = RecordCodecBuilder.create(b -> b.group(
         ICondition.CODEC.fieldOf("value").forGetter(NotCondition::child)
     ).apply(b, NotCondition::new));
 

src/main/java/net/minecraftforge/common/crafting/conditions/TrueCondition.java

@@ -9,7 +9,7 @@ import com.mojang.serialization.Codec;
 
 public final class TrueCondition implements ICondition {
     public static final TrueCondition INSTANCE = new TrueCondition();
-    public static Codec<TrueCondition> CODEC = Codec.unit(INSTANCE).stable();
+    public static final Codec<TrueCondition> CODEC = Codec.unit(INSTANCE).stable();
 
     private TrueCondition() {}