Minecraft 1.21.9 update.

There a lot of performance improvements related to events.
  No more InheritableEvent for abstract events that you shouldn't add listeners to anyway, like EntityEvent. Use their sub-events.
  Made a lot more events records and interfaces. Mostly just a binary break, but has better performance.
  Mod bus posting methods are now static, no more ModLoader.get() for those.

ObjectHolder was removed, use RegistryObject.
Changed RuntimeEnumExtender to only target Minecraft classes. If you want other modders to interact with your API, use an Interface instead of Enum.
Moved some abstract event methods to only the relevant sub-events now, e.g. can no longer check the side of a ClientTickEvent, because it'll always be client

Rendering has changed a lot, they now batch most things together so that the game will render faster.
RenderHighlightEvent changed a lot

See https://github.com/MinecraftForge/MinecraftForge-Experimental/tree/1.21.9-dev for unsquashed commits.

Co-authored-by: Paint_Ninja <[email protected]>
This commit is contained in:
LexManosandPaint_Ninja committed 2025-10-01 13:05:12 -07:00
1 parent c1d703e395
commit b0ccf1a480
490 files changed
+4601 -6528

No files matched your search

@@ -46,7 +46,7 @@ public class FarmlandWaterManager
@SuppressWarnings("unchecked")
public static<T extends SimpleTicket<Vec3>> T addCustomTicket(Level level, T ticket, ChunkPos masterChunk, ChunkPos... additionalChunks)
{
Preconditions.checkArgument(!level.isClientSide, "Water region is only determined server-side");
Preconditions.checkArgument(!level.isClientSide(), "Water region is only determined server-side");
Map<ChunkPos, ChunkTicketManager<Vec3>> ticketMap = customWaterHandler.computeIfAbsent(level, id -> new MapMaker().weakValues().makeMap());
ChunkTicketManager<Vec3>[] additionalTickets = new ChunkTicketManager[additionalChunks.length];
for (int i = 0; i < additionalChunks.length; i++)
@@ -102,7 +102,6 @@ import net.minecraft.world.inventory.AnvilMenu;
import net.minecraft.world.Container;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.IntTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
@@ -322,14 +321,14 @@ public final class ForgeHooks {
if (ItemTossEvent.BUS.post(event))
return null;
if (!player.level().isClientSide)
if (!player.level().isClientSide())
player.level().addFreshEntity(event.getEntity());
return event.getEntity();
}
@Nullable
public static Component onServerChatSubmittedEvent(ServerPlayer player, Component message) {
var plain = message.getContents() instanceof LiteralContents literalContents ? literalContents.text() : "";
var plain = message.getContents() instanceof LiteralContents(String text) ? text : "";
var event = new ServerChatEvent(player, plain, message);
return ServerChatEvent.BUS.post(event) ? null : event.getMessage();
}
@@ -694,10 +693,13 @@ public final class ForgeHooks {
var potion = itemStack.get(DataComponents.POTION_CONTENTS).potion().orElse(null);
if (potion != null && potion.unwrapKey().isPresent())
return potion.unwrapKey().get().location().getNamespace();
} else if (item instanceof SpawnEggItem egg) {
var resourceLocation = EntityType.getKey(egg.getDefaultType());
if (resourceLocation != null)
return resourceLocation.getNamespace();
} else if (item instanceof SpawnEggItem) {
var data = item.components().get(DataComponents.ENTITY_DATA);
if (data != null && data.type() != null) {
var resourceLocation = EntityType.getKey(data.type());
if (resourceLocation != null)
return resourceLocation.getNamespace();
}
}
}
return modId;
@@ -788,9 +790,9 @@ public final class ForgeHooks {
@Deprecated
public static void modifyAttributes() {
ModLoader.get().postEvent(new EntityAttributeCreationEvent(FORGE_ATTRIBUTES));
ModLoader.postEvent(new EntityAttributeCreationEvent(FORGE_ATTRIBUTES));
Map<EntityType<? extends LivingEntity>, AttributeSupplier.Builder> finalMap = new HashMap<>();
ModLoader.get().postEvent(new EntityAttributeModificationEvent(finalMap));
ModLoader.postEvent(new EntityAttributeModificationEvent(finalMap));
finalMap.forEach((k, v) -> {
AttributeSupplier supplier = DefaultAttributes.getSupplier(k);
@@ -858,7 +860,7 @@ public final class ForgeHooks {
}
final var mismatchEvent = new ModMismatchEvent(levelDirectory, mismatchedVersions, missingVersions);
ModLoader.get().postEvent(mismatchEvent);
ModLoader.postEvent(mismatchEvent);
StringBuilder resolved = new StringBuilder("The following mods have version differences that were marked resolved:");
StringBuilder unresolved = new StringBuilder("The following mods have version differences that were not resolved:");
@@ -1043,7 +1045,7 @@ public final class ForgeHooks {
}
}
if (!isAir && !entity.level().isClientSide && entity.isPassenger() && entity.getVehicle() != null && !entity.getVehicle().canBeRiddenUnderFluidType(entity.getEyeInFluidType(), entity)) {
if (!isAir && !entity.level().isClientSide() && entity.isPassenger() && entity.getVehicle() != null && !entity.getVehicle().canBeRiddenUnderFluidType(entity.getEyeInFluidType(), entity)) {
entity.stopRiding();
}
}
@@ -1064,7 +1066,7 @@ public final class ForgeHooks {
entries.put(stack, vis);
});
ModLoader.get().postEvent(new BuildCreativeModeTabContentsEvent(tab, tabKey, params, entries));
ModLoader.postEvent(new BuildCreativeModeTabContentsEvent(tab, tabKey, params, entries));
for (var entry : entries)
output.accept(entry.getKey(), entry.getValue());
@@ -49,7 +49,7 @@ public final class ForgeInternalHandler {
if (newEntity != null) {
entity.discard();
@SuppressWarnings("resource")
var executor = LogicalSidedProvider.WORKQUEUE.get(event.getLevel().isClientSide ? LogicalSide.CLIENT : LogicalSide.SERVER);
var executor = LogicalSidedProvider.WORKQUEUE.get(event.getLevel().isClientSide() ? LogicalSide.CLIENT : LogicalSide.SERVER);
executor.schedule(new TickTask(0, () -> event.getLevel().addFreshEntity(newEntity)));
return true;
}
@@ -80,7 +80,7 @@ public final class ForgeInternalHandler {
@SubscribeEvent
static void playerLogin(PlayerEvent.PlayerLoggedInEvent event) {
UsernameCache.setUsername(event.getEntity().getUUID(), event.getEntity().getGameProfile().getName());
UsernameCache.setUsername(event.getEntity().getUUID(), event.getEntity().getGameProfile().name());
}
@SubscribeEvent
@@ -5,6 +5,7 @@
package net.minecraftforge.common;
import net.minecraft.DetectedVersion;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BiomeColors;
@@ -441,10 +442,9 @@ public class ForgeMod {
ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
gen.addProvider(true, new PackMetadataGenerator(packOutput)
.add(PackMetadataSection.TYPE, new PackMetadataSection(
.add(PackMetadataSection.SERVER_TYPE, new PackMetadataSection(
Component.translatable("pack.forge.description"),
SharedConstants.getCurrentVersion().packVersion(PackType.SERVER_DATA),
Optional.empty() //Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion))
DetectedVersion.BUILT_IN.packVersion(PackType.SERVER_DATA).minorRange()
))
);
ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(packOutput, lookupProvider, existingFileHelper);
@@ -14,13 +14,11 @@ import net.minecraftforge.fml.ModLoadingState;
import net.minecraftforge.fml.core.ModStateProvider;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.ObjectHolderRegistry;
import net.minecraftforge.registries.RegistryManager;
public class ForgeStatesProvider implements IModStateProvider {
public static final ModLoadingState CREATE_REGISTRIES = gather("CREATE_REGISTRIES", ModStateProvider.CONSTRUCT, RegistryManager::postNewRegistryEvent);
public static final ModLoadingState OBJECT_HOLDERS = gather("OBJECT_HOLDERS", CREATE_REGISTRIES, ObjectHolderRegistry::findObjectHolders);
public static final ModLoadingState INJECT_CAPABILITIES = gather("INJECT_CAPABILITIES", OBJECT_HOLDERS).withInline(CapabilityManager::injectCapabilities);
public static final ModLoadingState INJECT_CAPABILITIES = gather("INJECT_CAPABILITIES", CREATE_REGISTRIES).withInline(CapabilityManager::injectCapabilities);
public static final ModLoadingState UNFREEZE_DATA = gather("UNFREEZE_DATA", INJECT_CAPABILITIES, GameData::unfreezeData);
public static final ModLoadingState LOAD_REGISTRIES = gather("LOAD_REGISTRIES", UNFREEZE_DATA, GameData::postRegisterEvents);
public static final ModLoadingState FREEZE_DATA = complete("FREEZE_DATA", ModStateProvider.COMPLETE, GameData::freezeData);
@@ -44,6 +42,6 @@ public class ForgeStatesProvider implements IModStateProvider {
@Override
public List<IModLoadingState> getAllStates() {
return List.of(CREATE_REGISTRIES, OBJECT_HOLDERS, INJECT_CAPABILITIES, UNFREEZE_DATA, LOAD_REGISTRIES, FREEZE_DATA, NETWORK_LOCK);
return List.of(CREATE_REGISTRIES, INJECT_CAPABILITIES, UNFREEZE_DATA, LOAD_REGISTRIES, FREEZE_DATA, NETWORK_LOCK);
}
}
@@ -23,8 +23,7 @@ import java.util.function.Supplier;
* require the method:
*
* <pre>
* public static MyEnum create(String name, Object foo)
* {
* public static MyEnum create(String name, Object foo) {
* throw new IllegalStateException("Enum not extended");
* }
* </pre>
@@ -103,7 +103,7 @@ public final class CapabilityManager {
@SuppressWarnings("removal")
var event = new RegisterCapabilitiesEvent();
ModLoader.get().postEvent(event);
ModLoader.postEvent(event);
}
private static void error(String message) {
@@ -41,7 +41,8 @@ public abstract class ForgeBlockItemTagsProvider extends BlockItemTagsProvider {
.add(Blocks.MEDIUM_AMETHYST_BUD)
.add(Blocks.LARGE_AMETHYST_BUD);
tag(Tags.Blocks.CHAINS, Tags.Items.CHAINS)
.add(Blocks.CHAIN);
.add(Blocks.IRON_CHAIN)
.addAll(Blocks.COPPER_CHAIN.asList());
tag(Tags.Blocks.CHESTS, Tags.Items.CHESTS)
.addTags(
Tags.Blocks.CHESTS_ENDER,
@@ -182,7 +182,7 @@ public interface IForgeBlock {
*/
default boolean onDestroyedByPlayer(BlockState state, Level level, BlockPos pos, Player player, boolean willHarvest, FluidState fluid) {
self().playerWillDestroy(level, pos, state, player);
return level.setBlock(pos, fluid.createLegacyBlock(), level.isClientSide ? 11 : 3);
return level.setBlock(pos, fluid.createLegacyBlock(), level.isClientSide() ? 11 : 3);
}
/**
@@ -713,7 +713,7 @@ public interface IForgeBlock {
// Logic copied from HoeItem#TILLABLES; needs to be kept in sync during updating
Block block = state.getBlock();
if (block == Blocks.ROOTED_DIRT) {
if (!simulate && !context.getLevel().isClientSide) {
if (!simulate && !context.getLevel().isClientSide()) {
Block.popResourceFromFace(context.getLevel(), context.getClickedPos(), context.getClickedFace(), new ItemStack(Items.HANGING_ROOTS));
}
return Blocks.DIRT.defaultBlockState();
@@ -114,7 +114,7 @@ public interface IForgeBlockEntity extends ICapabilityProvider {
default void requestModelDataUpdate() {
BlockEntity te = self();
Level level = te.getLevel();
if (level != null && level.isClientSide) {
if (level != null && level.isClientSide()) {
var modelDataManager = level.getModelDataManager();
if (modelDataManager != null) {
modelDataManager.requestRefresh(te);
@@ -136,10 +136,9 @@ public interface IForgeBlockEntity extends ICapabilityProvider {
/**
* Returns whether this {@link BlockEntity} has custom outline rendering behavior.
*
* @param player the local player currently viewing this {@code BlockEntity}
* @return {@code true} to enable outline processing
*/
default boolean hasCustomOutlineRendering(Player player) {
default boolean hasCustomOutlineRendering() {
return false;
}
}
@@ -41,6 +41,7 @@ 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.GameType;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
@@ -50,6 +51,8 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.eventbus.api.bus.EventBus;
import net.minecraftforge.eventbus.api.event.InheritableEvent;
import net.minecraftforge.eventbus.api.event.MutableEvent;
import net.minecraftforge.eventbus.api.event.RecordEvent;
public interface IForgeGameTestHelper {
private GameTestHelper self() {
@@ -144,22 +147,24 @@ public interface IForgeGameTestHelper {
return this.self().getLevel().registryAccess().lookupOrThrow(registryKey);
}
/**
* Create a mock server player in creative mode
*/
default ServerPlayer makeMockServerPlayer() {
return makeMockServerPlayer(true);
return makeMockServerPlayer(GameType.CREATIVE);
}
/**
* Create a mock server player in creative mode
*/
default ServerPlayer makeMockServerPlayer(boolean creative) {
return makeMockServerPlayer(creative ? GameType.CREATIVE : GameType.SURVIVAL);
}
default ServerPlayer makeMockServerPlayer(GameType type) {
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 isCreative() {
return creative;
}
};
var player = new ServerPlayer(level.getServer(), level, cookie.gameProfile(), cookie.clientInformation());
var connection = new Connection(PacketFlow.SERVERBOUND);
@SuppressWarnings("unused") // The constructor has side effects
var channel = new EmbeddedChannel(connection);
@@ -168,6 +173,7 @@ public interface IForgeGameTestHelper {
var listener = new ServerGamePacketListenerImpl(server, connection, player, cookie);
var info = GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(server.registryAccess()), listener);
connection.setupInboundProtocol(info, listener);
player.setGameMode(type);
return player;
}
@@ -179,6 +185,22 @@ public interface IForgeGameTestHelper {
self().addCleanup(success -> bus.removeListener(key));
}
/**
* Registers an event listener that will be unregistered when the test is finished running.
*/
default <E extends MutableEvent> void addMutableListener(EventBus<E> bus, Consumer<E> consumer) {
var key = bus.addListener(consumer);
self().addCleanup(success -> bus.removeListener(key));
}
/**
* Registers an event listener that will be unregistered when the test is finished running.
*/
default <E extends RecordEvent> void addRecordListener(EventBus<E> bus, Consumer<E> consumer) {
var key = bus.addListener(consumer);
self().addCleanup(success -> bus.removeListener(key));
}
/**
* Registers an event listener that will be unregistered when the test is finished running.
*/
@@ -51,7 +51,7 @@ public interface IForgeServerPlayer {
@SuppressWarnings("resource")
default void openMenu(MenuProvider containerSupplier, Consumer<FriendlyByteBuf> extraDataWriter) {
var player = self();
if (player.level().isClientSide) return;
if (player.level().isClientSide()) return;
player.doCloseContainer();
player.nextContainerCounter();
int openContainerId = player.containerCounter;