1.20.6 RB 2

https://forums.minecraftforge.net/topic/154389-forge-502-minecraft-1206/

.teamcity/settings.kts

@@ -38,7 +38,7 @@ project {
     params {
         text("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("docker_gradle_version", "8.7", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("git_main_branch", "1.21.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("git_branch_spec", """
                 +:refs/heads/(main*)
                 +:refs/heads/(master*)

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodePredicateFinder.groovy

@@ -27,6 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
     @Internal
     @Override
     protected Object getData() {
-        return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
+        return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
     }
 }

build_forge.gradle

@@ -117,7 +117,7 @@ dependencies {
     bootstrap(libs.unsafe)        // Needed by securemodules
     bootstrap(libs.bundles.asm)   // Needed by securemodules
     
-    implementation(libs.jopt.simple) { version { strictly '5.0.4' } }
+    implementation(libs.jopt.simple)
     
     installer(libs.bootstrap)
     installer(libs.bootstrap.api) // Needed by securemodules

build_shared.gradle

@@ -74,3 +74,11 @@ eclipse {
     // Run when importing the project
     synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
 }
+
+idea {
+    module {
+        // IntelliJ IDEA does not do this by itself anymore...
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}

docs/README.md

@@ -8,10 +8,9 @@ MinecraftForge
 
 Forge is a free, open-source modding API all of your favourite mods use!
 
-| Version |    Support    |
-|---------| ------------- |
-| 1.20.x  |    Active     |
-| 1.19.x  |    Legacy     |
+| Version      | Support                     |
+|--------------|-----------------------------|
+| All versions | [Supported][Support-Policy] |
 
 * [Download]
 * [Forum]
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
  
 For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
 
+## Required Java Versions
+
+We require the version of Java that Minecraft requires, which is currently:
+
+| Minecraft     | Java              |
+|---------------|-------------------|
+| 1.20.6+       | [21][Adoptium-21] |
+| 1.18 - 1.20.4 | [17][Adoptium-17] |
+| 1.17.1        | [16][Adoptium-16] |
+| 1.16.5-       | [8][Adoptium-8]   |
+
+**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
+
 # Creating Mods
 
 [See the "Getting Started" section in the Forge Documentation][Getting-Started].
@@ -63,8 +75,15 @@ Please ensure you have a valid email address associated with your GitHub account
 
 [Download]: https://files.minecraftforge.net/
 
+[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
+[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
+[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
+[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
+[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
+
 [Forum]: https://forums.minecraftforge.net/
 [Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
+[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
 
 [Discord]: https://discord.minecraftforge.net/
 

fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java

@@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.config.IConfigEvent;
 import net.minecraftforge.fml.loading.FMLLoader;
 
-import java.util.ArrayList;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
+/**
+ * Used to allow access to certain things from the game layer
+ */
 public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
+    private Bindings() {}
 
-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        var providers = new ArrayList<IBindingsProvider>(1);
-        for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) {
-            try {
-                providers.add(itr.next());
-            } catch (ServiceConfigurationError sce) {
-                sce.printStackTrace();
-            }
-        }
-
-        if (providers.size() != 1)
-            throw new IllegalStateException("Could not find bindings provider: " + providers);
-
-        this.provider = providers.get(0);
-    }
+    /**
+     * The provider of the bindings
+     * @implNote May also throw a {@link ServiceConfigurationError}
+     */
+    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
+            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
 
+    /**
+     * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
+     */
     public static Supplier<IEventBus> getForgeBus() {
-        return INSTANCE.provider.getForgeBusSupplier();
+        return PROVIDER.getForgeBusSupplier();
     }
 
     public static Supplier<I18NParser> getMessageParser() {
-        return INSTANCE.provider.getMessageParser();
+        return PROVIDER.getMessageParser();
     }
 
     public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
+        return PROVIDER.getConfigConfiguration();
     }
 }

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java

@@ -19,28 +19,45 @@ public class ModLoadingContext
 {
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
+    private ModContainer activeContainer;
     private Object languageExtension;
     private ModLoadingStage stage;
 
+    /**
+     * @deprecated Use the context provided by your language loader in your mod's constructor.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public static ModLoadingContext get() {
         return context.get();
     }
 
-    private ModContainer activeContainer;
-
+    /**
+     * @deprecated Going to be moved to ForgeHooks for internal use.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public void setActiveContainer(final ModContainer container) {
         this.activeContainer = container;
         this.languageExtension = container == null ? null : container.contextExtension.get();
     }
 
+    /**
+     * Going to be moved to ForgeHooks for internal use.
+     * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
+     */
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public ModContainer getActiveContainer() {
         return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
     }
 
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public String getActiveNamespace() {
         return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
     }
 
+    public ModContainer getContainer() {
+        return getActiveContainer();
+    }
+
     /**
      * Register an {@link IExtensionPoint} with the mod container.
      * @param point The extension point to register
@@ -48,7 +65,7 @@ public class ModLoadingContext
      * @param <T> The type signature of the extension operator
      */
     public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getActiveContainer().registerExtensionPoint(point, extension);
+        getContainer().registerExtensionPoint(point, extension);
     }
 
     /**
@@ -57,7 +74,7 @@ public class ModLoadingContext
      * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
      */
     public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        getActiveContainer().registerDisplayTest(() -> displayTest);
+        getContainer().registerDisplayTest(() -> displayTest);
     }
 
     /**
@@ -66,7 +83,7 @@ public class ModLoadingContext
      * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
      */
     public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        getActiveContainer().registerDisplayTest(displayTest);
+        getContainer().registerDisplayTest(displayTest);
     }
 
     /**
@@ -76,7 +93,7 @@ public class ModLoadingContext
      * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
      */
     public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
     }
 
     /**
@@ -86,32 +103,31 @@ public class ModLoadingContext
      * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
      */
     public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
+        getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
         if (spec.isEmpty())
         {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
+            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
             return;
         }
 
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
+        getContainer().addConfig(new ModConfig(type, spec, getContainer()));
     }
 
     public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
         if (spec.isEmpty())
         {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
+            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
             return;
         }
 
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
+        getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
     }
 
-
     @SuppressWarnings("unchecked")
     public <T> T extension() {
         return (T)languageExtension;

fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java

@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;
 
 public class PerformanceInfo {
+    private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
 
     private final boolean showCPUUsage;
     private final OperatingSystemMXBean osBean;
-    private final MemoryMXBean memoryBean;
 
     private float memory;
     private String text;
@@ -24,15 +24,14 @@ public class PerformanceInfo {
     PerformanceInfo() {
         showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
         osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
-        memoryBean = ManagementFactory.getMemoryMXBean();
     }
 
     void update() {
-        final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
+        final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
         memory = (float) heapusage.getUsed() / heapusage.getMax();
 
         if (!showCPUUsage) {
-            text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
+            text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
             return;
         }
 
@@ -44,7 +43,7 @@ public class PerformanceInfo {
             cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
         }
 
-        text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB  %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
+        text = "Memory: %d/%dMB (%.1f%%)  %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
     }
 
     String text() {

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/CapabilityTokenSubclass.java

@@ -36,9 +36,9 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
  */
 public class CapabilityTokenSubclass implements ILaunchPluginService {
 
-    private final String FUNC_NAME = "getType";
-    private final String FUNC_DESC = "()Ljava/lang/String;";
-    private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
+    private static final String FUNC_NAME = "getType";
+    private static final String FUNC_DESC = "()Ljava/lang/String;";
+    private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
 
     @Override
     public String name() {
@@ -51,7 +51,14 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
     @Override
     public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
     {
-        return isEmpty ? NAY : YAY;
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
+            return NAY;
+        
+        return YAY;
     }
 
     @Override
@@ -75,7 +82,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
             SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
             reader.accept(new SignatureVisitor(Opcodes.ASM9)
             {
-                Deque<String> stack = new ArrayDeque<>();
+                final Deque<String> stack = new ArrayDeque<>();
 
                 @Override
                 public void visitClassType(final String name)
@@ -113,7 +120,7 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
         }
     }
 
-    private static class Holder {
+    private static final class Holder {
         String value;
     }
 

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/ObjectHolderDefinalize.java

@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -35,7 +36,11 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
             new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
             new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
     ).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
-    private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
+            .map(it -> it.replace('.', '/'))
+            .collect(Collectors.toUnmodifiableSet());
+    private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
+    private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
 
     @Override
     public String name() {
@@ -46,13 +51,29 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
     @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        // Let's skip processing classes that definitely don't have object holders
+        String internalName = classType.getInternalName();
+
+        // Forge classes that aren't in the debug package (that package is used for tests)
+        if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
+            return NAY;
+
+        // Vanilla classes that don't have object holders
+        if (internalName.startsWith("com/mojang/"))
+            return NAY;
+
+        // ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
+        if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
+            return NAY;
+
+        return YAY;
     }
 
-    private boolean hasHolder(List<AnnotationNode> lst)
-    {
+    private boolean hasHolder(List<AnnotationNode> lst) {
         return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
     }
 
@@ -76,10 +97,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
     {
         final AtomicBoolean changes = new AtomicBoolean();
         //Must be public static finals, and non-array objects
-        final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
 
         //Fix Annotated Fields before injecting from class level
-        classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
+        classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
         {
             int prev = f.access;
             f.access &= ~Opcodes.ACC_FINAL; //Strip final
@@ -89,7 +109,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
 
         if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
         {
-            classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
+            classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
             {
                 int prev = f.access;
                 f.access &= ~Opcodes.ACC_FINAL;

fmlloader/src/main/java/net/minecraftforge/fml/common/asm/RuntimeEnumExtender.java

@@ -28,15 +28,16 @@ import org.slf4j.Logger;
 public class RuntimeEnumExtender implements ILaunchPluginService {
 
     private static final Logger LOGGER = LogUtils.getLogger();
-    private final Type STRING = Type.getType(String.class);
-    private final Type ENUM = Type.getType(Enum.class);
-    private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
-    private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
-    private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
-    private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
-    private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
-    private final String NAME_DESC = Type.getMethodDescriptor(STRING);
-    private final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
+    private static final Type STRING = Type.getType(String.class);
+    private static final Type ENUM = Type.getType(Enum.class);
+    private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
+    private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
+    private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
+    private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
+    private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
+    private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
+    private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
+    private static final int FLAGS = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
 
     @Override
     public String name() {
@@ -47,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
     @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
+            return NAY;
+
+        return YAY;
     }
 
     @Override
@@ -58,25 +65,24 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
         if ((classNode.access & Opcodes.ACC_ENUM) == 0)
             return ComputeFlags.NO_REWRITE;
 
-        Type array = Type.getType("[" + classType.getDescriptor());
-        final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
-
-        FieldNode values = classNode.fields.stream().filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst().orElse(null);
-
-        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
+        if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
             return ComputeFlags.NO_REWRITE;
-        }
+
+        Type array = Type.getType("[" + classType.getDescriptor());
+        String arrayDesc = array.getDescriptor();
+
+        FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
 
         //Static methods named "create" with first argument as a string
         List<MethodNode> candidates = classNode.methods.stream()
                 .filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
-                .collect(Collectors.toList());
+                .toList();
 
         if (candidates.isEmpty()) {
             throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
         }
 
-        candidates.forEach(mtd ->
+        for (var mtd : candidates)
         {
             Type[] args = Type.getArgumentTypes(mtd.desc);
             if (args.length == 0 || !args[0].equals(STRING)) {
@@ -108,8 +114,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
             Type[] ctrArgs = new Type[args.length + 1];
             ctrArgs[0] = STRING;
             ctrArgs[1] = Type.INT_TYPE;
-            for (int x = 1; x < args.length; x++)
-                ctrArgs[1 + x] = args[x];
+            System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);
 
             String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
 
@@ -231,7 +236,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
                 ins.load(vars, classType);
                 ins.areturn(classType);
             }
-        });
+        }
         return ComputeFlags.COMPUTE_FRAMES;
     }
 

fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java

@@ -57,6 +57,9 @@ public class FMLLoader {
         LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
         LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
 
+        // Allows us to communicate properties with other services through ModLauncher
+        setupBlackboardKeys();
+
         checkPackage(ITransformationService.class, "4.0", "ModLauncher");
         accessTransformer  = getPlugin(env, "accesstransformer",  "1.0", "AccessTransformer");
         /*eventBus       =*/ getPlugin(env, "eventbus",           "1.0", "EventBus");
@@ -120,6 +123,12 @@ public class FMLLoader {
           return providers.get(0);
     }
 
+    private static void setupBlackboardKeys() {
+        LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
+        var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
+        Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
+    }
+
     static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) {
         final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
         arguments.put("launchTarget", launchTarget);

fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java

@@ -173,7 +173,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService
         return unpacked;
     }
 
-    private boolean remove(final List<AnnotationNode> anns, final String side)
+    private static boolean remove(final List<AnnotationNode> anns, final String side)
     {
         var onlyIns = unpack(anns);
 
@@ -193,7 +193,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService
         return false;
     }
 
-    private boolean hasOnlyInWithModAnnotation(final List<AnnotationNode> anns)
+    private static boolean hasOnlyInWithModAnnotation(final List<AnnotationNode> anns)
     {
         if (anns == null)
         {
@@ -231,9 +231,15 @@ public class RuntimeDistCleaner implements ILaunchPluginService
     private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
 
     @Override
-    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
-    {
-        return isEmpty ? NAY : YAY;
+    public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
+        if (isEmpty)
+            return NAY;
+
+        String internalName = classType.getInternalName();
+        if (internalName.startsWith("net/minecraftforge/"))
+            return NAY;
+
+        return YAY;
     }
 
     private static class LambdaGatherer extends MethodVisitor {

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java

@@ -42,6 +42,11 @@ public abstract class AbstractModProvider implements IModProvider {
 
     @Nullable
     protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
+        return createMod(path, false, getDefaultJarModType());
+    }
+
+    @Nullable
+    protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
         var mjm = new ModJarMetadata();
         var sj = SecureJar.from(
             jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
@@ -51,7 +56,7 @@ public abstract class AbstractModProvider implements IModProvider {
         IModFile mod;
         var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
         if (type == null)
-            type = getDefaultJarModType();
+            type = defaultType;
 
         if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
             LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java

@@ -83,7 +83,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
             final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
             final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
             final Path pathInFS = zipFS.getPath("/");
-            return Optional.of(createMod(pathInFS).file());
+            final IModFile.Type parentType = file.getType();
+            final String modType;
+            if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
+                modType = IModFile.Type.LIBRARY.name();
+            } else {
+                modType = IModFile.Type.GAMELIBRARY.name();
+            }
+            return Optional.of(createMod(pathInFS, false, modType).file());
         } catch (Exception e) {
             LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
             final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java

@@ -48,7 +48,7 @@ class Scanner {
         try (InputStream in = Files.newInputStream(path)){
             ModClassVisitor mcv = new ModClassVisitor();
             ClassReader cr = new ClassReader(in);
-            cr.accept(mcv, 0);
+            cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
             mcv.buildData(result.getClasses(), result.getAnnotations());
         } catch (IOException | IllegalArgumentException e) {
             // mark path bad

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 /**
  * Automatic eventbus subscriber - reads {@link EventBusSubscriber}
- * annotations and passes the class instances to the {@link nBus}
+ * annotations and passes the class instances to the {@link Bus}
  * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
  */
 public class AutomaticEventSubscriber {

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLoadingContext.java

@@ -8,7 +8,7 @@ package net.minecraftforge.fml.javafmlmod;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;
 
-public class FMLJavaModLoadingContext
+public class FMLJavaModLoadingContext extends ModLoadingContext
 {
     private final FMLModContainer container;
 
@@ -24,11 +24,18 @@ public class FMLJavaModLoadingContext
         return container.getEventBus();
     }
 
+    @Override
+    public FMLModContainer getContainer() {
+        return container;
+    }
 
     /**
      * Helper to get the right instance from the {@link ModLoadingContext} correctly.
      * @return The FMLJavaMod language specific extension from the ModLoadingContext
+     *
+     * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
      */
+    @Deprecated(forRemoval = true, since = "1.21.1")
     public static FMLJavaModLoadingContext get() {
         return ModLoadingContext.get().extension();
     }

javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java

@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,6 +33,7 @@ public class FMLModContainer extends ModContainer {
     private final IEventBus eventBus;
     private Object modInstance;
     private final Class<?> modClass;
+    private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
 
     public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) {
         super(info);
@@ -40,9 +42,7 @@ public class FMLModContainer extends ModContainer {
         activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
         this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
         this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
-        final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
-        this.contextExtension = () -> contextExtension;
-
+        this.contextExtension = () -> context;
 
         try {
             var moduleName = info.getOwningFile().moduleName();
@@ -63,7 +63,13 @@ public class FMLModContainer extends ModContainer {
     private void constructMod() {
         try {
             LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
-            this.modInstance = modClass.getDeclaredConstructor().newInstance();
+            Constructor<?> constructor;
+            try {
+                constructor = modClass.getDeclaredConstructor(context.getClass());
+            } catch (NoSuchMethodException | SecurityException exception) {
+                constructor = modClass.getDeclaredConstructor();
+            }
+            this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
             LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
         } catch (Throwable e) {
             // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the

mdk/build.gradle

@@ -141,9 +141,6 @@ dependencies {
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    
-    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+ 
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -197,6 +194,10 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
+// IntelliJ no longer downloads javadocs and sources by default.
+// This tells Gradle to force IDEA to do it.
+idea.module { downloadJavadoc = downloadSources = true }
+
 eclipse {
     // Run everytime eclipse builds the code
     //autoBuildTasks genEclipseRuns

mdk/src/main/java/com/example/examplemod/ExampleMod.java

@@ -18,7 +18,6 @@ import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -61,9 +60,9 @@ public class ExampleMod
                 output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
             }).build());
 
-    public ExampleMod()
+    public ExampleMod(FMLJavaModLoadingContext context)
     {
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        IEventBus modEventBus = context.getModEventBus();
 
         // Register the commonSetup method for modloading
         modEventBus.addListener(this::commonSetup);
@@ -82,7 +81,7 @@ public class ExampleMod
         modEventBus.addListener(this::addCreative);
 
         // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
-        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC);
+        context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
     }
 
     private void commonSetup(final FMLCommonSetupEvent event)

patches/minecraft/net/minecraft/client/gui/Gui.java.patch

@@ -46,30 +46,28 @@
          this.minecraft.getProfiler().push("selectedItemName");
          if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
              MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
-@@ -642,9 +_,10 @@
+@@ -642,9 +_,13 @@
                  mutablecomponent.withStyle(ChatFormatting.ITALIC);
              }
  
 -            int i = this.getFont().width(mutablecomponent);
 +            Component highlightTip = this.lastToolHighlight.getHighlightTip(mutablecomponent);
-+            int i = this.getFont().width(highlightTip);
++            Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
++            if (font == null)
++                font = this.getFont();
++            int i = font.width(highlightTip);
              int j = (p_283501_.guiWidth() - i) / 2;
 -            int k = p_283501_.guiHeight() - 59;
 +            int k = p_283501_.guiHeight() - Math.max(yShift, 59);
              if (!this.minecraft.gameMode.canHurtPlayer()) {
                  k += 14;
              }
-@@ -657,6 +_,13 @@
+@@ -656,7 +_,7 @@
+ 
              if (l > 0) {
                  p_283501_.fill(j - 2, k - 2, j + i + 2, k + 9 + 2, this.minecraft.options.getBackgroundColor(0));
-                 p_283501_.drawString(this.getFont(), mutablecomponent, j, k, 16777215 + (l << 24));
-+                Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
-+                if (font == null) {
-+                    p_283501_.drawString(this.getFont(), highlightTip, j, k, 16777215 + (l << 24));
-+                } else {
-+                    j = (p_283501_.guiWidth() - font.width(highlightTip)) / 2;
-+                    p_283501_.drawString(font, highlightTip, j, k, 16777215 + (l << 24));
-+                }
+-                p_283501_.drawString(this.getFont(), mutablecomponent, j, k, 16777215 + (l << 24));
++                p_283501_.drawString(font, highlightTip, j, k, 16777215 + (l << 24));
              }
          }
  

patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch

@@ -70,7 +70,7 @@
          this.renderTooltipInternal(p_283128_, list, p_283678_, p_281696_, DefaultTooltipPositioner.INSTANCE);
      }
  
-@@ -930,7 +_,15 @@
+@@ -930,7 +_,22 @@
      }
  
      public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
@@ -83,6 +83,13 @@
 +        this.tooltipStack = stack;
 +        List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
 +        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
++        this.tooltipStack = ItemStack.EMPTY;
++    }
++
++    public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
++        this.tooltipStack = stack;
++        List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
++        this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
 +        this.tooltipStack = ItemStack.EMPTY;
      }
  

patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch

@@ -52,7 +52,7 @@
      public static RenderType getRenderType(ItemStack p_109280_, boolean p_109281_) {
          Item item = p_109280_.getItem();
          if (item instanceof BlockItem) {
-@@ -391,11 +_,74 @@
+@@ -391,11 +_,79 @@
      }
  
      public static RenderType getRenderLayer(FluidState p_109288_) {
@@ -65,6 +65,11 @@
          renderCutout = p_109292_;
 +    }
 +
++    /** Forge: Check if we are running in {@linkplain net.minecraft.client.Minecraft#useFancyGraphics() fancy graphics} to account for fast graphics render types */
++    public static boolean isFancy() {
++        return renderCutout;
++    }
++
 +    private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.cutoutMipped());
 +    private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.solid());
 +    private static final Map<net.minecraft.core.Holder.Reference<Block>, net.minecraftforge.client.ChunkRenderTypeSet> BLOCK_RENDER_TYPES = Util.make(new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(TYPE_BY_BLOCK.size(), 0.5F), map -> {
@@ -81,7 +86,7 @@
 +    });
 +
 +    /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
-+    @Deprecated(since = "1.19")
++    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
 +       Block block = state.getBlock();
 +       if (block instanceof LeavesBlock) {
@@ -92,20 +97,20 @@
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(since = "1.19")
++    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static void setRenderLayer(Block block, RenderType type) {
 +       com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
 +       setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(since = "1.19")
++    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
 +       setRenderLayer(block, createSetFromPredicate(predicate));
 +    }
 +
 +    /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+    @Deprecated(since = "1.19")
++    @Deprecated(since = "1.21.4", forRemoval = true)
 +    public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
 +       checkClientLoading();
 +       BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);

patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch

@@ -123,13 +123,13 @@
              profilerfiller.popPush("outline");
              BlockPos blockpos1 = ((BlockHitResult)hitresult).getBlockPos();
              BlockState blockstate = this.level.getBlockState(blockpos1);
-+            if (!net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, p_254120_, multibuffersource$buffersource))
++            if (!net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, posestack, multibuffersource$buffersource))
              if (!blockstate.isAir() && this.level.getWorldBorder().isWithinBounds(blockpos1)) {
                  VertexConsumer vertexconsumer2 = multibuffersource$buffersource.getBuffer(RenderType.lines());
                  this.renderHitOutline(posestack, vertexconsumer2, p_109604_.getEntity(), d0, d1, d2, blockpos1, blockstate);
              }
 +        } else if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) {
-+            net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, p_254120_, multibuffersource$buffersource);
++            net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, posestack, multibuffersource$buffersource);
          }
  
          this.minecraft.debugRenderer.render(posestack, multibuffersource$buffersource, d0, d1, d2);

patches/minecraft/net/minecraft/client/renderer/entity/EntityRenderer.java.patch

@@ -7,7 +7,7 @@
 -        if (this.shouldShowName(p_114485_)) {
 -            this.renderNameTag(p_114485_, p_114485_.getDisplayName(), p_114488_, p_114489_, p_114490_, p_114487_);
 +        var event = net.minecraftforge.client.event.ForgeEventFactoryClient.fireRenderNameTagEvent(p_114485_, p_114485_.getDisplayName(), this, p_114488_, p_114489_, p_114490_, p_114487_);
-+        if (event.getResult() != net.minecraftforge.eventbus.api.Event.Result.DENY && (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || this.shouldShowName(p_114485_))) {
++        if (!event.getResult().isDenied() && (event.getResult().isAllowed() || this.shouldShowName(p_114485_))) {
 +           this.renderNameTag(p_114485_, event.getContent(), p_114488_, p_114489_, p_114490_, p_114487_);
          }
      }

patches/minecraft/net/minecraft/client/renderer/entity/FallingBlockRenderer.java.patch

@@ -1,11 +1,12 @@
 --- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
 +++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
-@@ -34,20 +_,25 @@
+@@ -34,20 +_,26 @@
                  p_114637_.pushPose();
                  BlockPos blockpos = BlockPos.containing(p_114634_.getX(), p_114634_.getBoundingBox().maxY, p_114634_.getZ());
                  p_114637_.translate(-0.5, 0.0, -0.5);
 +                var model = this.dispatcher.getBlockModel(blockstate);
 +                for (var renderType : model.getRenderTypes(blockstate, RandomSource.create(blockstate.getSeed(p_114634_.getStartPos())), net.minecraftforge.client.model.data.ModelData.EMPTY)) {
++                renderType = net.minecraftforge.client.RenderTypeHelper.getMovingBlockRenderType(renderType);
                  this.dispatcher
                      .getModelRenderer()
                      .tesselateBlock(

patches/minecraft/net/minecraft/client/renderer/texture/SpriteLoader.java.patch

@@ -5,7 +5,7 @@
          int k1 = Mth.log2(j1);
          int l1;
 -        if (k1 < p_261919_) {
-+        if (false) { // Forge: Do not lower the mipmap level
++        if (k1 < p_261919_ && net.minecraftforge.common.ForgeConfig.CLIENT.allowMipmapLowering()) { // Forge: Do not lower the mipmap level
              LOGGER.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.location, p_261919_, k1, j1);
              l1 = k1;
          } else {

patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java.patch

@@ -1,74 +1,142 @@
 --- a/net/minecraft/client/resources/model/SimpleBakedModel.java
 +++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
-@@ -26,6 +_,15 @@
+@@ -26,7 +_,32 @@
      protected final TextureAtlasSprite particleIcon;
      protected final ItemTransforms transforms;
      protected final ItemOverrides overrides;
+-
++    /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +    protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
++    /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
++    protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
++    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +    protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
++    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
++    protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
++    /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
 +    protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
++    /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
++    protected final boolean isRenderingCutout;
 +
-+    /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
++    /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
 +    @Deprecated
 +    public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
 +        this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
 +    }
- 
++
++    /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup for fast graphics} **/
++    @Deprecated(forRemoval = true, since = "1.21.4")
++    public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
++        this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
++    }
++
++    /** Constructor with {@link net.minecraftforge.client.RenderTypeGroup RenderTypeGroup} for fancy and fast graphics. Preferred over {@link net.minecraft.client.renderer.ItemBlockRenderTypes#setRenderLayer(net.minecraft.world.level.block.Block, net.minecraft.client.renderer.RenderType) ItemBlockRenderTypes.setRenderLayer(Block, RenderType)}. */
      public SimpleBakedModel(
          List<BakedQuad> p_119489_,
-@@ -35,7 +_,8 @@
+         Map<Direction, List<BakedQuad>> p_119490_,
+@@ -35,7 +_,9 @@
          boolean p_119493_,
          TextureAtlasSprite p_119494_,
          ItemTransforms p_119495_,
 -        ItemOverrides p_119496_
 +        ItemOverrides p_119496_,
-+        net.minecraftforge.client.RenderTypeGroup renderTypes
++        net.minecraftforge.client.RenderTypeGroup renderTypes,
++        net.minecraftforge.client.RenderTypeGroup renderTypesFast
      ) {
          this.unculledFaces = p_119489_;
          this.culledFaces = p_119490_;
-@@ -45,6 +_,9 @@
+@@ -45,6 +_,15 @@
          this.particleIcon = p_119494_;
          this.transforms = p_119495_;
          this.overrides = p_119496_;
-+        this.blockRenderTypes = !renderTypes.isEmpty() ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
-+        this.itemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entity()) : null;
-+        this.fabulousItemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entityFabulous()) : null;
++
++        boolean hasRenderTypes = renderTypes != null && !renderTypes.isEmpty();
++        boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
++        this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
++        this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
++        this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
++        this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
++        this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
++        this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.cutout() || renderTypes.block() == net.minecraft.client.renderer.RenderType.cutoutMipped());
      }
  
      @Override
-@@ -87,6 +_,25 @@
+@@ -87,6 +_,38 @@
          return this.overrides;
      }
  
++    private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.solid());
++    private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.solid());
++
 +    @Override
 +    public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(BlockState state, RandomSource rand, net.minecraftforge.client.model.data.ModelData data) {
-+       return blockRenderTypes != null ? blockRenderTypes : BakedModel.super.getRenderTypes(state, rand, data);
++        if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
++            if (blockRenderTypesFast != null)
++                return blockRenderTypesFast;
++            if (isRenderingCutout && state.getBlock() instanceof net.minecraft.world.level.block.LeavesBlock)
++                return SOLID_BLOCK;
++        }
++        return blockRenderTypes != null ? blockRenderTypes : BakedModel.super.getRenderTypes(state, rand, data);
 +    }
 +
 +    @Override
 +    public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
-+       if (!fabulous) {
-+          if (itemRenderTypes != null) {
-+              return itemRenderTypes;
-+          }
-+       } else {
-+          if (fabulousItemRenderTypes != null) {
-+              return fabulousItemRenderTypes;
-+          }
-+       }
-+       return BakedModel.super.getRenderTypes(itemStack, fabulous);
++        if (!fabulous) {
++            if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
++                if (itemRenderTypesFast != null)
++                    return itemRenderTypesFast;
++                if (isRenderingCutout && itemStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.getBlock() instanceof net.minecraft.world.level.block.LeavesBlock)
++                    return SOLID_BLOCK_ITEM;
++            }
++            if (itemRenderTypes != null)
++                return itemRenderTypes;
++        } else {
++            if (fabulousItemRenderTypes != null)
++                return fabulousItemRenderTypes;
++        }
++        return BakedModel.super.getRenderTypes(itemStack, fabulous);
 +    }
 +
      @OnlyIn(Dist.CLIENT)
      public static class Builder {
          private final List<BakedQuad> unculledFaces = Lists.newArrayList();
-@@ -133,12 +_,18 @@
+@@ -133,12 +_,49 @@
              return this;
          }
  
 +        private net.minecraftforge.client.RenderTypeGroup renderTypes = net.minecraftforge.client.RenderTypeGroup.EMPTY;
++        private net.minecraftforge.client.RenderTypeGroup renderTypesFast = net.minecraftforge.client.RenderTypeGroup.EMPTY;
++
++        /**
++         * Sets the render type to be used for this model, and will be used for any graphics setting.
++         * <p>
++         * If you need to set a specific render type for
++         * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}, consider using
++         * {@link #renderTypes(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
++         * renderTypes(RenderTypeGroup, RenderTypeGroup)} instead which allows choosing render types for both fancy and
++         * fast graphics.
++         *
++         * @apiNote If this model is for {@linkplain net.minecraft.world.level.block.LeavesBlock leaves} and if the
++         * given render type is either {@linkplain net.minecraft.client.renderer.RenderType#cutout() cutout} or
++         * {@linkplain net.minecraft.client.renderer.RenderType#cutoutMipped() cutout mipped}, it will be overridden
++         * with {@linkplain net.minecraft.client.renderer.RenderType#solid() solid} when fast graphics is enabled.
++         * @see #renderTypes(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
++         * renderTypes(RenderTypeGroup, RenderTypeGroup)
++         */
 +        public SimpleBakedModel.Builder renderTypes(net.minecraftforge.client.RenderTypeGroup renderTypes) {
++            return this.renderTypes(renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
++        }
++
++        /**
++         * Sets the render types to be used for this model: one for
++         * {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} and one for
++         * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
++         *
++         * @see #renderTypes(net.minecraftforge.client.RenderTypeGroup)
++         */
++        public SimpleBakedModel.Builder renderTypes(net.minecraftforge.client.RenderTypeGroup renderTypes, net.minecraftforge.client.RenderTypeGroup renderTypesFast) {
 +            this.renderTypes = renderTypes;
++            this.renderTypesFast = renderTypesFast;
 +            return this;
 +        }
 +
@@ -78,7 +146,8 @@
              } else {
                  return new SimpleBakedModel(
 -                    this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides
-+                    this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides, this.renderTypes
++                    // Forge: Account for render types in model JSONs
++                    this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides, this.renderTypes, this.renderTypesFast
                  );
              }
          }

patches/minecraft/net/minecraft/gametest/framework/GameTestHelper.java.patch

@@ -9,3 +9,29 @@
      private final GameTestInfo testInfo;
      private boolean finalCheckAdded;
  
+@@ -933,5 +_,25 @@
+         if (either.right().isPresent()) {
+             this.fail("Failed to set biome for test");
+         }
++    }
++
++    /**
++     * Adds a cleanup handler that will be called when the test is done, pass or fail.
++     */
++    public void addCleanup(Consumer<Boolean> handler) {
++        this.testInfo.addListener(new GameTestListener() {
++            @Override
++            public void testPassed(GameTestInfo info, GameTestRunner runner) {
++                handler.accept(true);
++            }
++
++            @Override
++            public void testFailed(GameTestInfo info, GameTestRunner runner) {
++                handler.accept(false);
++            }
++
++            @Override public void testStructureLoaded(GameTestInfo info) { }
++            @Override public void testAddedForRerun(GameTestInfo oldInfo, GameTestInfo newInfo, GameTestRunner runner) { }
++        });
+     }
+ }

patches/minecraft/net/minecraft/resources/HolderSetCodec.java.patch

@@ -39,6 +39,15 @@
                                  );
                              return dataresult.map(p_326149_ -> Pair.of((HolderSet<E>)p_326149_, (T)p_326147_.getSecond()));
                          }
+@@ -90,7 +_,7 @@
+     }
+ 
+     private <T> DataResult<Pair<HolderSet<E>, T>> decodeWithoutRegistry(DynamicOps<T> p_206671_, T p_206672_) {
+-        return this.elementCodec.listOf().decode(p_206671_, p_206672_).flatMap(p_206666_ -> {
++        return this.homogenousListCodec.decode(p_206671_, p_206672_).flatMap(p_206666_ -> { // Forge: Match encodeWithoutRegistry's use of the homogenousListCodec
+             List<Holder.Direct<E>> list = new ArrayList<>();
+ 
+             for (Holder<E> holder : p_206666_.getFirst()) {
 @@ -106,6 +_,9 @@
      }
  

patches/minecraft/net/minecraft/resources/RegistryDataLoader.java.patch

@@ -46,17 +46,26 @@
          RegistryOps<JsonElement> p_332135_,
          ResourceKey<E> p_332850_,
          Resource p_335244_,
-@@ -197,7 +_,14 @@
+@@ -197,7 +_,23 @@
      ) throws IOException {
          try (Reader reader = p_335244_.openAsReader()) {
              JsonElement jsonelement = JsonParser.parseReader(reader);
 -            DataResult<E> dataresult = p_333909_.parse(p_332135_, jsonelement);
 +
 +            var result = p_333909_.decode(p_332135_, jsonelement);
-+            if (result.result().map(p -> p.getFirst()).isEmpty()) {
-+               LOGGER.debug("Skipping {} conditions not met", p_332850_);
-+               return;
++
++            if (result.isError()) {
++                LOGGER.error("Couldn't parse data file {}: {}", p_332850_, result.error().get().message());
++                throw new IllegalStateException("Couldn't parse data file " + p_332850_ + ": " + result.error().get().message());
 +            }
++
++            var mappedResult = result.result().map(a -> a.getFirst());
++
++            if (mappedResult.get().isEmpty()) {
++                LOGGER.debug("Skipping {} conditions not met", p_332850_);
++                return;
++            }
++
 +            DataResult<E> dataresult = result.map(p -> p.mapFirst(Optional::get)).map(p -> p.getFirst());
 +
              E e = dataresult.getOrThrow();

patches/minecraft/net/minecraft/resources/ResourceLocation.java.patch

@@ -1,5 +1,29 @@
 --- a/net/minecraft/resources/ResourceLocation.java
 +++ b/net/minecraft/resources/ResourceLocation.java
+@@ -38,6 +_,8 @@
+         this.path = p_249394_;
+     }
+ 
++    /** @deprecated Forge: Consider using {@link #fromNamespaceAndPath(String, String)} instead, as Mojang made this constructor private in 1.21 */
++    @Deprecated(forRemoval = true, since = "1.20.6")
+     public ResourceLocation(String p_135811_, String p_135812_) {
+         this(assertValidNamespace(p_135811_, p_135812_), assertValidPath(p_135811_, p_135812_), null);
+     }
+@@ -46,10 +_,14 @@
+         this(p_135814_[0], p_135814_[1]);
+     }
+ 
++    /** @deprecated Forge: Consider using {@link #parse(String)} instead, as Mojang made this constructor private in 1.21 */
++    @Deprecated(forRemoval = true, since = "1.20.6")
+     public ResourceLocation(String p_135809_) {
+         this(decompose(p_135809_, ':'));
+     }
+ 
++    /** @deprecated Forge: Consider using {@link #bySeparator(String, char)} instead, as Mojang removed this method in 1.21 */
++    @Deprecated(forRemoval = true, since = "1.20.6")
+     public static ResourceLocation of(String p_135823_, char p_135824_) {
+         return new ResourceLocation(decompose(p_135823_, p_135824_));
+     }
 @@ -147,6 +_,12 @@
          return i;
      }
@@ -13,3 +37,55 @@
      public String toDebugFileName() {
          return this.toString().replace('/', '_').replace(':', '_');
      }
+@@ -278,6 +_,51 @@
+ 
+         public JsonElement serialize(ResourceLocation p_135855_, Type p_135856_, JsonSerializationContext p_135857_) {
+             return new JsonPrimitive(p_135855_.toString());
++        }
++    }
++
++    /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String, String)}. */
++    public static ResourceLocation fromNamespaceAndPath(String namespace, String path) {
++        return new ResourceLocation(namespace, path);
++    }
++
++    /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String)}. */
++    public static ResourceLocation parse(String location) {
++        return new ResourceLocation(location);
++    }
++
++    /**
++     * Forge: This is a backported method from 1.21, and acts as an alternative to using {@link #parse(String)}. If you
++     * know for sure you are going to be using the {@linkplain #DEFAULT_NAMESPACE default namespace}
++     * ({@code "minecraft"}), use this.
++     */
++    public static ResourceLocation withDefaultNamespace(String path) {
++        return new ResourceLocation(DEFAULT_NAMESPACE, assertValidPath(DEFAULT_NAMESPACE, path), null);
++    }
++
++    /** Forge: This is a backported method from 1.21, and is the replacement for {@link #of(String, char)}. */
++    public static ResourceLocation bySeparator(String location, char separator) {
++        return of(location, separator);
++    }
++
++    /**
++     * Forge: This is a backported method from 1.21, and is the same as {@link #bySeparator(String, char)} but returns
++     * {@code null} if a resource location cannot be created.
++     */
++    public static @Nullable ResourceLocation tryBySeparator(String location, char separator) {
++        int i = location.indexOf(separator);
++        if (i >= 0) {
++            String s = location.substring(i + 1);
++            if (!isValidPath(s)) {
++                return null;
++            } else if (i != 0) {
++                String s1 = location.substring(0, i);
++                return isValidNamespace(s1) ? new ResourceLocation(s1, s, null) : null;
++            } else {
++                return new ResourceLocation(DEFAULT_NAMESPACE, s, null);
++            }
++        } else {
++            return isValidPath(location) ? new ResourceLocation(DEFAULT_NAMESPACE, location, null) : null;
+         }
+     }
+ }

patches/minecraft/net/minecraft/server/ReloadableServerResources.java.patch

@@ -26,7 +26,7 @@
                  p_326196_ -> {
                      ReloadableServerResources reloadableserverresources = new ReloadableServerResources(p_326196_.compositeAccess(), p_250212_, p_249301_, p_251126_);
 +                    var listeners = new java.util.ArrayList<>(reloadableserverresources.listeners());
-+                    listeners.addAll(net.minecraftforge.event.ForgeEventFactory.onResourceReload(reloadableserverresources, p_330376_.compositeAccess()));
++                    listeners.addAll(net.minecraftforge.event.ForgeEventFactory.onResourceReload(reloadableserverresources, reloadableserverresources.registryLookup, p_330376_.compositeAccess()));
                      return SimpleReloadInstance.create(
 -                            p_248588_, reloadableserverresources.listeners(), p_249136_, p_249601_, DATA_RELOAD_INITIAL_TASK, LOGGER.isDebugEnabled()
 +                            p_248588_, listeners, p_249136_, p_249601_, DATA_RELOAD_INITIAL_TASK, LOGGER.isDebugEnabled()

patches/minecraft/net/minecraft/server/level/ServerPlayerGameMode.java.patch

@@ -5,7 +5,7 @@
  
      public void handleBlockBreakAction(BlockPos p_215120_, ServerboundPlayerActionPacket.Action p_215121_, Direction p_215122_, int p_215123_, int p_215124_) {
 +        var event = net.minecraftforge.event.ForgeEventFactory.onLeftClickBlock(player, p_215120_, p_215122_, p_215121_);
-+        if (event.isCanceled() || (!this.isCreative() && event.getResult() == net.minecraftforge.eventbus.api.Event.Result.DENY)) {
++        if (event.isCanceled() || (!this.isCreative() && event.getResult().isDenied())) {
 +           return;
 +        }
          if (!this.player.canInteractWithBlock(p_215120_, 1.0)) {

patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,17 +1,5 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -437,9 +_,11 @@
-                 }
- 
-                 entity.absMoveTo(d3, d4, d5, f, f1);
-+                this.player.absMoveTo(d3, d4, d5, this.player.getYRot(), this.player.getXRot()); // Forge - Resync player position on vehicle moving
-                 boolean flag3 = serverlevel.noCollision(entity, entity.getBoundingBox().deflate(0.0625));
-                 if (flag && (flag2 || !flag3)) {
-                     entity.absMoveTo(d0, d1, d2, f, f1);
-+                    this.player.absMoveTo(d3, d4, d5, this.player.getYRot(), this.player.getXRot()); // Forge - Resync player position on vehicle moving
-                     this.send(new ClientboundMoveVehiclePacket(entity));
-                     return;
-                 }
 @@ -1005,9 +_,10 @@
          switch (serverboundplayeractionpacket$action) {
              case SWAP_ITEM_WITH_OFFHAND:

patches/minecraft/net/minecraft/server/players/PlayerList.java.patch

@@ -8,6 +8,14 @@
  
      public PlayerList(MinecraftServer p_203842_, LayeredRegistryAccess<RegistryLayer> p_251844_, PlayerDataStorage p_203844_, int p_203845_) {
          this.server = p_203842_;
+@@ -199,6 +_,7 @@
+         servergamepacketlistenerimpl.send(new ClientboundChangeDifficultyPacket(leveldata.getDifficulty(), leveldata.isDifficultyLocked()));
+         servergamepacketlistenerimpl.send(new ClientboundPlayerAbilitiesPacket(p_11263_.getAbilities()));
+         servergamepacketlistenerimpl.send(new ClientboundSetCarriedItemPacket(p_11263_.getInventory().selected));
++        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.OnDatapackSyncEvent(this, p_11263_));
+         servergamepacketlistenerimpl.send(new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getOrderedRecipes()));
+         this.sendPlayerPermissionLevel(p_11263_);
+         p_11263_.getStats().markAllDirty();
 @@ -267,6 +_,7 @@
          }
  

patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch

@@ -129,9 +129,9 @@
      }
  
      public boolean canBeAffected(MobEffectInstance p_21197_) {
-+        var event = net.minecraftforge.event.ForgeEventFactory.onLivingEffectCanApply(this, p_21197_);
-+        if (event.getResult() != net.minecraftforge.eventbus.api.Event.Result.DEFAULT) {
-+            return event.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW;
++        var eventResult = net.minecraftforge.event.ForgeEventFactory.onLivingEffectCanApply(this, p_21197_).getResult();
++        if (!eventResult.isDefault()) {
++            return eventResult.isAllowed();
 +        }
          if (this.getType().is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
              return !p_21197_.is(MobEffects.INFESTED);
@@ -524,14 +524,12 @@
              this.completeUsingItem();
          }
      }
-@@ -3032,8 +_,12 @@
+@@ -3032,8 +_,10 @@
      public void startUsingItem(InteractionHand p_21159_) {
          ItemStack itemstack = this.getItemInHand(p_21159_);
          if (!itemstack.isEmpty() && !this.isUsingItem()) {
 +            int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.getUseDuration());
-+            if (duration <= 0) {
-+                return;
-+            }
++            if (duration < net.minecraftforge.common.ForgeConfig.SERVER.getUseItemDuration()) return;
              this.useItem = itemstack;
 -            this.useItemRemaining = itemstack.getUseDuration();
 +            this.useItemRemaining = duration;

patches/minecraft/net/minecraft/world/entity/Shearable.java.patch

@@ -1,10 +1,18 @@
 --- a/net/minecraft/world/entity/Shearable.java
 +++ b/net/minecraft/world/entity/Shearable.java
-@@ -2,6 +_,7 @@
+@@ -2,8 +_,14 @@
  
  import net.minecraft.sounds.SoundSource;
  
-+/** @deprecated Use {@link net.minecraftforge.common.IForgeShearable} */
- public interface Shearable {
+-public interface Shearable {
++public interface Shearable extends net.minecraftforge.common.IForgeShearable {
++    /** @deprecated Use {@link net.minecraftforge.common.IForgeShearable#onSheared} */
      void shear(SoundSource p_21749_);
  
++    /** @deprecated Use {@link net.minecraftforge.common.IForgeShearable#isShearable} */
+     boolean readyForShearing();
++
++    default boolean isShearable(net.minecraft.world.item.ItemStack item, net.minecraft.world.level.Level level, net.minecraft.core.BlockPos pos) {
++        return readyForShearing();
++    }
+ }

patches/minecraft/net/minecraft/world/entity/animal/MushroomCow.java.patch

@@ -1,14 +1,5 @@
 --- a/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -42,7 +_,7 @@
- import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.level.gameevent.GameEvent;
- 
--public class MushroomCow extends Cow implements Shearable, VariantHolder<MushroomCow.MushroomType> {
-+public class MushroomCow extends Cow implements Shearable, VariantHolder<MushroomCow.MushroomType>, net.minecraftforge.common.IForgeShearable {
-     private static final EntityDataAccessor<String> DATA_TYPE = SynchedEntityData.defineId(MushroomCow.class, EntityDataSerializers.STRING);
-     private static final int MUTATE_CHANCE = 1024;
-     private static final String TAG_STEW_EFFECTS = "stew_effects";
 @@ -108,7 +_,7 @@
  
              this.playSound(soundevent, 1.0F, 1.0F);
@@ -55,7 +46,7 @@
      }
  
      @Override
-@@ -255,6 +_,17 @@
+@@ -255,6 +_,12 @@
          }
  
          return mushroomcow$mushroomtype2;
@@ -65,11 +56,6 @@
 +    public java.util.List<ItemStack> onSheared(@org.jetbrains.annotations.Nullable Player player, @org.jetbrains.annotations.NotNull ItemStack item, Level world, BlockPos pos, int fortune) {
 +        this.gameEvent(GameEvent.SHEAR, player);
 +        return shearInternal(player == null ? SoundSource.BLOCKS : SoundSource.PLAYERS);
-+    }
-+
-+    @Override
-+    public boolean isShearable(ItemStack item, Level world, BlockPos pos) {
-+       return readyForShearing();
      }
  
      public static enum MushroomType implements StringRepresentable {

patches/minecraft/net/minecraft/world/entity/animal/Sheep.java.patch

@@ -1,14 +1,5 @@
 --- a/net/minecraft/world/entity/animal/Sheep.java
 +++ b/net/minecraft/world/entity/animal/Sheep.java
-@@ -62,7 +_,7 @@
- import net.minecraft.world.level.storage.loot.BuiltInLootTables;
- import net.minecraft.world.level.storage.loot.LootTable;
- 
--public class Sheep extends Animal implements Shearable {
-+public class Sheep extends Animal implements Shearable, net.minecraftforge.common.IForgeShearable {
-     private static final int EAT_ANIMATION_TICKS = 40;
-     private static final EntityDataAccessor<Byte> DATA_WOOL_ID = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.BYTE);
-     private static final Map<DyeColor, ItemLike> ITEM_BY_DYE = Util.make(Maps.newEnumMap(DyeColor.class), p_29841_ -> {
 @@ -208,7 +_,7 @@
      @Override
      public InteractionResult mobInteract(Player p_29853_, InteractionHand p_29854_) {
@@ -44,18 +35,13 @@
              if (itementity != null) {
                  itementity.setDeltaMovement(
                      itementity.getDeltaMovement()
-@@ -375,5 +_,15 @@
+@@ -375,5 +_,10 @@
          craftingcontainer.setItem(0, new ItemStack(DyeItem.byColor(p_29832_)));
          craftingcontainer.setItem(1, new ItemStack(DyeItem.byColor(p_29833_)));
          return craftingcontainer;
 +    }
 +
 +    @Override
-+    public boolean isShearable(@org.jetbrains.annotations.NotNull ItemStack item, Level world, BlockPos pos) {
-+       return readyForShearing();
-+    }
-+
-+    @Override
 +    public java.util.List<ItemStack> onSheared(@Nullable Player player, ItemStack item, Level world, BlockPos pos, int fortune) {
 +       return shearInternal(player == null ? SoundSource.BLOCKS : SoundSource.PLAYERS);
      }

patches/minecraft/net/minecraft/world/entity/animal/SnowGolem.java.patch

@@ -36,16 +36,11 @@
              this.shear(SoundSource.PLAYERS);
              this.gameEvent(GameEvent.SHEAR, p_29920_);
              if (!this.level().isClientSide) {
-@@ -189,4 +_,21 @@
+@@ -189,4 +_,16 @@
      public Vec3 getLeashOffset() {
          return new Vec3(0.0, (double)(0.75F * this.getEyeHeight()), (double)(this.getBbWidth() * 0.4F));
      }
 +
-+    @Override
-+    public boolean isShearable(@org.jetbrains.annotations.NotNull ItemStack item, Level world, BlockPos pos) {
-+         return readyForShearing();
-+    }
-+
 +    @org.jetbrains.annotations.NotNull
 +    @Override
 +    public java.util.List<ItemStack> onSheared(@Nullable Player player, @org.jetbrains.annotations.NotNull ItemStack item, Level world, BlockPos pos, int fortune) {

patches/minecraft/net/minecraft/world/entity/animal/Wolf.java.patch

@@ -1,5 +1,33 @@
 --- a/net/minecraft/world/entity/animal/Wolf.java
 +++ b/net/minecraft/world/entity/animal/Wolf.java
+@@ -86,7 +_,7 @@
+ import net.minecraft.world.level.pathfinder.PathType;
+ import net.minecraft.world.phys.Vec3;
+ 
+-public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Holder<WolfVariant>> {
++public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Holder<WolfVariant>>, net.minecraftforge.common.IForgeShearable {
+     private static final EntityDataAccessor<Boolean> DATA_INTERESTED_ID = SynchedEntityData.defineId(Wolf.class, EntityDataSerializers.BOOLEAN);
+     private static final EntityDataAccessor<Integer> DATA_COLLAR_COLOR = SynchedEntityData.defineId(Wolf.class, EntityDataSerializers.INT);
+     private static final EntityDataAccessor<Integer> DATA_REMAINING_ANGER_TIME = SynchedEntityData.defineId(Wolf.class, EntityDataSerializers.INT);
+@@ -450,16 +_,11 @@
+                         this.setBodyArmorItem(itemstack.copyWithCount(1));
+                         itemstack.consume(1, p_30412_);
+                         return InteractionResult.SUCCESS;
+-                    } else if (itemstack.is(Items.SHEARS)
++                    } else if (itemstack.canPerformAction(net.minecraftforge.common.ToolActions.SHEARS_HARVEST)
+                         && this.isOwnedBy(p_30412_)
+                         && this.hasArmor()
+                         && (!EnchantmentHelper.hasBindingCurse(this.getBodyArmorItem()) || p_30412_.isCreative())) {
+-                        itemstack.hurtAndBreak(1, p_30412_, getSlotForHand(p_30413_));
+-                        this.playSound(SoundEvents.ARMOR_UNEQUIP_WOLF);
+-                        ItemStack itemstack1 = this.getBodyArmorItem();
+-                        this.setBodyArmorItem(ItemStack.EMPTY);
+-                        this.spawnAtLocation(itemstack1);
+-                        return InteractionResult.SUCCESS;
++                        return InteractionResult.PASS;
+                     } else if (ArmorMaterials.ARMADILLO.value().repairIngredient().get().test(itemstack)
+                         && this.isInSittingPose()
+                         && this.hasArmor()
 @@ -498,7 +_,7 @@
      }
  
@@ -9,3 +37,28 @@
              this.tame(p_336244_);
              this.navigation.stop();
              this.setTarget(null);
+@@ -650,6 +_,24 @@
+ 
+             return true;
+         }
++    }
++
++    @Override
++    public boolean isShearable(ItemStack item, Level world, BlockPos pos) {
++        return this.hasArmor();
++    }
++
++    @Override
++    public java.util.List<ItemStack> onSheared(@org.jetbrains.annotations.Nullable Player player, @org.jetbrains.annotations.NotNull ItemStack item, Level world, BlockPos pos, int fortune) {
++        if (!this.hasArmor() || (player != null && !this.isOwnedBy(player)) ||
++            (EnchantmentHelper.hasBindingCurse(this.getBodyArmorItem()) && (player == null || !player.isCreative()))
++        )
++            return java.util.Collections.emptyList();
++
++        this.playSound(SoundEvents.ARMOR_UNEQUIP_WOLF);
++        var armor = this.getBodyArmorItem();
++        this.setBodyArmorItem(ItemStack.EMPTY);
++        return java.util.List.of(armor);
+     }
+ 
+     @Override

patches/minecraft/net/minecraft/world/entity/monster/Bogged.java.patch

@@ -0,0 +1,49 @@
+--- a/net/minecraft/world/entity/monster/Bogged.java
++++ b/net/minecraft/world/entity/monster/Bogged.java
+@@ -74,7 +_,7 @@
+     @Override
+     protected InteractionResult mobInteract(Player p_335303_, InteractionHand p_335145_) {
+         ItemStack itemstack = p_335303_.getItemInHand(p_335145_);
+-        if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
++        if (false && itemstack.is(Items.SHEARS) && this.readyForShearing()) { // Forge: move to onSheared
+             this.shear(SoundSource.PLAYERS);
+             this.gameEvent(GameEvent.SHEAR, p_335303_);
+             if (!this.level().isClientSide) {
+@@ -129,12 +_,20 @@
+ 
+     @Override
+     public void shear(SoundSource p_332421_) {
+-        this.level().playSound(null, this, SoundEvents.BOGGED_SHEAR, p_332421_, 1.0F, 1.0F);
+-        this.spawnShearedMushrooms();
++        shearInternal(p_332421_).stream().forEach(stack -> this.spawnAtLocation(stack, this.getBbHeight()));
++    }
++
++    @Override
++    public java.util.List<ItemStack> onSheared(@org.jetbrains.annotations.Nullable Player player, @org.jetbrains.annotations.NotNull ItemStack item, Level world, net.minecraft.core.BlockPos pos, int fortune) {
++        this.gameEvent(GameEvent.SHEAR, player);
++        return shearInternal(player == null ? SoundSource.BLOCKS : SoundSource.PLAYERS);
++    }
++
++    private java.util.List<ItemStack> shearInternal(SoundSource sound) {
++        this.level().playSound(null, this, SoundEvents.BOGGED_SHEAR, sound, 1.0F, 1.0F);
+         this.setSheared(true);
+-    }
+ 
+-    private void spawnShearedMushrooms() {
++        var ret = new java.util.ArrayList<ItemStack>();
+         if (this.level() instanceof ServerLevel serverlevel && serverlevel.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
+             LootTable loottable = serverlevel.getServer().reloadableRegistries().getLootTable(BuiltInLootTables.BOGGED_SHEAR);
+             LootParams lootparams = new LootParams.Builder(serverlevel)
+@@ -143,9 +_,11 @@
+                 .create(LootContextParamSets.SHEARING);
+ 
+             for (ItemStack itemstack : loottable.getRandomItems(lootparams)) {
+-                this.spawnAtLocation(itemstack);
++                ret.add(itemstack);
+             }
+         }
++
++        return ret;
+     }
+ 
+     @Override

patches/minecraft/net/minecraft/world/entity/monster/Spider.java.patch

@@ -1,14 +1,12 @@
 --- a/net/minecraft/world/entity/monster/Spider.java
 +++ b/net/minecraft/world/entity/monster/Spider.java
-@@ -121,7 +_,12 @@
+@@ -121,7 +_,10 @@
  
      @Override
      public boolean canBeAffected(MobEffectInstance p_33809_) {
 -        return p_33809_.is(MobEffects.POISON) ? false : super.canBeAffected(p_33809_);
 +        if (p_33809_.getEffect() == MobEffects.POISON) {
-+            net.minecraftforge.event.entity.living.MobEffectEvent.Applicable event = new net.minecraftforge.event.entity.living.MobEffectEvent.Applicable(this, p_33809_);
-+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event);
-+            return event.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW;
++            return net.minecraftforge.event.ForgeEventFactory.onLivingEffectCanApply(this, p_33809_).getResult().isAllowed();
 +        }
 +        return super.canBeAffected(p_33809_);
      }

patches/minecraft/net/minecraft/world/entity/monster/Zombie.java.patch

@@ -36,9 +36,9 @@
 +            var event = net.minecraftforge.event.ForgeEventFactory.fireZombieSummonAid(this, level(), i, j, k, livingentity, this.getAttributeValue(Attributes.SPAWN_REINFORCEMENTS_CHANCE));
 +
 +            Zombie zombie = null;
-+            if (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW) {
++            if (event.getResult().isAllowed()) {
 +                zombie = event.getCustomSummonedAid() != null ? event.getCustomSummonedAid() : EntityType.ZOMBIE.create(this.level());
-+            } else if (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.DEFAULT && vanilla) {
++            } else if (vanilla && event.getResult().isDefault()) {
 +                zombie = EntityType.ZOMBIE.create(this.level());
 +            }
 +

patches/minecraft/net/minecraft/world/entity/npc/VillagerTrades.java.patch

@@ -0,0 +1,21 @@
+--- a/net/minecraft/world/entity/npc/VillagerTrades.java
++++ b/net/minecraft/world/entity/npc/VillagerTrades.java
+@@ -1366,6 +_,7 @@
+         private final int villagerXp;
+ 
+         public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
++            if (false) // FORGE: Modders can add custom villager types, so remove this validation
+             BuiltInRegistries.VILLAGER_TYPE.stream().filter(p_35680_ -> !p_35672_.containsKey(p_35680_)).findAny().ifPresent(p_327046_ -> {
+                 throw new IllegalStateException("Missing trade for villager type: " + BuiltInRegistries.VILLAGER_TYPE.getKey(p_327046_));
+             });
+@@ -1379,7 +_,9 @@
+         @Override
+         public MerchantOffer getOffer(Entity p_219685_, RandomSource p_219686_) {
+             if (p_219685_ instanceof VillagerDataHolder villagerdataholder) {
+-                ItemCost itemcost = new ItemCost(this.trades.get(villagerdataholder.getVillagerData().getType()), this.cost);
++                Item item = this.trades.get(villagerdataholder.getVillagerData().getType());
++                if (item == null) return null;
++                ItemCost itemcost = new ItemCost(item, this.cost); // FORGE: Account for modded villager types by returning null if there is no trade
+                 return new MerchantOffer(itemcost, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, 0.05F);
+             } else {
+                 return null;

patches/minecraft/net/minecraft/world/entity/npc/VillagerType.java.patch

@@ -0,0 +1,12 @@
+--- a/net/minecraft/world/entity/npc/VillagerType.java
++++ b/net/minecraft/world/entity/npc/VillagerType.java
+@@ -69,4 +_,9 @@
+     public static VillagerType byBiome(Holder<Biome> p_204074_) {
+         return p_204074_.unwrapKey().map(BY_BIOME::get).orElse(PLAINS);
+     }
++
++    /** FORGE: Registers the VillagerType that will spawn in the given biome. This method should be called during FMLCommonSetupEvent using event.enqueueWork() */
++    public static void registerBiomeType(ResourceKey<Biome> biomeKey, VillagerType villagerType) {
++        BY_BIOME.put(biomeKey, villagerType);
++    }
+ }

patches/minecraft/net/minecraft/world/entity/player/Player.java.patch

@@ -137,6 +137,19 @@
              if (!this.level().isClientSide) {
                  this.awardStat(Stats.ITEM_USED.get(this.useItem.getItem()));
              }
+@@ -919,8 +_,11 @@
+             if (p_36383_ >= 3.0F) {
+                 int i = 1 + Mth.floor(p_36383_);
+                 InteractionHand interactionhand = this.getUsedItemHand();
++                // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
++                ItemStack currentItem = this.useItem;
+                 this.useItem.hurtAndBreak(i, this, getSlotForHand(interactionhand));
+-                if (this.useItem.isEmpty()) {
++                // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
++                if (currentItem.isEmpty()) {
+                     if (interactionhand == InteractionHand.MAIN_HAND) {
+                         this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+                     } else {
 @@ -937,10 +_,13 @@
      @Override
      protected void actuallyHurt(DamageSource p_36312_, float p_36313_) {

patches/minecraft/net/minecraft/world/entity/vehicle/Boat.java.patch

@@ -63,20 +63,3 @@
      }
  
      protected int getMaxPassengers() {
-@@ -859,6 +_,16 @@
-     @Override
-     public ItemStack getPickResult() {
-         return new ItemStack(this.getDropItem());
-+    }
-+
-+    // Forge: Fix MC-119811 by instantly completing lerp on board
-+    @Override
-+    protected void addPassenger(Entity passenger) {
-+        super.addPassenger(passenger);
-+        if (this.isControlledByLocalInstance() && this.lerpSteps > 0) {
-+            this.lerpSteps = 0;
-+            this.absMoveTo(this.lerpX, this.lerpY, this.lerpZ, (float)this.lerpYRot, (float)this.lerpXRot);
-+        }
-     }
- 
-     public static enum Status {

patches/minecraft/net/minecraft/world/item/AxeItem.java.patch

@@ -10,7 +10,7 @@
          if (optional.isEmpty()) {
              return InteractionResult.PASS;
          } else {
-@@ -103,5 +_,16 @@
+@@ -103,5 +_,21 @@
      private Optional<BlockState> getStripped(BlockState p_150691_) {
          return Optional.ofNullable(STRIPPABLES.get(p_150691_.getBlock()))
              .map(p_150689_ -> p_150689_.defaultBlockState().setValue(RotatedPillarBlock.AXIS, p_150691_.getValue(RotatedPillarBlock.AXIS)));
@@ -25,5 +25,10 @@
 +    public static BlockState getAxeStrippingState(BlockState originalState) {
 +        Block block = STRIPPABLES.get(originalState.getBlock());
 +        return block != null ? block.defaultBlockState().setValue(RotatedPillarBlock.AXIS, originalState.getValue(RotatedPillarBlock.AXIS)) : null;
++    }
++
++    @Override
++    public boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker) {
++        return true;
      }
  }

patches/minecraft/net/minecraft/world/item/ItemStack.java.patch

@@ -5,10 +5,27 @@
  import org.slf4j.Logger;
  
 -public final class ItemStack implements DataComponentHolder {
-+public final class ItemStack implements DataComponentHolder, net.minecraftforge.common.extensions.IForgeItemStack {
++public final class ItemStack extends net.minecraftforge.common.capabilities.CapabilityProvider<ItemStack> implements DataComponentHolder, net.minecraftforge.common.extensions.IForgeItemStack {
      public static final Codec<Holder<Item>> ITEM_NON_AIR_CODEC = BuiltInRegistries.ITEM
          .holderByNameCodec()
          .validate(
+@@ -251,13 +_,16 @@
+     }
+ 
+     private ItemStack(ItemLike p_331826_, int p_332766_, PatchedDataComponentMap p_333722_) {
++        super(ItemStack.class, true);
+         this.item = p_331826_.asItem();
+         this.count = p_332766_;
+         this.components = p_333722_;
+         this.getItem().verifyComponentsAfterLoad(this);
++        gatherCapabilities(() -> this.item.getCapabilityProvider(this));
+     }
+ 
+     private ItemStack(@Nullable Void p_282703_) {
++        super(ItemStack.class, false);
+         this.item = null;
+         this.components = new PatchedDataComponentMap(DataComponentMap.EMPTY);
+     }
 @@ -335,13 +_,22 @@
      }
  
@@ -33,13 +50,22 @@
              if (player != null && interactionresult.indicateItemUse()) {
                  player.awardStat(Stats.ITEM_USED.get(item));
              }
+@@ -412,6 +_,8 @@
+ 
+     public void hurtAndBreak(int p_220158_, RandomSource p_220159_, @Nullable ServerPlayer p_220160_, Runnable p_331215_) {
+         if (this.isDamageableItem()) {
++            // FORGE: modify the base damage based on the item's impl of IForgeItem.damageItem
++            p_220158_ = this.damageItem(p_220158_, p_220159_, p_220160_, p_331215_);
+             if (p_220158_ > 0) {
+                 int i = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, this);
+                 int j = 0;
 @@ -447,6 +_,10 @@
              }
  
              this.hurtAndBreak(p_41623_, p_41624_.getRandom(), p_41624_ instanceof ServerPlayer serverplayer ? serverplayer : null, () -> {
 +                if (p_41624_ instanceof Player player) {
 +                    net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, this, p_335324_);
-+                    player.stopUsingItem(); // Forge: fix MC-168573
++                    if (player.getUseItem() == this) player.stopUsingItem(); // Forge: fix MC-168573
 +                }
                  p_41624_.broadcastBreakEvent(p_335324_);
                  Item item = this.getItem();

patches/minecraft/net/minecraft/world/item/ShearsItem.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/ShearsItem.java
 +++ b/net/minecraft/world/item/ShearsItem.java
-@@ -79,4 +_,31 @@
+@@ -79,4 +_,32 @@
  
          return super.useOn(p_186371_);
      }
@@ -20,7 +20,8 @@
 +                    var ent = entity.spawnAtLocation(d, 1.0F);
 +                    ent.setDeltaMovement(ent.getDeltaMovement().add((double)((rand.nextFloat() - rand.nextFloat()) * 0.1F), (double)(rand.nextFloat() * 0.05F), (double)((rand.nextFloat() - rand.nextFloat()) * 0.1F)));
 +                });
-+                stack.hurtAndBreak(1, playerIn, LivingEntity.getSlotForHand(hand));
++                if (!drops.isEmpty())
++                    stack.hurtAndBreak(1, playerIn, LivingEntity.getSlotForHand(hand));
 +            }
 +            return InteractionResult.SUCCESS;
 +        }

patches/minecraft/net/minecraft/world/level/block/ChorusFlowerBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
 +++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
-@@ -65,7 +_,7 @@
+@@ -65,11 +_,12 @@
          BlockPos blockpos = p_220982_.above();
          if (p_220981_.isEmptyBlock(blockpos) && blockpos.getY() < p_220981_.getMaxBuildHeight()) {
              int i = p_220980_.getValue(AGE);
@@ -9,6 +9,22 @@
                  boolean flag = false;
                  boolean flag1 = false;
                  BlockState blockstate = p_220981_.getBlockState(p_220982_.below());
+-                if (blockstate.is(Blocks.END_STONE)) {
++                // Forge: Check for additional growable blocks with block tag
++                if (blockstate.is(Blocks.END_STONE) || blockstate.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                     flag = true;
+                 } else if (blockstate.is(this.plant)) {
+                     int j = 1;
+@@ -77,7 +_,8 @@
+                     for (int k = 0; k < 4; k++) {
+                         BlockState blockstate1 = p_220981_.getBlockState(p_220982_.below(j + 1));
+                         if (!blockstate1.is(this.plant)) {
+-                            if (blockstate1.is(Blocks.END_STONE)) {
++                            // Forge: Check for additional growable blocks with block tag
++                            if (blockstate1.is(Blocks.END_STONE) || blockstate1.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                                 flag1 = true;
+                             }
+                             break;
 @@ -121,6 +_,7 @@
                  } else {
                      this.placeDeadFlower(p_220981_, p_220982_);
@@ -17,3 +33,13 @@
              }
          }
      }
+@@ -157,7 +_,8 @@
+     @Override
+     protected boolean canSurvive(BlockState p_51683_, LevelReader p_51684_, BlockPos p_51685_) {
+         BlockState blockstate = p_51684_.getBlockState(p_51685_.below());
+-        if (!blockstate.is(this.plant) && !blockstate.is(Blocks.END_STONE)) {
++        // Forge: Check for additional growable blocks with block tag
++        if (!blockstate.is(this.plant) && !blockstate.is(Blocks.END_STONE) && !blockstate.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+             if (!blockstate.isAir()) {
+                 return false;
+             } else {

patches/minecraft/net/minecraft/world/level/block/ChorusPlantBlock.java.patch

@@ -0,0 +1,40 @@
+--- a/net/minecraft/world/level/block/ChorusPlantBlock.java
++++ b/net/minecraft/world/level/block/ChorusPlantBlock.java
+@@ -50,7 +_,8 @@
+         BlockState blockstate5 = p_51711_.getBlockState(p_51712_.west());
+         Block block = p_312378_.getBlock();
+         return p_312378_.trySetValue(
+-                DOWN, Boolean.valueOf(blockstate.is(block) || blockstate.is(Blocks.CHORUS_FLOWER) || blockstate.is(Blocks.END_STONE))
++                // Forge: Check for additional growable blocks with block tag
++                DOWN, Boolean.valueOf(blockstate.is(block) || blockstate.is(Blocks.CHORUS_FLOWER) || blockstate.is(Blocks.END_STONE) || blockstate.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON))
+             )
+             .trySetValue(UP, Boolean.valueOf(blockstate1.is(block) || blockstate1.is(Blocks.CHORUS_FLOWER)))
+             .trySetValue(NORTH, Boolean.valueOf(blockstate2.is(block) || blockstate2.is(Blocks.CHORUS_FLOWER)))
+@@ -65,7 +_,8 @@
+             p_51731_.scheduleTick(p_51732_, this, 1);
+             return super.updateShape(p_51728_, p_51729_, p_51730_, p_51731_, p_51732_, p_51733_);
+         } else {
+-            boolean flag = p_51730_.is(this) || p_51730_.is(Blocks.CHORUS_FLOWER) || p_51729_ == Direction.DOWN && p_51730_.is(Blocks.END_STONE);
++            // Forge: Check for additional growable blocks with block tag
++            boolean flag = p_51730_.is(this) || p_51730_.is(Blocks.CHORUS_FLOWER) || p_51729_ == Direction.DOWN && (p_51730_.is(Blocks.END_STONE) || p_51730_.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON));
+             return p_51728_.setValue(PROPERTY_BY_DIRECTION.get(p_51729_), Boolean.valueOf(flag));
+         }
+     }
+@@ -91,13 +_,15 @@
+                 }
+ 
+                 BlockState blockstate2 = p_51725_.getBlockState(blockpos.below());
+-                if (blockstate2.is(this) || blockstate2.is(Blocks.END_STONE)) {
++                // Forge: Check for additional growable blocks with block tag
++                if (blockstate2.is(this) || blockstate2.is(Blocks.END_STONE) || blockstate2.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
+                     return true;
+                 }
+             }
+         }
+ 
+-        return blockstate.is(this) || blockstate.is(Blocks.END_STONE);
++        // Forge: Check for additional growable blocks with block tag
++        return blockstate.is(this) || blockstate.is(Blocks.END_STONE) || blockstate.is(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON);
+     }
+ 
+     @Override

patches/minecraft/net/minecraft/world/level/block/FungusBlock.java.patch

@@ -7,7 +7,7 @@
 -        this.getFeature(p_221243_).ifPresent(p_256352_ -> p_256352_.value().place(p_221243_, p_221243_.getChunkSource().getGenerator(), p_221244_, p_221245_));
 +        this.getFeature(p_221243_).ifPresent(p_256352_ -> {
 +            var event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221243_, p_221244_, p_221245_, p_256352_);
-+            if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return;
++            if (event.getResult().isDenied()) return;
 +            event.getFeature().value().place(p_221243_, p_221243_.getChunkSource().getGenerator(), p_221244_, p_221245_);
 +        });
      }

patches/minecraft/net/minecraft/world/level/block/MushroomBlock.java.patch

@@ -14,7 +14,7 @@
              return false;
          } else {
 +            var event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221774_, p_221777_, p_221775_, optional.get());
-+            if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return false;
++            if (event.getResult().isDenied()) return false;
              p_221774_.removeBlock(p_221775_, false);
 -            if (optional.get().value().place(p_221774_, p_221774_.getChunkSource().getGenerator(), p_221777_, p_221775_)) {
 +            if (event.getFeature().value().place(p_221774_, p_221774_.getChunkSource().getGenerator(), p_221777_, p_221775_)) {

patches/minecraft/net/minecraft/world/level/block/TntBlock.java.patch

@@ -31,12 +31,12 @@
          }
      }
  
-+    @Deprecated //Forge: Prefer using IForgeBlock#catchFire
++    @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
      public static void explode(Level p_57434_, BlockPos p_57435_) {
          explode(p_57434_, p_57435_, null);
      }
  
-+    @Deprecated //Forge: Prefer using IForgeBlock#catchFire
++    @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
      private static void explode(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) {
          if (!p_57437_.isClientSide) {
              PrimedTnt primedtnt = new PrimedTnt(

patches/minecraft/net/minecraft/world/level/block/entity/HangingSignBlockEntity.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/level/block/entity/HangingSignBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/HangingSignBlockEntity.java
+@@ -13,6 +_,10 @@
+         super(BlockEntityType.HANGING_SIGN, p_250603_, p_251674_);
+     }
+ 
++    public HangingSignBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
++        super(type, pos, state);
++    }
++
+     @Override
+     public int getTextLineHeight() {
+         return 9;

patches/minecraft/net/minecraft/world/level/block/grower/TreeGrower.java.patch

@@ -6,7 +6,7 @@
              Holder<ConfiguredFeature<?, ?>> holder = p_309830_.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).getHolder(resourcekey).orElse(null);
 +            var event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_309830_, p_309951_, p_310327_, holder);
 +            holder = event.getFeature();
-+            if (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.DENY) return false;
++            if (event.getResult().isDenied()) return false;
              if (holder != null) {
                  for (int i = 0; i >= -1; i--) {
                      for (int j = 0; j >= -1; j--) {

patches/minecraft/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -42,13 +_,17 @@
+@@ -42,13 +_,18 @@
                      for (ServerPlayer serverplayer : p_64576_.players()) {
                          if (!serverplayer.isSpectator()) {
                              BlockPos blockpos = serverplayer.blockPosition();
@@ -9,8 +9,9 @@
 +                            var vanillaPosition = (!p_64576_.dimensionType().hasSkyLight() || blockpos.getY() >= p_64576_.getSeaLevel() && p_64576_.canSeeSky(blockpos));
 +                            var count = 1 + randomsource.nextInt(difficultyinstance.getDifficulty().getId() + 1);
 +                            var event = net.minecraftforge.event.ForgeEventFactory.onPlayerSpawnPhantom(serverplayer, count);
-+                            if (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.DENY) continue;
-+                            if (event.getResult() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || vanillaPosition) {
++                            var eventResult = event.getResult();
++                            if (eventResult.isDenied()) continue;
++                            if (vanillaPosition || eventResult.isAllowed()) {
                                  if (difficultyinstance.isHarderThan(randomsource.nextFloat() * 3.0F)) {
                                      ServerStatsCounter serverstatscounter = serverplayer.getStats();
                                      int j = Mth.clamp(serverstatscounter.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);

patches/minecraft/net/minecraft/world/level/storage/LevelSummary.java.patch

@@ -1,13 +1,24 @@
 --- a/net/minecraft/world/level/storage/LevelSummary.java
 +++ b/net/minecraft/world/level/storage/LevelSummary.java
-@@ -277,6 +_,10 @@
-         }
-     }
+@@ -14,7 +_,7 @@
+ import net.minecraft.world.level.LevelSettings;
+ import org.apache.commons.lang3.StringUtils;
  
-+    public boolean isLifecycleExperimental() {
-+        return this.settings.getLifecycle().equals(com.mojang.serialization.Lifecycle.experimental());
+-public class LevelSummary implements Comparable<LevelSummary> {
++public class LevelSummary implements Comparable<LevelSummary>, net.minecraftforge.common.extensions.IForgeLevelSummary {
+     public static final Component PLAY_WORLD = Component.translatable("selectWorld.select");
+     private final LevelSettings settings;
+     private final LevelVersion levelVersion;
+@@ -275,6 +_,12 @@
+         public boolean canRecreate() {
+             return false;
+         }
 +    }
 +
++    // TODO Forge: Remove in 1.22. It is kept here for binary compatibility, but already exists in IForgeLevelSummary
++    @Deprecated(forRemoval = true, since = "1.21.4")
++    public boolean isLifecycleExperimental() {
++        return net.minecraftforge.common.extensions.IForgeLevelSummary.super.isLifecycleExperimental();
+     }
+ 
      public static class SymlinkLevelSummary extends LevelSummary {
-         private static final Component MORE_INFO_BUTTON = Component.translatable("symlink_warning.more_info");
-         private static final Component INFO = Component.translatable("symlink_warning.title").withColor(-65536);

server_files/run.bat

@@ -9,7 +9,7 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 REM Add custom program arguments (such as nogui) to the next line before the %* or pass them to this script directly
-java @libraries/@MAVEN_PATH@/win_args.txt %*
+java @user_jvm_args.txt @libraries/@MAVEN_PATH@/win_args.txt %*
 
 :exit
 pause

settings.gradle

@@ -24,33 +24,33 @@ dependencyResolutionManagement {
     versionCatalogs {
         libs {
             library('forgespi', 'net.minecraftforge:forgespi:7.1.4') // Needs modlauncher
-            library('modlauncher', 'net.minecraftforge:modlauncher:10.2.1') // Needs securemodules
-            library('securemodules', 'net.minecraftforge:securemodules:2.2.19') // Needs unsafe
+            library('modlauncher', 'net.minecraftforge:modlauncher:10.2.4') // Needs securemodules
+            library('securemodules', 'net.minecraftforge:securemodules:2.2.21') // Needs unsafe
             library('unsafe', 'net.minecraftforge:unsafe:0.9.2')
-            library('accesstransformers', 'net.minecraftforge:accesstransformers:8.2.0')
-            library('coremods', 'net.minecraftforge:coremods:5.1.6')
+            library('accesstransformers', 'net.minecraftforge:accesstransformers:8.2.2')
+            library('coremods', 'net.minecraftforge:coremods:5.2.6')
             library('nashorn', 'org.openjdk.nashorn:nashorn-core:15.4') // Needed by coremods, because the JRE no longer ships JS
-            library('eventbus', 'net.minecraftforge:eventbus:6.2.6')
+            library('eventbus', 'net.minecraftforge:eventbus:6.2.27')
             library('typetools', 'net.jodah:typetools:0.6.3') // Needed by EventBus because of lambdas
             library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0')
 
             library('mixin', 'org.spongepowered:mixin:0.8.5')
             library('nulls', 'org.jetbrains:annotations:24.1.0') // Got to have our null annotations!
             library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7')
-            library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.5')
+            library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.8')
 
             // Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things.
             library('jimfs', 'com.google.jimfs:jimfs:1.3.0')
             bundle('jimfs', ['guava', 'failureaccess'])
             
-            version('bootstrap', '2.1.3')
+            version('bootstrap', '2.1.8')
             library('bootstrap',      'net.minecraftforge', 'bootstrap'     ).versionRef('bootstrap') // Needs modlauncher
             library('bootstrap-api',  'net.minecraftforge', 'bootstrap-api' ).versionRef('bootstrap')
             library('bootstrap-dev',  'net.minecraftforge', 'bootstrap-dev' ).versionRef('bootstrap')
             library('bootstrap-shim', 'net.minecraftforge', 'bootstrap-shim').versionRef('bootstrap')
 
             // ASM it's used for so many of our hacks
-            version('asm', '9.7')
+            version('asm', '9.7.1')
             library('asm',          'org.ow2.asm', 'asm'         ).versionRef('asm')
             library('asm-tree',     'org.ow2.asm', 'asm-tree'    ).versionRef('asm')
             library('asm-util',     'org.ow2.asm', 'asm-util'    ).versionRef('asm')

src/main/generated/data/forge/tags/blocks/chorus_additionally_grows_on.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#forge:end_stones"
+  ]
+}

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -267,9 +267,7 @@ public class ForgeHooksClient {
         return result != null ? result : layer.texture(inner);
     }
 
-    public static boolean onDrawHighlight(LevelRenderer context, Camera camera, HitResult target, float partialTick, Matrix4f ctxPos, MultiBufferSource bufferSource) {
-        var poseStack = new PoseStack();
-        poseStack.mulPose(ctxPos);
+    public static boolean onDrawHighlight(LevelRenderer context, Camera camera, HitResult target, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource) {
         switch (target.getType()) {
             case BLOCK:
                 if (!(target instanceof BlockHitResult blockTarget)) return false;
@@ -832,11 +830,15 @@ public class ForgeHooksClient {
     }
 
     public static List<ClientTooltipComponent> gatherTooltipComponents(ItemStack stack, List<? extends FormattedText> textElements, Optional<TooltipComponent> itemComponent, int mouseX, int screenWidth, int screenHeight, Font fallbackFont) {
-        Font font = getTooltipFont(stack, fallbackFont);
         List<Either<FormattedText, TooltipComponent>> elements = textElements.stream()
                 .map((Function<FormattedText, Either<FormattedText, TooltipComponent>>) Either::left)
                 .collect(Collectors.toCollection(ArrayList::new));
         itemComponent.ifPresent(c -> elements.add(1, Either.right(c)));
+        return gatherTooltipComponentsFromElements(stack, elements, mouseX, screenWidth, screenHeight, fallbackFont);
+    }
+
+    public static List<ClientTooltipComponent> gatherTooltipComponentsFromElements(ItemStack stack, List<Either<FormattedText, TooltipComponent>> elements, int mouseX, int screenWidth, int screenHeight, Font fallbackFont) {
+        Font font = getTooltipFont(stack, fallbackFont);
 
         var event = new RenderTooltipEvent.GatherComponents(stack, screenWidth, screenHeight, elements, -1);
         MinecraftForge.EVENT_BUS.post(event);

src/main/java/net/minecraftforge/client/event/ScreenEvent.java

@@ -10,8 +10,6 @@ import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.Cancelable;
 import net.minecraftforge.eventbus.api.Event;
@@ -38,7 +36,6 @@ import java.util.function.Consumer;
  * @see MouseInput
  * @see KeyInput
  */
-@OnlyIn(Dist.CLIENT)
 public abstract class ScreenEvent extends Event {
     private final Screen screen;
 

src/main/java/net/minecraftforge/client/gui/TitleScreenModUpdateIndicator.java

@@ -11,14 +11,11 @@ import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.loading.FMLConfig;
 import net.minecraftforge.versions.forge.ForgeVersion;
 import net.minecraftforge.fml.VersionChecker;
 import net.minecraftforge.client.loading.ClientModLoader;
-import net.minecraftforge.api.distmarker.Dist;
 
-@OnlyIn(Dist.CLIENT)
 public class TitleScreenModUpdateIndicator extends Screen
 {
 

src/main/java/net/minecraftforge/client/loading/ClientModLoader.java

@@ -25,15 +25,12 @@ import org.apache.logging.log4j.Logger;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.server.packs.PackType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfig;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.client.gui.LoadingErrorScreen;
 import net.minecraftforge.resource.ResourcePackLoader;
 import net.minecraftforge.server.LanguageHook;
 
-@OnlyIn(Dist.CLIENT)
 public class ClientModLoader {
     private static final Logger LOGGER = LogManager.getLogger();
     private static boolean loading;

src/main/java/net/minecraftforge/client/model/CompositeModel.java

@@ -243,6 +243,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
             private final ItemTransforms transforms;
             private TextureAtlasSprite particle;
             private RenderTypeGroup lastRenderTypes = RenderTypeGroup.EMPTY;
+            private RenderTypeGroup lastRenderTypesFast = RenderTypeGroup.EMPTY;
 
             private Builder(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, ItemTransforms transforms)
             {
@@ -256,27 +257,38 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
 
             public void addLayer(BakedModel model)
             {
-                flushQuads(null);
+                flushQuads(RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
                 children.add(model);
             }
 
             private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads)
             {
-                var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes);
+                this.addLayer(renderTypes, RenderTypeGroup.EMPTY, quads);
+            }
+
+            private void addLayer(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, List<BakedQuad> quads)
+            {
+                var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
                 quads.forEach(modelBuilder::addUnculledFace);
                 children.add(modelBuilder.build());
             }
 
             private void flushQuads(RenderTypeGroup renderTypes)
+            {
+                this.flushQuads(renderTypes, RenderTypeGroup.EMPTY);
+            }
+
+            private void flushQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
             {
                 if (!Objects.equals(renderTypes, lastRenderTypes))
                 {
                     if (quads.size() > 0)
                     {
-                        addLayer(lastRenderTypes, quads);
+                        addLayer(lastRenderTypes, lastRenderTypesFast, quads);
                         quads.clear();
                     }
                     lastRenderTypes = renderTypes;
+                    lastRenderTypesFast = renderTypesFast;
                 }
             }
 
@@ -288,14 +300,24 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
 
             public Builder addQuads(RenderTypeGroup renderTypes, BakedQuad... quadsToAdd)
             {
-                flushQuads(renderTypes);
+                return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
+            }
+
+            public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, BakedQuad... quadsToAdd)
+            {
+                flushQuads(renderTypes, renderTypesFast);
                 Collections.addAll(quads, quadsToAdd);
                 return this;
             }
 
             public Builder addQuads(RenderTypeGroup renderTypes, Collection<BakedQuad> quadsToAdd)
             {
-                flushQuads(renderTypes);
+                return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
+            }
+
+            public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, Collection<BakedQuad> quadsToAdd)
+            {
+                flushQuads(renderTypes, renderTypesFast);
                 quads.addAll(quadsToAdd);
                 return this;
             }
@@ -304,7 +326,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
             {
                 if (quads.size() > 0)
                 {
-                    addLayer(lastRenderTypes, quads);
+                    addLayer(lastRenderTypes, lastRenderTypesFast, quads);
                 }
                 var childrenBuilder = ImmutableMap.<String, BakedModel>builder();
                 var itemPassesBuilder = ImmutableList.<BakedModel>builder();

src/main/java/net/minecraftforge/client/model/EmptyModel.java

@@ -63,7 +63,7 @@ public class EmptyModel extends SimpleUnbakedGeometry<EmptyModel>
 
         public Baked()
         {
-            super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY);
+            super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
         }
 
         @Override

src/main/java/net/minecraftforge/client/model/ExtendedBlockModelDeserializer.java

@@ -73,6 +73,12 @@ public class ExtendedBlockModelDeserializer extends BlockModel.Deserializer
             model.customData.setRenderTypeHint(new ResourceLocation(renderTypeHintName));
         }
 
+        if (jsonobject.has("render_type_fast"))
+        {
+            var renderTypeHintName = GsonHelper.getAsString(jsonobject, "render_type_fast");
+            model.customData.setRenderTypeFastHint(ResourceLocation.parse(renderTypeHintName));
+        }
+
         if (jsonobject.has("visibility"))
         {
             JsonObject visibility = GsonHelper.getAsJsonObject(jsonobject, "visibility");

src/main/java/net/minecraftforge/client/model/IModelBuilder.java

@@ -34,6 +34,19 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
         return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes);
     }
 
+    static IModelBuilder<?> of(
+        boolean hasAmbientOcclusion,
+        boolean usesBlockLight,
+        boolean isGui3d,
+        ItemTransforms transforms,
+        ItemOverrides overrides,
+        TextureAtlasSprite particle,
+        RenderTypeGroup renderTypes,
+        RenderTypeGroup renderTypesFast
+    ){
+        return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
+    }
+
     /**
      * Creates a new model builder that collects quads to the provided list, returning
      * {@linkplain EmptyModel#BAKED an empty model} if you call {@link #build()}.
@@ -53,13 +66,22 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
     {
         private final SimpleBakedModel.Builder builder;
         private final RenderTypeGroup renderTypes;
+        private final RenderTypeGroup renderTypesFast;
 
         private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
                        ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
                        RenderTypeGroup renderTypes)
+        {
+            this(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, RenderTypeGroup.EMPTY);
+        }
+
+        private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
+                       ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
+                       RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
         {
             this.builder = new SimpleBakedModel.Builder(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides).particle(particle);
             this.renderTypes = renderTypes;
+            this.renderTypesFast = renderTypesFast;
         }
 
         @Override
@@ -80,7 +102,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
         @Override
         public BakedModel build()
         {
-            return builder.renderTypes(renderTypes).build();
+            return builder.renderTypes(renderTypes, renderTypesFast).build();
         }
     }
 

src/main/java/net/minecraftforge/client/model/ItemLayerModel.java

@@ -45,12 +45,19 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
     private ImmutableList<Material> textures;
     private final Int2ObjectMap<ForgeFaceData> layerData;
     private final Int2ObjectMap<ResourceLocation> renderTypeNames;
+    private final Int2ObjectMap<ResourceLocation> renderTypeFastNames;
 
     private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames)
+    {
+        this(textures, layerData, renderTypeNames, new Int2ObjectOpenHashMap<>());
+    }
+
+    private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ResourceLocation> renderTypeFastNames)
     {
         this.textures = textures;
         this.layerData = layerData;
         this.renderTypeNames = renderTypeNames;
+        this.renderTypeFastNames = renderTypeFastNames;
     }
 
     @Override
@@ -82,7 +89,9 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
             var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, modelState, modelLocation);
             var renderTypeName = renderTypeNames.get(i);
             var renderTypes = renderTypeName != null ? context.getRenderType(renderTypeName) : null;
-            builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, quads);
+            var renderTypeFastName = renderTypeFastNames.get(i);
+            var renderTypesFast = renderTypeFastName != null ? context.getRenderType(renderTypeFastName) : null;
+            builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, renderTypesFast != null ? renderTypesFast : RenderTypeGroup.EMPTY, quads);
         }
 
         return builder.build();
@@ -108,6 +117,19 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
                 }
             }
 
+            var renderTypeFastNames = new Int2ObjectOpenHashMap<ResourceLocation>();
+            if (jsonObject.has("render_types_fast"))
+            {
+                var renderTypes = jsonObject.getAsJsonObject("render_types_fast");
+                for (Map.Entry<String, JsonElement> entry : renderTypes.entrySet())
+                {
+                    var renderType = new ResourceLocation(entry.getKey());
+                    for (var layer : entry.getValue().getAsJsonArray())
+                        if (renderTypeFastNames.put(layer.getAsInt(), renderType) != null)
+                            throw new JsonParseException("Registered duplicate fast graphics render type for layer " + layer);
+                }
+            }
+
             var emissiveLayers = new Int2ObjectArrayMap<ForgeFaceData>();
             if(jsonObject.has("forge_data"))
             {
@@ -118,6 +140,12 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
         }
 
         protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
+        {
+            this.readLayerData(jsonObject, name, renderTypeNames, new Int2ObjectOpenHashMap<>(), layerData, logWarning);
+        }
+
+        @Deprecated(forRemoval = true, since = "1.21.4")
+        protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectOpenHashMap<ResourceLocation> renderTypeFastNames, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
         {
             if (!jsonObject.has(name))
             {

src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java

@@ -251,6 +251,42 @@ public abstract class BlockStateProvider implements DataProvider {
             models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType));
     }
 
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
+    }
+
+    public void logBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, String renderType, String renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, String renderType, String renderTypeFast) {
+        axisBlock(block,
+            models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
+            models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
+    }
+
+    public void logBlockWithRenderType(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
+    }
+
+    public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        axisBlock(block,
+            models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
+            models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
+    }
+
     public void axisBlock(RotatedPillarBlock block, ModelFile vertical, ModelFile horizontal) {
         getVariantBuilder(block)
             .partialState().with(RotatedPillarBlock.AXIS, Axis.Y)
@@ -382,6 +418,38 @@ public abstract class BlockStateProvider implements DataProvider {
         stairsBlockInternalWithRenderType(block, name + "_stairs", side, bottom, top, renderType);
     }
 
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, renderType, renderTypeFast);
+    }
+
+    public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, renderType, renderTypeFast);
+    }
+
     private void stairsBlockInternal(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
         ModelFile stairs = models().stairs(baseName, side, bottom, top);
         ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top);
@@ -396,6 +464,13 @@ public abstract class BlockStateProvider implements DataProvider {
         stairsBlock(block, stairs, stairsInner, stairsOuter);
     }
 
+    private void stairsBlockInternalWithRenderTypeAndFast(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile stairs = models().stairs(baseName, side, bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile stairsOuter = models().stairsOuter(baseName + "_outer", side, bottom, top).renderType(renderType, renderTypeFast);
+        stairsBlock(block, stairs, stairsInner, stairsOuter);
+    }
+
     public void stairsBlock(StairBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) {
         getVariantBuilder(block)
             .forAllStatesExcept(state -> {
@@ -533,6 +608,32 @@ public abstract class BlockStateProvider implements DataProvider {
             models().fenceSide(name + "_fence_side", texture).renderType(renderType));
     }
 
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        String baseName = key(block).toString();
+        fourWayBlock(block,
+            models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fourWayBlock(block,
+            models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        String baseName = key(block).toString();
+        fourWayBlock(block,
+            models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
+    }
+
+    public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fourWayBlock(block,
+            models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
+            models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
+    }
+
     public void fenceGateBlock(FenceGateBlock block, ResourceLocation texture) {
         fenceGateBlockInternal(block, key(block).toString(), texture);
     }
@@ -557,6 +658,22 @@ public abstract class BlockStateProvider implements DataProvider {
         fenceGateBlockInternalWithRenderType(block, name + "_fence_gate", texture, renderType);
     }
 
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
+    }
+
+    public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, renderType, renderTypeFast);
+    }
+
     private void fenceGateBlockInternal(FenceGateBlock block, String baseName, ResourceLocation texture) {
         ModelFile gate = models().fenceGate(baseName, texture);
         ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture);
@@ -573,6 +690,14 @@ public abstract class BlockStateProvider implements DataProvider {
         fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
     }
 
+    private void fenceGateBlockInternalWithRenderTypeAndFast(FenceGateBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile gate = models().fenceGate(baseName, texture).renderType(renderType, renderTypeFast);
+        ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
+        ModelFile gateWall = models().fenceGateWall(baseName + "_wall", texture).renderType(renderType, renderTypeFast);
+        ModelFile gateWallOpen = models().fenceGateWallOpen(baseName + "_wall_open", texture).renderType(renderType, renderTypeFast);
+        fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
+    }
+
     public void fenceGateBlock(FenceGateBlock block, ModelFile gate, ModelFile gateOpen, ModelFile gateWall, ModelFile gateWallOpen) {
         getVariantBuilder(block).forAllStatesExcept(state -> {
             ModelFile model = gate;
@@ -614,6 +739,22 @@ public abstract class BlockStateProvider implements DataProvider {
         wallBlockInternalWithRenderType(block, name + "_wall", texture, renderType);
     }
 
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
+    }
+
+    public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, renderType, renderTypeFast);
+    }
+
     private void wallBlockInternal(WallBlock block, String baseName, ResourceLocation texture) {
         wallBlock(block, models().wallPost(baseName + "_post", texture),
             models().wallSide(baseName + "_side", texture),
@@ -626,6 +767,12 @@ public abstract class BlockStateProvider implements DataProvider {
             models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType));
     }
 
+    private void wallBlockInternalWithRenderTypeAndFast(WallBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        wallBlock(block, models().wallPost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
+            models().wallSide(baseName + "_side", texture).renderType(renderType, renderTypeFast),
+            models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType, renderTypeFast));
+    }
+
     public static final ImmutableMap<Direction, Property<WallSide>> WALL_PROPS = ImmutableMap.<Direction, Property<WallSide>>builder()
     		.put(Direction.EAST,  BlockStateProperties.EAST_WALL)
     		.put(Direction.NORTH, BlockStateProperties.NORTH_WALL)
@@ -678,6 +825,22 @@ public abstract class BlockStateProvider implements DataProvider {
         paneBlockInternalWithRenderType(block, name + "_pane", pane, edge, renderType);
     }
 
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, renderType, renderTypeFast);
+    }
+
+    public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, renderType, renderTypeFast);
+    }
+
     private void paneBlockInternal(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) {
         ModelFile post = models().panePost(baseName + "_post", pane, edge);
         ModelFile side = models().paneSide(baseName + "_side", pane, edge);
@@ -696,6 +859,15 @@ public abstract class BlockStateProvider implements DataProvider {
         paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
     }
 
+    private void paneBlockInternalWithRenderTypeAndFast(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile post = models().panePost(baseName + "_post", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile side = models().paneSide(baseName + "_side", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile sideAlt = models().paneSideAlt(baseName + "_side_alt", pane, edge).renderType(renderType, renderTypeFast);
+        ModelFile noSide = models().paneNoSide(baseName + "_noside", pane).renderType(renderType, renderTypeFast);
+        ModelFile noSideAlt = models().paneNoSideAlt(baseName + "_noside_alt", pane).renderType(renderType, renderTypeFast);
+        paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
+    }
+
     public void paneBlock(IronBarsBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) {
         MultiPartBlockStateBuilder builder = getMultipartBuilder(block)
             .part().modelFile(post).addModel().end();
@@ -735,6 +907,22 @@ public abstract class BlockStateProvider implements DataProvider {
         doorBlockInternalWithRenderType(block, name + "_door", bottom, top, renderType);
     }
 
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, renderType, renderTypeFast);
+    }
+
+    public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, renderType, renderTypeFast);
+    }
+
     private void doorBlockInternal(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top) {
         ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top);
         ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top);
@@ -759,6 +947,18 @@ public abstract class BlockStateProvider implements DataProvider {
         doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
     }
 
+    private void doorBlockInternalWithRenderTypeAndFast(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomRight = models().doorBottomRight(baseName + "_bottom_right", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile bottomRightOpen = models().doorBottomRightOpen(baseName + "_bottom_right_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topLeft = models().doorTopLeft(baseName + "_top_left", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topLeftOpen = models().doorTopLeftOpen(baseName + "_top_left_open", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topRight = models().doorTopRight(baseName + "_top_right", bottom, top).renderType(renderType, renderTypeFast);
+        ModelFile topRightOpen = models().doorTopRightOpen(baseName + "_top_right_open", bottom, top).renderType(renderType, renderTypeFast);
+        doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
+    }
+
     public void doorBlock(DoorBlock block, ModelFile bottomLeft, ModelFile bottomLeftOpen, ModelFile bottomRight, ModelFile bottomRightOpen, ModelFile topLeft, ModelFile topLeftOpen, ModelFile topRight, ModelFile topRightOpen) {
         getVariantBuilder(block).forAllStatesExcept(state -> {
             int yRot = ((int) state.getValue(DoorBlock.FACING).toYRot()) + 90;
@@ -825,6 +1025,22 @@ public abstract class BlockStateProvider implements DataProvider {
         trapdoorBlockInternalWithRenderType(block, name + "_trapdoor", texture, orientable, renderType);
     }
 
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, renderType, renderTypeFast);
+    }
+
+    public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, renderType, renderTypeFast);
+    }
+
     private void trapdoorBlockInternal(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable) {
         ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture) : models().trapdoorBottom(baseName + "_bottom", texture);
         ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture) : models().trapdoorTop(baseName + "_top", texture);
@@ -839,6 +1055,13 @@ public abstract class BlockStateProvider implements DataProvider {
         trapdoorBlock(block, bottom, top, open, orientable);
     }
 
+    private void trapdoorBlockInternalWithRenderTypeAndFast(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast) : models().trapdoorBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast);
+        ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture).renderType(renderType, renderTypeFast) : models().trapdoorTop(baseName + "_top", texture).renderType(renderType, renderTypeFast);
+        ModelFile open = orientable ? models().trapdoorOrientableOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast) : models().trapdoorOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
+        trapdoorBlock(block, bottom, top, open, orientable);
+    }
+
     public void trapdoorBlock(TrapDoorBlock block, ModelFile bottom, ModelFile top, ModelFile open, boolean orientable) {
         getVariantBuilder(block).forAllStatesExcept(state -> {
             int xRot = 0;

src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java

@@ -60,6 +60,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
     protected final ExistingFileHelper existingFileHelper;
 
     protected String renderType = null;
+    protected String renderTypeFast = null;
     protected boolean ambientOcclusion = true;
     protected GuiLight guiLight = null;
 
@@ -149,12 +150,17 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
     }
 
     /**
-     * Set the render type for this model.
+     * Set the render type for this model. Any render types to be used must be registered via
+     * {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
+     * <p>
+     * Consider using {@linkplain #renderType(String, String)} if you need to set a render type for
+     * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
      *
-     * @param renderType the render type. Must be registered via
-     *                   {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent}
+     * @param renderType the render type
      * @return this builder
-     * @throws NullPointerException  if {@code renderType} is {@code null}
+     *
+     * @throws NullPointerException if {@code renderType} is {@code null}
+     * @see #renderType(String, String)
      */
     public T renderType(String renderType) {
         Preconditions.checkNotNull(renderType, "Render type must not be null");
@@ -162,16 +168,55 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
     }
 
     /**
-     * Set the render type for this model.
+     * Set the render types for this model. Any render types to be used must be registered via
+     * {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
      *
-     * @param renderType the render type. Must be registered via
-     *                   {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent}
+     * @param renderType     the render type for {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics}
+     * @param renderTypeFast the render type for {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}
      * @return this builder
-     * @throws NullPointerException  if {@code renderType} is {@code null}
+     *
+     * @throws NullPointerException if {@code renderType} is {@code null}
+     */
+    public T renderType(String renderType, String renderTypeFast) {
+        Preconditions.checkNotNull(renderType, "Render type must not be null");
+        return renderType(ResourceLocation.parse(renderType), ResourceLocation.parse(renderTypeFast));
+    }
+
+    /**
+     * Set the render type for this model. Any render types to be used must be registered via
+     * {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
+     * <p>
+     * Consider using {@linkplain #renderType(ResourceLocation, ResourceLocation)} if you need to set a render type for
+     * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
+     *
+     * @param renderType the render type
+     * @return this builder
+     *
+     * @throws NullPointerException if {@code renderType} is {@code null}
+     * @see #renderType(ResourceLocation, ResourceLocation)
      */
     public T renderType(ResourceLocation renderType) {
         Preconditions.checkNotNull(renderType, "Render type must not be null");
         this.renderType = renderType.toString();
+        this.renderTypeFast = null;
+        return self();
+    }
+
+    /**
+     * Set the render types for this model. Any render types to be used must be registered via
+     * {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
+     *
+     * @param renderType     the render type for {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics}
+     * @param renderTypeFast the render type for {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}
+     * @return this builder
+     *
+     * @throws NullPointerException if {@code renderType} is {@code null}
+     */
+    public T renderType(ResourceLocation renderType, ResourceLocation renderTypeFast) {
+        Preconditions.checkNotNull(renderType, "Render type must not be null");
+        Preconditions.checkNotNull(renderTypeFast, "Fast graphics render type must not be null");
+        this.renderType = renderType.toString();
+        this.renderTypeFast = renderType.toString();
         return self();
     }
 

src/main/java/net/minecraftforge/client/model/generators/ModelProvider.java

@@ -369,7 +369,8 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataPr
     }
 
     public T leaves(String name, ResourceLocation texture) {
-        return singleTexture(name, BLOCK_FOLDER + "/leaves", "all", texture);
+        return singleTexture(name, BLOCK_FOLDER + "/leaves", "all", texture)
+            .renderType("cutout_mipped", "solid");
     }
 
     /**

src/main/java/net/minecraftforge/client/model/generators/loaders/ItemLayerModelBuilder.java

@@ -33,6 +33,7 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
 
     private final Int2ObjectMap<ForgeFaceData> faceData = new Int2ObjectOpenHashMap<>();
     private final Map<ResourceLocation, IntSet> renderTypes = new LinkedHashMap<>();
+    private final Map<ResourceLocation, IntSet> renderTypesFast = new LinkedHashMap<>();
     private final IntSet layersWithRenderTypes = new IntOpenHashSet();
 
     protected ItemLayerModelBuilder(T parent, ExistingFileHelper existingFileHelper)
@@ -115,6 +116,23 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
         return renderType(asLoc, layers);
     }
 
+    public ItemLayerModelBuilder<T> renderType(String renderType, String renderTypeFast, int... layers)
+    {
+        Preconditions.checkNotNull(renderType, "Render type must not be null");
+        Preconditions.checkNotNull(renderTypeFast, "Fast graphics render type must not be null");
+        ResourceLocation asLoc;
+        if (renderType.contains(":"))
+            asLoc = ResourceLocation.parse(renderType);
+        else
+            asLoc = parent.getLocation().withPath(renderType);
+        ResourceLocation asLocFast;
+        if (renderTypeFast.contains(":"))
+            asLocFast = ResourceLocation.parse(renderTypeFast);
+        else
+            asLocFast = parent.getLocation().withPath(renderTypeFast);
+        return renderType(asLoc, asLocFast, layers);
+    }
+
     /**
      * Set the render type for a set of layers.
      *
@@ -144,6 +162,25 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
         return this;
     }
 
+    public ItemLayerModelBuilder<T> renderType(ResourceLocation renderType, ResourceLocation renderTypeFast, int... layers)
+    {
+        Preconditions.checkNotNull(renderType, "Render type must not be null");
+        Preconditions.checkNotNull(renderTypeFast, "Fast graphics render type must not be null");
+        Preconditions.checkNotNull(layers, "Layers must not be null");
+        Preconditions.checkArgument(layers.length > 0, "At least one layer must be specified");
+        Preconditions.checkArgument(Arrays.stream(layers).allMatch(i -> i >= 0), "All layers must be >= 0");
+        var alreadyAssigned = Arrays.stream(layers).filter(layersWithRenderTypes::contains).toArray();
+        Preconditions.checkArgument(alreadyAssigned.length == 0, "Attempted to re-assign layer render types: " + Arrays.toString(alreadyAssigned));
+        var renderTypeLayers = renderTypes.computeIfAbsent(renderType, $ -> new IntOpenHashSet());
+        var renderTypeFastLayers = renderTypesFast.computeIfAbsent(renderType, $ -> new IntOpenHashSet());
+        Arrays.stream(layers).forEach(layer -> {
+            renderTypeLayers.add(layer);
+            renderTypeFastLayers.add(layer);
+            layersWithRenderTypes.add(layer);
+        });
+        return this;
+    }
+
     @Override
     public JsonObject toJson(JsonObject json)
     {
@@ -170,6 +207,14 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
         });
         json.add("render_types", renderTypes);
 
+        JsonObject renderTypesFast = new JsonObject();
+        this.renderTypesFast.forEach((renderTypeFast, layers) -> {
+            JsonArray array = new JsonArray();
+            layers.intStream().sorted().forEach(array::add);
+            renderTypesFast.add(renderTypeFast.toString(), array);
+        });
+        json.add("render_types_fast", renderTypesFast);
+
         return json;
     }
 }

src/main/java/net/minecraftforge/client/model/geometry/BlockGeometryBakingContext.java

@@ -41,6 +41,8 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
     private Transformation rootTransform;
     @Nullable
     private ResourceLocation renderTypeHint;
+    @Nullable
+    private ResourceLocation renderTypeFastHint;
     private boolean gui3d = true;
 
     @ApiStatus.Internal
@@ -137,11 +139,25 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
         return owner.parent != null ? owner.parent.customData.getRenderTypeHint() : null;
     }
 
+    @Nullable
+    @Override
+    public ResourceLocation getRenderTypeFastHint()
+    {
+        if (renderTypeFastHint != null)
+            return renderTypeFastHint;
+        return owner.parent != null ? owner.parent.customData.getRenderTypeFastHint() : null;
+    }
+
     public void setRenderTypeHint(ResourceLocation renderTypeHint)
     {
         this.renderTypeHint = renderTypeHint;
     }
 
+    public void setRenderTypeFastHint(ResourceLocation renderTypeFastHint)
+    {
+        this.renderTypeFastHint = renderTypeFastHint;
+    }
+
     public void setGui3d(boolean gui3d)
     {
         this.gui3d = gui3d;
@@ -153,6 +169,7 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
         this.rootTransform = other.rootTransform;
         this.visibilityData.copyFrom(other.visibilityData);
         this.renderTypeHint = other.renderTypeHint;
+        this.renderTypeFastHint = other.renderTypeFastHint;
         this.gui3d = other.gui3d;
     }
 

src/main/java/net/minecraftforge/client/model/geometry/IGeometryBakingContext.java

@@ -75,6 +75,13 @@ public interface IGeometryBakingContext
     @Nullable
     ResourceLocation getRenderTypeHint();
 
+    /**
+     * @return a hint of the {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} render type this model
+     * should use. Custom loaders may ignore this.
+     */
+    @Nullable
+    default ResourceLocation getRenderTypeFastHint() { return null; }
+
     /**
      * Queries the visibility of a component of this model.
      *
@@ -91,4 +98,20 @@ public interface IGeometryBakingContext
     {
         return NamedRenderTypeManager.get(name);
     }
+
+    /**
+     * {@return a {@link RenderTypeGroup} from the {@link #getRenderTypeHint()}, or the empty group if not found.}
+     */
+    default RenderTypeGroup getRenderType() {
+        var hint = getRenderTypeHint();
+        return hint == null ? RenderTypeGroup.EMPTY : getRenderType(hint);
+    }
+
+    /**
+     * {@return a {@link RenderTypeGroup} from the {@link #getRenderTypeHint()}, or the empty group if not found.}
+     */
+    default RenderTypeGroup getRenderTypeFast() {
+        var hint = getRenderTypeFastHint();
+        return hint == null ? RenderTypeGroup.EMPTY : getRenderType(hint);
+    }
 }

src/main/java/net/minecraftforge/client/model/geometry/SimpleUnbakedGeometry.java

@@ -28,10 +28,8 @@ public abstract class SimpleUnbakedGeometry<T extends SimpleUnbakedGeometry<T>>
     {
         TextureAtlasSprite particle = spriteGetter.apply(context.getMaterial("particle"));
 
-        var renderTypeHint = context.getRenderTypeHint();
-        var renderTypes = renderTypeHint != null ? context.getRenderType(renderTypeHint) : RenderTypeGroup.EMPTY;
         IModelBuilder<?> builder = IModelBuilder.of(context.useAmbientOcclusion(), context.useBlockLight(), context.isGui3d(),
-                context.getTransforms(), overrides, particle, renderTypes);
+                context.getTransforms(), overrides, particle, context.getRenderType(), context.getRenderTypeFast());
 
         addQuads(context, builder, baker, spriteGetter, modelState, modelLocation);
 

src/main/java/net/minecraftforge/client/model/geometry/StandaloneGeometryBakingContext.java

@@ -54,6 +54,8 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
     private final Transformation rootTransform;
     @Nullable
     private final ResourceLocation renderTypeHint;
+    @Nullable
+    private final ResourceLocation renderTypeFastHint;
     private final BiPredicate<String, Boolean> visibilityTest;
 
     private StandaloneGeometryBakingContext(ResourceLocation modelName, Predicate<String> materialCheck,
@@ -62,6 +64,18 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
                                             ItemTransforms transforms, Transformation rootTransform,
                                             @Nullable ResourceLocation renderTypeHint,
                                             BiPredicate<String, Boolean> visibilityTest)
+    {
+        this(modelName, materialCheck, materialLookup, isGui3d, useBlockLight, useAmbientOcclusion,
+                transforms, rootTransform, renderTypeHint, null, visibilityTest);
+    }
+
+    private StandaloneGeometryBakingContext(ResourceLocation modelName, Predicate<String> materialCheck,
+                                            Function<String, Material> materialLookup, boolean isGui3d,
+                                            boolean useBlockLight, boolean useAmbientOcclusion,
+                                            ItemTransforms transforms, Transformation rootTransform,
+                                            @Nullable ResourceLocation renderTypeHint,
+                                            @Nullable ResourceLocation renderTypeFastHint,
+                                            BiPredicate<String, Boolean> visibilityTest)
     {
         this.modelName = modelName;
         this.materialCheck = materialCheck;
@@ -72,6 +86,7 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
         this.transforms = transforms;
         this.rootTransform = rootTransform;
         this.renderTypeHint = renderTypeHint;
+        this.renderTypeFastHint = renderTypeFastHint;
         this.visibilityTest = visibilityTest;
     }
 
@@ -130,6 +145,12 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
         return renderTypeHint;
     }
 
+    @Nullable
+    @Override
+    public ResourceLocation getRenderTypeFastHint() {
+        return renderTypeFastHint;
+    }
+
     @Override
     public boolean isComponentVisible(String component, boolean fallback)
     {
@@ -158,6 +179,8 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
         private Transformation rootTransform = Transformation.identity();
         @Nullable
         private ResourceLocation renderTypeHint;
+        @Nullable
+        private ResourceLocation renderTypeFastHint;
         private BiPredicate<String, Boolean> visibilityTest = (c, def) -> def;
 
         private Builder()
@@ -174,6 +197,7 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
             this.transforms = parent.getTransforms();
             this.rootTransform = parent.getRootTransform();
             this.renderTypeHint = parent.getRenderTypeHint();
+            this.renderTypeFastHint = parent.getRenderTypeFastHint();
             this.visibilityTest = parent::isComponentVisible;
         }
 
@@ -229,6 +253,14 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
         public Builder withRenderTypeHint(ResourceLocation renderTypeHint)
         {
             this.renderTypeHint = renderTypeHint;
+            this.renderTypeFastHint = null;
+            return this;
+        }
+
+        public Builder withRenderTypeHint(ResourceLocation renderTypeHint, ResourceLocation renderTypeFastHint)
+        {
+            this.renderTypeHint = renderTypeHint;
+            this.renderTypeFastHint = renderTypeFastHint;
             return this;
         }
 
@@ -240,7 +272,7 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
 
         public StandaloneGeometryBakingContext build(ResourceLocation modelName)
         {
-            return new StandaloneGeometryBakingContext(modelName, materialCheck, materialLookup, isGui3d, useBlockLight, useAmbientOcclusion, transforms, rootTransform, renderTypeHint, visibilityTest);
+            return new StandaloneGeometryBakingContext(modelName, materialCheck, materialLookup, isGui3d, useBlockLight, useAmbientOcclusion, transforms, rootTransform, renderTypeHint, renderTypeFastHint, visibilityTest);
         }
     }
 }

src/main/java/net/minecraftforge/common/ForgeConfig.java

@@ -26,6 +26,8 @@ public class ForgeConfig {
 
         public final BooleanValue advertiseDedicatedServerToLan;
 
+        public final BooleanValue useItemWithDurationZero;
+
         Server(ForgeConfigSpec.Builder builder) {
             builder.comment("Server configuration settings")
                    .push("server");
@@ -58,8 +60,17 @@ public class ForgeConfig {
                     .translation("forge.configgui.advertiseDedicatedServerToLan")
                     .define("advertiseDedicatedServerToLan", true);
 
+            useItemWithDurationZero = builder
+                    .comment("Set this to true to enable living entities to use items with durations of 0. Fixes being able to use Eyes of Ender repeatedly by holding down the use button. Disabled by default as it could change interactions with items of existing mods.")
+                    .translation("forge.configgui.useItemWithDurationZero")
+                    .define("useItemWithDurationZero", false);
+
             builder.pop();
         }
+
+        public final int getUseItemDuration() {
+            return useItemWithDurationZero.get() ? 0 : 1;
+        }
     }
 
     /**
@@ -91,6 +102,8 @@ public class ForgeConfig {
 
         public final BooleanValue stabilizeDirectionGetNearest;
 
+        public final BooleanValue allowMipmapLowering;
+
 
         Client(ForgeConfigSpec.Builder builder) {
             builder.comment("Client only settings, mostly things related to rendering")
@@ -132,6 +145,11 @@ public class ForgeConfig {
                     .translation("forge.configgui.stabilizeDirectionGetNearest")
                     .define("stabilizeDirectionGetNearest", true);
 
+            allowMipmapLowering = builder
+                .comment("When enabled, Forge will allow mipmaps to be lowered in real-time. This is the default behavior in vanilla. Use this if you experience issues with resource packs that use textures lower than 8x8.")
+                .translation("forge.configgui.allowMipmapLowering")
+                .define("allowMipmapLowering", false);
+
             builder.pop();
         }
 
@@ -144,6 +162,10 @@ public class ForgeConfig {
         public final boolean showLoadWarnings() {
             return clientSpec.isLoaded() ? showLoadWarnings.get() : showLoadWarnings.getDefault();
         }
+
+        public final boolean allowMipmapLowering() {
+            return clientSpec.isLoaded() ? allowMipmapLowering.get() : allowMipmapLowering.getDefault();
+        }
     }
 
     static final ForgeConfigSpec clientSpec;

src/main/java/net/minecraftforge/common/ForgeHooks.java

@@ -474,7 +474,7 @@ public final class ForgeHooks {
         level.captureBlockSnapshots = false;
 
         if (ret.consumesAction()) {
-            var postUse = itemstack.copy();
+            var postUse = player.getItemInHand(context.getHand());
 
             var blockSnapshots = new ArrayList<>(level.capturedBlockSnapshots);
             level.capturedBlockSnapshots.clear();
@@ -500,8 +500,7 @@ public final class ForgeHooks {
                 }
             } else {
                 // Change the stack to its new content
-                if (!player.isCreative())
-                    player.setItemInHand(context.getHand(), postUse);
+                player.setItemInHand(context.getHand(), postUse);
 
                 for (BlockSnapshot snap : blockSnapshots) {
                     int updateFlag = snap.getFlag();
@@ -648,9 +647,8 @@ public final class ForgeHooks {
     }
 
     public static boolean onCropsGrowPre(Level level, BlockPos pos, BlockState state, boolean def) {
-        BlockEvent ev = new BlockEvent.CropGrowEvent.Pre(level,pos,state);
-        MinecraftForge.EVENT_BUS.post(ev);
-        return (ev.getResult() == Event.Result.ALLOW || (ev.getResult() == Event.Result.DEFAULT && def));
+        var result = MinecraftForge.EVENT_BUS.fire(new BlockEvent.CropGrowEvent.Pre(level,pos,state)).getResult();
+        return (result.isAllowed() || (def && result.isDefault()));
     }
 
     public static void onCropsGrowPost(Level level, BlockPos pos, BlockState state) {
@@ -697,7 +695,7 @@ public final class ForgeHooks {
                 if (potion != null && potion.unwrapKey().isPresent())
                     return potion.unwrapKey().get().location().getNamespace();
             } else if (item instanceof SpawnEggItem egg) {
-                var resourceLocation = ForgeRegistries.ENTITY_TYPES.getKey(egg.getType(null));
+                var resourceLocation = ForgeRegistries.ENTITY_TYPES.getKey(egg.getType(itemStack));
                 if (resourceLocation != null)
                     return resourceLocation.getNamespace();
             }

src/main/java/net/minecraftforge/common/ForgeInternalHandler.java

@@ -51,8 +51,13 @@ public class ForgeInternalHandler {
     }
 
     @SubscribeEvent
-    public void onServerTick(ServerTickEvent event) {
-        WorldWorkerManager.tick(event.phase == TickEvent.Phase.START);
+    public void onServerTick(ServerTickEvent.Pre event) {
+        WorldWorkerManager.tick(true);
+    }
+
+    @SubscribeEvent
+    public void onServerTick(ServerTickEvent.Post event) {
+        WorldWorkerManager.tick(false);
     }
 
     @SubscribeEvent
@@ -96,7 +101,7 @@ public class ForgeInternalHandler {
 
     @SubscribeEvent
     public void onResourceReload(AddReloadListenerEvent event) {
-        INSTANCE = new LootModifierManager();
+        INSTANCE = new LootModifierManager(event.getRegistries());
         event.addListener(INSTANCE);
     }
 

src/main/java/net/minecraftforge/common/ForgeMod.java

@@ -374,7 +374,7 @@ public class ForgeMod {
         enableMilkFluid = true;
     }
 
-    public ForgeMod() {
+    public ForgeMod(FMLJavaModLoadingContext context) {
         LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion());
         INSTANCE = this;
         MinecraftForge.initialize();
@@ -391,7 +391,7 @@ public class ForgeMod {
         CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec);
         CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion());
 
-        final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        final IEventBus modEventBus = context.getModEventBus();
         // Forge-provided datapack registries
         modEventBus.addListener((DataPackRegistryEvent.NewRegistry event) -> {
             event.dataPackRegistry(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifier.DIRECT_CODEC);
@@ -406,13 +406,13 @@ public class ForgeMod {
         registries.forEach(r -> r.register(modEventBus));
 
         MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec);
+        context.registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec);
+        context.registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec);
+        context.registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec);
         modEventBus.register(ForgeConfig.class);
         ForgeDeferredRegistriesSetup.setup(modEventBus);
         // Forge does not display problems when the remote is not matching.
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, ()->new IExtensionPoint.DisplayTest(()->"ANY", (remote, isServer)-> true));
+        context.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
         StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion());
 
         MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);

src/main/java/net/minecraftforge/common/IForgeShearable.java

@@ -23,8 +23,7 @@ import org.jetbrains.annotations.Nullable;
  * to support mod-shears as well.
  *
  */
-public interface IForgeShearable
-{
+public interface IForgeShearable {
     /**
      * Checks if the object is currently shearable
      * Example: Sheep return false when they have no wool
@@ -34,8 +33,7 @@ public interface IForgeShearable
      * @param pos Block's position in level.
      * @return If this is shearable, and onSheared should be called.
      */
-    default boolean isShearable(@NotNull ItemStack item, Level level, BlockPos pos)
-    {
+    default boolean isShearable(@NotNull ItemStack item, Level level, BlockPos pos) {
         return true;
     }
 
@@ -58,8 +56,7 @@ public interface IForgeShearable
      * @return A List containing all items from this shearing. May be empty.
      */
     @NotNull
-    default List<ItemStack> onSheared(@Nullable Player player, @NotNull ItemStack item, Level level, BlockPos pos, int fortune)
-    {
+    default List<ItemStack> onSheared(@Nullable Player player, @NotNull ItemStack item, Level level, BlockPos pos, int fortune) {
         return Collections.emptyList();
     }
 }

src/main/java/net/minecraftforge/common/MinecraftForge.java

@@ -31,12 +31,10 @@ import java.util.function.Supplier;
 public class MinecraftForge
 {
     /**
-     * The core Forge EventBusses, all events for Forge will be fired on these,
-     * you should use this to register all your listeners.
-     * This replaces every register*Handler() function in the old version of Forge.
-     * TERRAIN_GEN_BUS for terrain gen events
-     * ORE_GEN_BUS for ore gen events
-     * EVENT_BUS for everything else
+     * The EventBus for all the Forge Events.
+     *
+     * Events marked with {@link net.minecraftforge.fml.event.IModBusEvent}
+     * belong on the ModBus and not this bus
      */
     public static final IEventBus EVENT_BUS = BusBuilder.builder().startShutdown().useModLauncher().build();
 
@@ -85,36 +83,4 @@ public class MinecraftForge
                () -> new ConfigScreenHandler.ConfigScreenFactory(screenFunction)
         );
     }
-
-/*
-   public static void preloadCrashClasses(ASMDataTable table, String modID, Set<String> classes)
-   {
-       //Find all ICrashReportDetail's handlers and preload them.
-       List<String> all = Lists.newArrayList();
-       for (ASMData asm : table.getAll(ICrashReportDetail.class.getName().replace('.', '/')))
-           all.add(asm.getClassName());
-       for (ASMData asm : table.getAll(ICrashCallable.class.getName().replace('.', '/')))
-           all.add(asm.getClassName());
-
-       all.retainAll(classes);
-
-       if (all.size() == 0)
-        return;
-
-       ForgeMod.log.debug("Preloading CrashReport Classes");
-       Collections.sort(all); //Sort it because I like pretty output ;)
-       for (String name : all)
-       {
-           ForgeMod.log.debug("\t{}", name);
-           try
-           {
-               Class.forName(name.replace('/', '.'), false, MinecraftForge.class.getClassLoader());
-           }
-           catch (Exception e)
-           {
-               LOGGER.error("Could not find class for name '{}'.", name, e);
-           }
-       }
-   }
-*/
 }

src/main/java/net/minecraftforge/common/Tags.java

@@ -40,6 +40,7 @@ public class Tags
         public static final TagKey<Block> CHESTS_ENDER = tag("chests/ender");
         public static final TagKey<Block> CHESTS_TRAPPED = tag("chests/trapped");
         public static final TagKey<Block> CHESTS_WOODEN = tag("chests/wooden");
+        public static final TagKey<Block> CHORUS_ADDITIONALLY_GROWS_ON = tag("chorus_additionally_grows_on");
         public static final TagKey<Block> COBBLESTONE = tag("cobblestone");
         public static final TagKey<Block> COBBLESTONE_NORMAL = tag("cobblestone/normal");
         public static final TagKey<Block> COBBLESTONE_INFESTED = tag("cobblestone/infested");

src/main/java/net/minecraftforge/common/ToolActions.java

@@ -67,7 +67,7 @@ public class ToolActions
 
     /**
      *  Used during player attack to figure out if a sweep attack should be performed
-     *  
+     *
      *  @see IForgeItem#getSweepHitBox
      */
     public static final ToolAction SWORD_SWEEP = ToolAction.get("sword_sweep");

src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java

@@ -42,6 +42,7 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
         tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
         tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
         tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
+        tag(CHORUS_ADDITIONALLY_GROWS_ON).addTags(END_STONES);
         tag(COBBLESTONE).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE);
         tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE);
         tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE);

src/main/java/net/minecraftforge/common/extensions/IForgeGameTestHelper.java

@@ -5,51 +5,107 @@
 
 package net.minecraftforge.common.extensions;
 
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
+
 import com.mojang.authlib.GameProfile;
 
 import io.netty.channel.embedded.EmbeddedChannel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.gametest.framework.GameTestAssertException;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.network.Connection;
-import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.game.GameProtocols;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraftforge.common.ForgeI18n;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.Event;
 
 public interface IForgeGameTestHelper {
     private GameTestHelper self() {
-        return (GameTestHelper)this;
+        return (GameTestHelper) this;
+    }
+
+    default void say(String message) {
+        this.say(message, Style.EMPTY);
+    }
+
+    default void say(String message, Style style) {
+        var component = ForgeI18n.getPattern(message) != null ? Component.translatable(message) : Component.literal(message);
+        this.say(component.withStyle(style));
+    }
+
+    default void say(Component component) {
+        this.self().getLevel().players().forEach(p -> p.sendSystemMessage(component));
     }
 
     default void assertTrue(boolean value, Supplier<String> message) {
-       if (!value)
-          throw new GameTestAssertException(message.get());
+        if (!value)
+            throw new GameTestAssertException(message.get());
     }
 
     default void assertFalse(boolean value, Supplier<String> message) {
-       if (value)
-          throw new GameTestAssertException(message.get());
+        if (value)
+            throw new GameTestAssertException(message.get());
+    }
+
+    default <N> void assertValueEqual(N expected, N actual, String name, String message) {
+        this.assertValueEqual(expected, actual, name, () -> message);
+    }
+
+    default <N> void assertValueEqual(N expected, N actual, String name, Supplier<String> message) {
+        if (!Objects.equals(expected, actual))
+            throw new GameTestAssertException("%s -- Expected %s to be %s, but was %s".formatted(message.get(), name, expected, actual));
+    }
+
+    default <N> void assertValueEqual(N[] expected, N[] actual, String name, String message) {
+        this.assertValueEqual(expected, actual, name, () -> message);
+    }
+
+    default <N> void assertValueEqual(N[] expected, N[] actual, String name, Supplier<String> message) {
+        if (!Objects.deepEquals(expected, actual))
+            throw new GameTestAssertException("%s -- Expected %s to be %s, but was %s".formatted(message.get(), name, Arrays.toString(expected), Arrays.toString(actual)));
+    }
+
+    default <E> Registry<E> registry(ResourceKey<? extends Registry<? extends E>> registryKey) {
+        return this.self().getLevel().registryAccess().registryOrThrow(registryKey);
+    }
+
+    default <E> HolderLookup.RegistryLookup<E> registryLookup(ResourceKey<? extends Registry<? extends E>> registryKey) {
+        return this.self().getLevel().registryAccess().lookupOrThrow(registryKey);
     }
 
     default ServerPlayer makeMockServerPlayer() {
         var level = self().getLevel();
         var cookie = CommonListenerCookie.createInitial(new GameProfile(UUID.randomUUID(), "test-mock-player"), false);
         var player = new ServerPlayer(level.getServer(), level, cookie.gameProfile(), cookie.clientInformation()) {
-           public boolean isSpectator() {
-              return false;
-           }
+            public boolean isSpectator() {
+                return false;
+            }
 
-           public boolean isCreative() {
-              return true;
-           }
+            public boolean isCreative() {
+                return true;
+            }
         };
         var connection = new Connection(PacketFlow.SERVERBOUND);
+        @SuppressWarnings("unused") // Constructor has side effects
         var channel = new EmbeddedChannel(connection);
         var server = level.getServer();
 
@@ -58,4 +114,218 @@ public interface IForgeGameTestHelper {
         connection.setupInboundProtocol(info, listener);
         return player;
     }
+
+    /**
+     * Registers an event listener that will be unregistered when the test is finished running.
+     */
+    default <E extends Event> void addEventListener(Consumer<E> consumer) {
+        MinecraftForge.EVENT_BUS.addListener(consumer);
+        self().addCleanup(success -> MinecraftForge.EVENT_BUS.unregister(consumer));
+    }
+
+    /**
+     * Registers an event listener that will be unregistered when the test is finished running.
+     */
+    default void registerEventListener(Object handler) {
+        MinecraftForge.EVENT_BUS.register(handler);
+        self().addCleanup(success -> MinecraftForge.EVENT_BUS.unregister(handler));
+    }
+
+    /**
+     * Creates a floor of stone blocks at the bottom of the test area.
+     */
+    default void makeFloor() {
+        makeFloor(Blocks.STONE);
+    }
+
+    /**
+     * Creates a floor of the specified block under the test area.
+     */
+    default void makeFloor(Block block) {
+        makeFloor(block, -1);
+    }
+
+    /**
+     * Creates a floor of the specified block at the specified height.
+     */
+    default void makeFloor(Block block, int height) {
+        var bounds = self().getBounds();
+        var pos = new BlockPos.MutableBlockPos();
+        for (int x = 0; x < (int) bounds.getXsize(); x++) {
+            for (int y = 0; y < (int) bounds.getZsize(); y++) {
+                pos.set(x, height, y);
+                if (self().getBlockState(pos).is(Blocks.AIR))
+                    self().setBlock(pos, block);
+            }
+        }
+    }
+
+    default BlockState setAndAssertBlock(int x, int y, int z, Block block) {
+        return this.setAndAssertBlock(x, y, z, block.defaultBlockState());
+    }
+
+    default BlockState setAndAssertBlock(int x, int y, int z, BlockState state) {
+        return this.setAndAssertBlock(new BlockPos(x, y, z), state);
+    }
+
+    default BlockState setAndAssertBlock(BlockPos pos, Block block) {
+        return this.setAndAssertBlock(pos, block.defaultBlockState());
+    }
+
+    default BlockState setAndAssertBlock(BlockPos pos, BlockState state) {
+        this.assertTrue(
+                this.self().getLevel().setBlock(this.self().absolutePos(pos), state, Block.UPDATE_ALL),
+                () -> "Failed to set block at pos %s : %s".formatted(pos, state.getBlock())
+        );
+        return state;
+    }
+
+    default <T> Flag<T> flag(String name) {
+        return new Flag<>(name);
+    }
+
+    default IntFlag intFlag(String name) {
+        return new IntFlag(name);
+    }
+
+    default BoolFlag boolFlag(String name) {
+        return new BoolFlag(name);
+    }
+
+    public static class Flag<T> {
+        private final String name;
+        @Nullable
+        protected T value = null;
+
+        public Flag(String name) {
+            this.name = name;
+        }
+
+        public void set(T value) {
+            this.value = value;
+        }
+
+        @Nullable
+        public T get() {
+            return this.value;
+        }
+
+        public void assertUnset() {
+            this.assertUnset((Supplier<String>) null);
+        }
+
+        public void assertUnset(String message) {
+            this.assertUnset(message != null ? () -> message : null);
+        }
+
+        public void assertUnset(Supplier<String> message) {
+            if (this.value != null) {
+                String s = message != null ? message.get() + " -- " : "";
+                throw new GameTestAssertException(s + "Expected " + name + " to be null, but was " + this.value);
+            }
+        }
+
+        public void assertSet() {
+            this.assertSet((Supplier<String>) null);
+        }
+
+        public void assertSet(String message) {
+            this.assertSet(message != null ? () -> message : null);
+        }
+
+        public void assertSet(Supplier<String> message) {
+            if (this.value == null) {
+                String s = message != null ? message.get() + " -- " : "";
+                throw new GameTestAssertException(s + "Flag " + name + " was never set");
+            }
+        }
+
+        public void assertEquals(T expected) {
+            this.assertEquals(expected, (Supplier<String>) null);
+        }
+
+        public void assertEquals(T expected, String message) {
+            this.assertEquals(expected, message != null ? () -> message : null);
+        }
+
+        public void assertEquals(T expected, Supplier<String> message) {
+            assertSet(message);
+            if (expected != null && !expected.equals(this.value)) {
+                String s = message != null ? message.get() + " -- " : "";
+                throw new GameTestAssertException(s + "Expected " + name + " to be " + expected + ", but was " + this.value);
+            }
+        }
+    }
+
+    public static class IntFlag extends Flag<Long> {
+        public IntFlag(String name) {
+            super(name);
+        }
+
+        public void set(long value) {
+            super.set(value);
+        }
+
+        public byte getByte() {
+            return this.value == null ? -1 : this.value.byteValue();
+        }
+
+        public int getInt() {
+            return this.value == null ? -1 : this.value.intValue();
+        }
+
+        public long getLong() {
+            return this.value == null ? -1 : this.value.longValue();
+        }
+
+        public void assertEquals(int expected) {
+            super.assertEquals((long) expected);
+        }
+
+        public void assertEquals(long expected) {
+            super.assertEquals(expected);
+        }
+
+        public void assertEquals(int expected, String message) {
+            super.assertEquals((long) expected, message);
+        }
+
+        public void assertEquals(long expected, String message) {
+            super.assertEquals(expected, message);
+        }
+
+        public void assertEquals(int expected, Supplier<String> message) {
+            super.assertEquals((long) expected, message);
+        }
+
+        public void assertEquals(long expected, Supplier<String> message) {
+            super.assertEquals(expected, message);
+        }
+    }
+
+    public static class BoolFlag extends Flag<Boolean> {
+        public BoolFlag(String name) {
+            super(name);
+        }
+
+        public void set(boolean value) {
+            super.set(value);
+        }
+
+        public boolean getBool() {
+            return this.value != null && this.value;
+        }
+
+        public void assertEquals(boolean expected) {
+            super.assertEquals(expected);
+        }
+
+        public void assertEquals(boolean expected, String message) {
+            super.assertEquals(expected, message);
+        }
+
+        public void assertEquals(boolean expected, Supplier<String> message) {
+            super.assertEquals(expected, message);
+        }
+    }
 }

src/main/java/net/minecraftforge/common/extensions/IForgeItem.java

@@ -7,6 +7,9 @@ package net.minecraftforge.common.extensions;
 
 import java.util.function.Consumer;
 
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.*;
@@ -33,6 +36,7 @@ import net.minecraft.world.level.Level;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.common.ToolAction;
 import net.minecraftforge.common.ToolActions;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -499,7 +503,7 @@ public interface IForgeItem {
      * @return True if this ItemStack can disable the shield in question.
      */
     default boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker) {
-        return this instanceof AxeItem;
+        return attacker.canDisableShield();
     }
 
     /**
@@ -521,6 +525,25 @@ public interface IForgeItem {
      */
     default void onHorseArmorTick(ItemStack stack, Level level, Mob horse) { }
 
+    /**
+     * Called when this item is to be damaged, such as use a tool being used or a shield blocking damage. The damage
+     * parameter has not yet been processed, so enchantments are not taken into account.
+     *
+     * @param stack    The processed amount of damage the item will take
+     * @param damage   The amount of damage the item will take before processing
+     * @param random   The random used where the damage is taking place (typically from the level)
+     * @param player   The player holding the item
+     * @param onBroken The callback for when an item is broken (use this if you plan on cancelling damage that will
+     *                 break an item)
+     * @return The amount of damage the item should take, after processing
+     *
+     * @apiNote If the item stack is not {@linkplain ItemStack#isDamageableItem() damageable}, this method will not be
+     * called.
+     */
+    default int damageItem(ItemStack stack, int damage, RandomSource random, @Nullable ServerPlayer player, Runnable onBroken) {
+        return damage;
+    }
+
     /**
      * Called when an item entity for this stack is destroyed. Note: The {@link ItemStack} can be retrieved from the item entity.
      *
@@ -627,4 +650,12 @@ public interface IForgeItem {
     default boolean canGrindstoneRepair(ItemStack stack) {
         return false;
     }
+
+    /**
+     * @return The Default Capability Provider for this item, if any, accounting for the given itemstack.
+     */
+    @Nullable
+    default ICapabilityProvider getCapabilityProvider(ItemStack stack) {
+        return null;
+    }
 }

src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java

@@ -5,6 +5,9 @@
 
 package net.minecraftforge.common.extensions;
 
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.entity.player.Inventory;
@@ -31,6 +34,8 @@ import net.minecraftforge.common.ToolActions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
+
 /*
  * Extension added to ItemStack that bounces to ItemSack sensitive Item methods. Typically this is just for convince.
  */
@@ -398,6 +403,25 @@ public interface IForgeItemStack {
         return self().getItem().getSweepHitBox(self(), player, target);
     }
 
+    /**
+     * Called when this item is to be damaged, such as use a tool being used or a shield blocking damage. The damage
+     * parameter has not yet been processed, so enchantments are not taken into account.
+     *
+     * @param damage   The amount of damage the item will take before processing
+     * @param random   The random used where the damage is taking place (typically from the level)
+     * @param player   The player holding the item
+     * @param onBroken The callback for when an item is broken (<strong>In 1.20.6, this callback will set the stack's
+     *                 damage to 0! Make sure to change it back if you do not want it to be deleted.</strong>)
+     * @return The amount of damage the item should take
+     *
+     * @apiNote If the item stack is not {@linkplain ItemStack#isDamageableItem() damageable}, this method will not be
+     * called.
+     * @see IForgeItem#damageItem(ItemStack, int, RandomSource, ServerPlayer, Runnable)
+     */
+    default int damageItem(int damage, RandomSource random, @Nullable ServerPlayer player, Runnable onBroken) {
+        return self().getItem().damageItem(self(), damage, random, player, onBroken);
+    }
+
     /**
      * Called when an item entity for this stack is destroyed. Note: The {@link ItemStack} can be retrieved from the item entity.
      *

src/main/java/net/minecraftforge/common/extensions/IForgeLevelSummary.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
+package net.minecraftforge.common.extensions;
+
+import net.minecraft.world.level.storage.LevelSummary;
+
+public interface IForgeLevelSummary {
+    private LevelSummary self() {
+        return (LevelSummary) this;
+    }
+
+    /**
+     * Checks if the Forge lifecycle of this level is experimental. This is used to render the experimental warning
+     * tooltip on the level select screen.
+     *
+     * @return {@code true} if the level is experimental
+     */
+    default boolean isLifecycleExperimental() {
+        // NOTE: Because CorruptedLevelSummary and SymlinkLevelSummary can have null settings, we need to check it
+        var settings = this.self().getSettings();
+
+        return settings != null && settings.getLifecycle().equals(com.mojang.serialization.Lifecycle.experimental());
+    }
+}

src/main/java/net/minecraftforge/common/loot/LootModifierManager.java

@@ -8,7 +8,9 @@ package net.minecraftforge.common.loot;
 import java.io.IOException;
 import java.util.*;
 
+import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.JsonOps;
+import net.minecraft.core.HolderLookup;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -30,10 +32,17 @@ public class LootModifierManager extends SimpleJsonResourceReloadListener {
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
     private static final String FOLDER = "loot_modifiers";
 
+    private final HolderLookup.Provider registries;
     private Map<ResourceLocation, IGlobalLootModifier> modifiers = ImmutableMap.of();
 
+    @Deprecated(forRemoval = true, since = "1.20.6")
     public LootModifierManager() {
+        this(null);
+    }
+
+    public LootModifierManager(HolderLookup.Provider registries) {
         super(GSON, FOLDER);
+        this.registries = registries;
     }
 
     @Override
@@ -68,12 +77,13 @@ public class LootModifierManager extends SimpleJsonResourceReloadListener {
     @Override
     protected void apply(Map<ResourceLocation, JsonElement> resources, ResourceManager resourceManagerIn, ProfilerFiller profilerIn) {
         Builder<ResourceLocation, IGlobalLootModifier> builder = ImmutableMap.builder();
+        var ops = this.registries != null ? registries.createSerializationContext(JsonOps.INSTANCE) : JsonOps.INSTANCE;
         resources.forEach((location, json) -> {
-            IGlobalLootModifier.DIRECT_CODEC.parse(JsonOps.INSTANCE, json)
+            IGlobalLootModifier.DIRECT_CODEC.parse(ops, json)
                 // log error if parse fails
-                .resultOrPartial(errorMsg -> LOGGER.warn("Could not decode GlobalLootModifier with json id {} - error: {}", location, errorMsg))
+                .ifError(error -> LOGGER.warn("Could not decode GlobalLootModifier with json id {} - error: {}", location, error.message()))
                 // add loot modifier if parse succeeds
-                .ifPresent(modifier -> builder.put(location, modifier));
+                .ifSuccess(modifier -> builder.put(location, modifier));
         });
         this.modifiers = builder.build();
     }