1.21.3 update

This commit is contained in:
LexManos committed 2024-10-25 18:04:34 -07:00
1 parent c22589b5b3
commit 086bcb7148
806 files changed
+6314 -10501

No files matched your search

@@ -24,41 +24,42 @@ import org.jetbrains.annotations.ApiStatus;
*
* @see ViewportEvent.ComputeFov
*/
public class ComputeFovModifierEvent extends Event
{
public class ComputeFovModifierEvent extends Event {
private final Player player;
private final float fovModifier;
private final float scale;
private float newFovModifier;
@ApiStatus.Internal
public ComputeFovModifierEvent(Player player, float fovModifier)
{
public ComputeFovModifierEvent(Player player, float fovModifier, float scale) {
this.player = player;
this.fovModifier = fovModifier;
this.setNewFovModifier((float) Mth.lerp(Minecraft.getInstance().options.fovEffectScale().get(), 1.0F, fovModifier));
this.scale = scale;
this.newFovModifier = Mth.lerp(scale, 1.0F, fovModifier);
}
/**
* {@return the player affected by this event}
*/
public Player getPlayer()
{
public Player getPlayer() {
return player;
}
/**
* {@return the original field of vision (FOV) of the player, before any modifications or interpolation}
*/
public float getFovModifier()
{
public float getFovModifier() {
return fovModifier;
}
public float getScale() {
return scale;
}
/**
* {@return the current field of vision (FOV) of the player}
*/
public float getNewFovModifier()
{
public float getNewFovModifier() {
return newFovModifier;
}
@@ -67,8 +68,7 @@ public class ComputeFovModifierEvent extends Event
*
* @param newFovModifier the new field of vision (FOV)
*/
public void setNewFovModifier(float newFovModifier)
{
public void setNewFovModifier(float newFovModifier) {
this.newFovModifier = newFovModifier;
}
}
@@ -6,7 +6,6 @@
package net.minecraftforge.client.event;
import com.google.common.collect.ImmutableMap;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.SkullModel;
import net.minecraft.client.model.SkullModelBase;
import net.minecraft.client.model.geom.EntityModelSet;
@@ -18,8 +17,8 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.renderer.entity.state.EntityRenderState;
import net.minecraft.client.resources.PlayerSkin;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
@@ -128,12 +127,12 @@ public abstract class EntityRenderersEvent extends Event implements IModBusEvent
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public static class AddLayers extends EntityRenderersEvent {
private final Map<EntityType<?>, EntityRenderer<?>> renderers;
private final Map<PlayerSkin.Model, EntityRenderer<? extends Player>> skinMap;
private final Map<EntityType<?>, EntityRenderer<?, ?>> renderers;
private final Map<PlayerSkin.Model, EntityRenderer<? extends Player, ?>> skinMap;
private final EntityRendererProvider.Context context;
@ApiStatus.Internal
public AddLayers(Map<EntityType<?>, EntityRenderer<?>> renderers, Map<PlayerSkin.Model, EntityRenderer<? extends Player>> playerRenderers, EntityRendererProvider.Context context) {
public AddLayers(Map<EntityType<?>, EntityRenderer<?, ?>> renderers, Map<PlayerSkin.Model, EntityRenderer<? extends Player, ?>> playerRenderers, EntityRendererProvider.Context context) {
this.renderers = renderers;
this.skinMap = playerRenderers;
this.context = context;
@@ -160,7 +159,7 @@ public abstract class EntityRenderersEvent extends Event implements IModBusEvent
*/
@Nullable
@SuppressWarnings("unchecked")
public <R extends EntityRenderer<? extends Player>> R getPlayerSkin(PlayerSkin.Model skinName) {
public <R extends EntityRenderer<? extends Player, ?>> R getPlayerSkin(PlayerSkin.Model skinName) {
return (R)skinMap.get(skinName);
}
@@ -174,7 +173,7 @@ public abstract class EntityRenderersEvent extends Event implements IModBusEvent
*/
@Nullable
@SuppressWarnings("unchecked")
public <T extends LivingEntity, R extends EntityRenderer<T>> R getEntityRenderer(EntityType<? extends T> entityType) {
public <T extends LivingEntity, S extends EntityRenderState, R extends EntityRenderer<T, S>> R getEntityRenderer(EntityType<? extends T> entityType) {
return (R)renderers.get(entityType);
}
@@ -8,53 +8,55 @@ package net.minecraftforge.client.event;
import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.event.IModBusEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import com.mojang.blaze3d.audio.Channel;
import com.mojang.blaze3d.platform.NativeImage;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Camera;
import net.minecraft.client.ClientRecipeBook;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.MouseHandler;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.toasts.Toast;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.multiplayer.MultiPlayerGameMode;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider.Context;
import net.minecraft.client.renderer.entity.ItemFrameRenderer;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.renderer.entity.state.EntityRenderState;
import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
import net.minecraft.client.renderer.entity.state.PlayerRenderState;
import net.minecraft.client.resources.PlayerSkin.Model;
import net.minecraft.client.resources.sounds.SoundInstance;
import net.minecraft.client.sounds.SoundEngine;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.Component;
import net.minecraft.server.packs.resources.ResourceProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.client.event.sound.PlaySoundSourceEvent;
import net.minecraftforge.client.event.sound.PlayStreamingSourceEvent;
import net.minecraftforge.eventbus.api.Event;
@@ -88,33 +90,27 @@ public final class ForgeEventFactoryClient {
ML.postEvent(e);
}
public static void onGatherLayers(Map<EntityType<?>, EntityRenderer<?>> renderers, Map<Model, EntityRenderer<? extends Player>> playerRenderers, Context context) {
public static void onGatherLayers(Map<EntityType<?>, EntityRenderer<?, ?>> renderers, Map<Model, EntityRenderer<? extends Player, ?>> playerRenderers, Context context) {
// TODO: Why is this a ModLoader event...
postModBus(new EntityRenderersEvent.AddLayers(renderers, playerRenderers, context));
}
public static void onRegisterShaders(ResourceProvider resourceProvider, List<Pair<ShaderInstance, Consumer<ShaderInstance>>> shaderList) {
// TODO: Why is this a ModLoader event...
postModBus(new RegisterShadersEvent(resourceProvider, shaderList));
public static boolean onScreenMouseReleased(Screen screen, double mouseX, double mouseY, int button) {
if (post(new ScreenEvent.MouseButtonReleased.Pre(screen, mouseX, mouseY, button)))
return true;
var ret = screen.mouseReleased(mouseX, mouseY, button);
var result = fire(new ScreenEvent.MouseButtonReleased.Post(screen, mouseX, mouseY, button, ret)).getResult();
return result == Event.Result.DEFAULT ? ret : result == Event.Result.ALLOW;
}
public static void onScreenMouseReleased(boolean[] state, Screen screen, double mouseX, double mouseY, int button) {
state[0] = post(new ScreenEvent.MouseButtonReleased.Pre(screen, mouseX, mouseY, button));
if (!state[0]) {
state[0] = screen.mouseReleased(mouseX, mouseY, button);
var result = fire(new ScreenEvent.MouseButtonReleased.Post(screen, mouseX, mouseY, button, state[0])).getResult();
state[0] = result == Event.Result.DEFAULT ? state[0] : result == Event.Result.ALLOW;
}
}
public static boolean onScreenMouseClicked(Screen screen, double mouseX, double mouseY, int button) {
var ret = post(new ScreenEvent.MouseButtonPressed.Pre(screen, mouseX, mouseY, button));
if (!ret)
ret = screen.mouseClicked(mouseX, mouseY, button);
public static void onScreenMouseClicked(boolean[] state, Screen screen, double mouseX, double mouseY, int button) {
state[0] = post(new ScreenEvent.MouseButtonPressed.Pre(screen, mouseX, mouseY, button));
if (!state[0]) {
state[0] = screen.mouseClicked(mouseX, mouseY, button);
}
var result = fire(new ScreenEvent.MouseButtonPressed.Post(screen, mouseX, mouseY, button, state[0])).getResult();
state[0] = result == Event.Result.DEFAULT ? state[0] : result == Event.Result.ALLOW;
var result = fire(new ScreenEvent.MouseButtonPressed.Post(screen, mouseX, mouseY, button, ret)).getResult();
return result == Event.Result.DEFAULT ? ret : result == Event.Result.ALLOW;
}
public static boolean onMouseButtonPre(int button, int action, int mods) {
@@ -141,8 +137,8 @@ public final class ForgeEventFactoryClient {
return post(new ScreenEvent.MouseDragged.Pre(guiScreen, mouseX, mouseY, mouseButton, dragX, dragY));
}
public static void onScreenMouseDragPost(Screen guiScreen, double mouseX, double mouseY, int mouseButton, double dragX, double dragY) {
post(new ScreenEvent.MouseDragged.Post(guiScreen, mouseX, mouseY, mouseButton, dragX, dragY));
public static boolean onScreenMouseDragPost(Screen guiScreen, double mouseX, double mouseY, int mouseButton, double dragX, double dragY) {
return post(new ScreenEvent.MouseDragged.Post(guiScreen, mouseX, mouseY, mouseButton, dragX, dragY));
}
public static @Nullable Screen onScreenOpening(Screen old, Screen screen) {
@@ -216,7 +212,7 @@ public final class ForgeEventFactoryClient {
post(new ClientPlayerNetworkEvent.Clone(pc, oldPlayer, newPlayer, networkManager));
}
public static ViewportEvent.ComputeFov fireComputeFov(GameRenderer renderer, Camera camera, double partialTick, double fov, boolean usedConfiguredFov) {
public static ViewportEvent.ComputeFov fireComputeFov(GameRenderer renderer, Camera camera, double partialTick, float fov, boolean usedConfiguredFov) {
return fire(new ViewportEvent.ComputeFov(renderer, camera, partialTick, fov, usedConfiguredFov));
}
@@ -224,32 +220,32 @@ public final class ForgeEventFactoryClient {
return fire(new ViewportEvent.ComputeCameraAngles(renderer, camera, partial, camera.getYRot(), camera.getXRot(), 0));
}
public static <T extends LivingEntity, M extends EntityModel<T>> boolean onRenderLivingPre(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderLivingEvent.Pre<T, M>(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight));
public static <T extends LivingEntity, S extends LivingEntityRenderState, M extends EntityModel<? super S>> boolean onRenderLivingPre(S state, LivingEntityRenderer<T, S, M> renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderLivingEvent.Pre<T, S, M>(state, renderer, poseStack, multiBufferSource, packedLight));
}
public static <T extends LivingEntity, M extends EntityModel<T>> boolean onRenderLivingPost(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderLivingEvent.Post<T, M>(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight));
public static <T extends LivingEntity, S extends LivingEntityRenderState, M extends EntityModel<? super S>> boolean onRenderLivingPost(S state, LivingEntityRenderer<T, S, M> renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderLivingEvent.Post<T, S, M>(state, renderer, poseStack, multiBufferSource, packedLight));
}
public static boolean onRenderPlayerPre(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderPlayerEvent.Pre(player, renderer, partialTick, poseStack, multiBufferSource, packedLight));
public static boolean onRenderPlayerPre(PlayerRenderState player, PlayerRenderer renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderPlayerEvent.Pre(player, renderer, poseStack, multiBufferSource, packedLight));
}
public static boolean onRenderPlayerPost(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderPlayerEvent.Post(player, renderer, partialTick, poseStack, multiBufferSource, packedLight));
public static boolean onRenderPlayerPost(PlayerRenderState player, PlayerRenderer renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderPlayerEvent.Post(player, renderer, poseStack, multiBufferSource, packedLight));
}
public static boolean onRenderArm(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, AbstractClientPlayer player, HumanoidArm arm) {
return post(new RenderArmEvent(poseStack, multiBufferSource, packedLight, player, arm));
public static boolean onRenderArm(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, HumanoidArm arm) {
return post(new RenderArmEvent(poseStack, multiBufferSource, packedLight, arm));
}
public static boolean onRenderItemInFrame(ItemFrame itemFrame, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderItemInFrameEvent(itemFrame, renderItemFrame, poseStack, multiBufferSource, packedLight));
public static boolean onRenderItemInFrame(ItemFrameRenderState state, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return post(new RenderItemInFrameEvent(state, renderItemFrame, poseStack, multiBufferSource, packedLight));
}
public static RenderNameTagEvent fireRenderNameTagEvent(Entity entity, Component content, EntityRenderer<?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, float partialTick) {
return fire(new RenderNameTagEvent(entity, content, entityRenderer, poseStack, multiBufferSource, packedLight, partialTick));
public static RenderNameTagEvent fireRenderNameTagEvent(EntityRenderState state, Component content, EntityRenderer<?, ?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
return fire(new RenderNameTagEvent(state, content, entityRenderer, poseStack, multiBufferSource, packedLight));
}
public static void onRenderScreenBackground(Screen screen, GuiGraphics guiGraphics) {
@@ -263,4 +259,24 @@ public final class ForgeEventFactoryClient {
public static void onRenderTickEnd(DeltaTracker timer) {
post(new TickEvent.RenderTickEvent.Post(timer));
}
public static RenderTooltipEvent.Background onRenderTooltipBackground(@NotNull ItemStack stack, GuiGraphics graphics, int x, int y, @NotNull Font font, @NotNull List<ClientTooltipComponent> components, @Nullable ResourceLocation backgroundPrefix) {
return fire(new RenderTooltipEvent.Background(stack, graphics, x, y, font, components, backgroundPrefix));
}
public static boolean onToastAdd(Toast toast) {
return post(new ToastAddEvent(toast));
}
public static ScreenEvent.RenderInventoryMobEffects onScreenEffectSize(Screen screen, int availableSpace, boolean compact, int horizontalOffset) {
return fire(new ScreenEvent.RenderInventoryMobEffects(screen, availableSpace, compact, horizontalOffset));
}
public static void onRecipesUpdated(ClientRecipeBook book) {
post(new RecipesUpdatedEvent(book));
}
public static ComputeFovModifierEvent fireFovModifierEvent(Player entity, float modifier, float scale) {
return fire(new ComputeFovModifierEvent(entity, modifier, scale));
}
}
@@ -21,7 +21,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.jetbrains.annotations.ApiStatus;
import java.util.Map;
import java.util.Set;
/**
* Houses events related to models.
@@ -116,31 +115,6 @@ public abstract class ModelEvent extends Event {
}
}
/**
* Fired when the {@link net.minecraft.client.resources.model.ModelBakery} is notified of the resource manager reloading.
* Allows developers to register models to be loaded, along with their dependencies.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.</p>
*
* <p>This event is fired on the {@linkplain FMLJavaModLoadingContext#getModEventBus() mod-specific event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public static class RegisterAdditional extends ModelEvent implements IModBusEvent {
private final Set<ModelResourceLocation> models;
@ApiStatus.Internal
public RegisterAdditional(Set<ModelResourceLocation> models) {
this.models = models;
}
/**
* Registers a model to be loaded, along with its dependencies.
*/
public void register(ModelResourceLocation model) {
models.add(model);
}
}
/**
* Allows users to register their own {@link IGeometryLoader geometry loaders} for use in block/item models.
*
@@ -5,7 +5,7 @@
package net.minecraftforge.client.event;
import net.minecraft.client.player.Input;
import net.minecraft.client.player.ClientInput;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerEvent;
@@ -21,13 +21,11 @@ import org.jetbrains.annotations.ApiStatus;
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public class MovementInputUpdateEvent extends PlayerEvent
{
private final Input input;
public class MovementInputUpdateEvent extends PlayerEvent {
private final ClientInput input;
@ApiStatus.Internal
public MovementInputUpdateEvent(Player player, Input input)
{
public MovementInputUpdateEvent(Player player, ClientInput input) {
super(player);
this.input = input;
}
@@ -35,8 +33,7 @@ public class MovementInputUpdateEvent extends PlayerEvent
/**
* {@return the player's movement inputs}
*/
public Input getInput()
{
public ClientInput getInput() {
return input;
}
}
@@ -5,6 +5,7 @@
package net.minecraftforge.client.event;
import net.minecraft.client.ClientRecipeBook;
import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
@@ -13,28 +14,25 @@ import net.minecraftforge.fml.LogicalSide;
import org.jetbrains.annotations.ApiStatus;
/**
* Fired when the {@link RecipeManager} has received and synced the recipes from the server to the client.
* Fired when the {@link ClientRecipeBook} has updated information about recipes from the server to the client.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.</p>
*
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public class RecipesUpdatedEvent extends Event
{
private final RecipeManager recipeManager;
public class RecipesUpdatedEvent extends Event {
private final ClientRecipeBook recipeBook;
@ApiStatus.Internal
public RecipesUpdatedEvent(RecipeManager recipeManager)
{
this.recipeManager = recipeManager;
public RecipesUpdatedEvent(ClientRecipeBook recipeBook) {
this.recipeBook = recipeBook;
}
/**
* {@return the recipe manager}
*/
public RecipeManager getRecipeManager()
{
return recipeManager;
public ClientRecipeBook getRecipeBook() {
return recipeBook;
}
}
@@ -1,71 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.client.event;
import net.minecraft.client.RecipeBookCategories;
import net.minecraft.world.inventory.RecipeBookType;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.jetbrains.annotations.ApiStatus;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
/**
* Allows users to register custom categories for the vanilla recipe book, making it usable in modded GUIs.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.
*
* <p>This event is fired on the {@linkplain FMLJavaModLoadingContext#getModEventBus() mod-specific event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public class RegisterRecipeBookCategoriesEvent extends Event implements IModBusEvent
{
private final Map<RecipeBookCategories, List<RecipeBookCategories>> aggregateCategories;
private final Map<RecipeBookType, List<RecipeBookCategories>> typeCategories;
private final Map<RecipeType<?>, Function<Recipe<?>, RecipeBookCategories>> recipeCategoryLookups;
@ApiStatus.Internal
public RegisterRecipeBookCategoriesEvent(
Map<RecipeBookCategories, List<RecipeBookCategories>> aggregateCategories,
Map<RecipeBookType, List<RecipeBookCategories>> typeCategories,
Map<RecipeType<?>, Function<Recipe<?>, RecipeBookCategories>> recipeCategoryLookups)
{
this.aggregateCategories = aggregateCategories;
this.typeCategories = typeCategories;
this.recipeCategoryLookups = recipeCategoryLookups;
}
/**
* Registers the list of categories that compose an aggregate category.
*/
public void registerAggregateCategory(RecipeBookCategories category, List<RecipeBookCategories> others)
{
aggregateCategories.put(category, List.copyOf(others));
}
/**
* Registers the list of categories that compose a recipe book.
*/
public void registerBookCategories(RecipeBookType type, List<RecipeBookCategories> categories)
{
typeCategories.put(type, List.copyOf(categories));
}
/**
* Registers a category lookup for a certain recipe type.
*/
public void registerRecipeCategoryFinder(RecipeType<?> type, Function<Recipe<?>, RecipeBookCategories> lookup)
{
recipeCategoryLookups.put(type, lookup);
}
}
@@ -1,62 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.client.event;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.server.packs.resources.ResourceProvider;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.jetbrains.annotations.ApiStatus;
import java.util.List;
import java.util.function.Consumer;
/**
* Fired to allow mods to register custom {@linkplain ShaderInstance shaders}.
* This event is fired after the default Minecraft shaders have been registered.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.</p>
*
* <p>This event is fired on the {@linkplain FMLJavaModLoadingContext#getModEventBus() mod-specific event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public class RegisterShadersEvent extends Event implements IModBusEvent {
private final ResourceProvider resourceProvider;
private final List<Pair<ShaderInstance, Consumer<ShaderInstance>>> shaderList;
@ApiStatus.Internal
public RegisterShadersEvent(ResourceProvider resourceProvider, List<Pair<ShaderInstance, Consumer<ShaderInstance>>> shaderList) {
this.resourceProvider = resourceProvider;
this.shaderList = shaderList;
}
/**
* {@return the client-side resource provider}
*/
public ResourceProvider getResourceProvider() {
return resourceProvider;
}
/**
* Registers a shader, and a callback for when the shader is loaded.
*
* <p>When creating a {@link ShaderInstance}, pass in the {@linkplain #getResourceProvider()
* client-side resource provider} as the resource provider.</p>
*
* <p>Mods should not store the shader instance passed into this method. Instead, mods should store the shader
* passed into the registered load callback.</p>
*
* @param shaderInstance a shader
* @param onLoaded a callback for when the shader is loaded
*/
public void registerShader(ShaderInstance shaderInstance, Consumer<ShaderInstance> onLoaded) {
shaderList.add(Pair.of(shaderInstance, onLoaded));
}
}
@@ -32,15 +32,13 @@ public class RenderArmEvent extends Event {
private final PoseStack poseStack;
private final MultiBufferSource multiBufferSource;
private final int packedLight;
private final AbstractClientPlayer player;
private final HumanoidArm arm;
@ApiStatus.Internal
public RenderArmEvent(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, AbstractClientPlayer player, HumanoidArm arm) {
public RenderArmEvent(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, HumanoidArm arm) {
this.poseStack = poseStack;
this.multiBufferSource = multiBufferSource;
this.packedLight = packedLight;
this.player = player;
this.arm = arm;
}
@@ -73,12 +71,4 @@ public class RenderArmEvent extends Event {
public int getPackedLight() {
return packedLight;
}
/**
* {@return the client player that is having their arm rendered} In general, this will be the same as
* {@link net.minecraft.client.Minecraft#player}.
*/
public AbstractClientPlayer getPlayer() {
return player;
}
}
@@ -9,7 +9,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.ItemFrameRenderer;
import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
@@ -31,18 +31,16 @@ import org.jetbrains.annotations.ApiStatus;
*/
@Cancelable
public class RenderItemInFrameEvent extends Event {
private final ItemStack itemStack;
private final ItemFrame itemFrameEntity;
private final ItemFrameRenderState state;
private final ItemFrameRenderer<?> renderer;
private final PoseStack poseStack;
private final MultiBufferSource multiBufferSource;
private final int packedLight;
@ApiStatus.Internal
public RenderItemInFrameEvent(ItemFrame itemFrame, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
itemStack = itemFrame.getItem();
itemFrameEntity = itemFrame;
renderer = renderItemFrame;
public RenderItemInFrameEvent(ItemFrameRenderState state, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
this.state = state;
this.renderer = renderItemFrame;
this.poseStack = poseStack;
this.multiBufferSource = multiBufferSource;
this.packedLight = packedLight;
@@ -52,14 +50,14 @@ public class RenderItemInFrameEvent extends Event {
* {@return the item stack being rendered}
*/
public ItemStack getItemStack() {
return itemStack;
return getItemFrameState().itemStack;
}
/**
* {@return the item frame entity}
*/
public ItemFrame getItemFrameEntity() {
return itemFrameEntity;
public ItemFrameRenderState getItemFrameState() {
return state;
}
/**
@@ -1,247 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.client.event;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Camera;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.culling.Frustum;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.ForgeRenderTypes;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.jetbrains.annotations.ApiStatus;
import org.joml.Matrix4f;
/**
* Fires at various times during LevelRenderer.renderLevel.
* Check {@link #getStage} to render during the appropriate time for your use case.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}. </p>
*
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}. </p>
*/
public class RenderLevelStageEvent extends Event {
private final Stage stage;
private final LevelRenderer levelRenderer;
private final Matrix4f poseStack;
private final Matrix4f projectionMatrix;
private final int renderTick;
private final float partialTick;
private final Camera camera;
private final Frustum frustum;
public RenderLevelStageEvent(Stage stage, LevelRenderer levelRenderer, Matrix4f poseStack, Matrix4f projectionMatrix, int renderTick, float partialTick, Camera camera, Frustum frustum) {
this.stage = stage;
this.levelRenderer = levelRenderer;
this.poseStack = poseStack;
this.projectionMatrix = projectionMatrix;
this.renderTick = renderTick;
this.partialTick = partialTick;
this.camera = camera;
this.frustum = frustum;
}
/**
* {@return the current {@linkplain Stage stage} that is being rendered. Check this before doing rendering to ensure
* that rendering happens at the appropriate time.}
*/
public Stage getStage() {
return stage;
}
/**
* {@return the level renderer}
*/
public LevelRenderer getLevelRenderer() {
return levelRenderer;
}
/**
* @deprecated Mojang has stopped passing around PosStacks. getProjectionMatrix should be enough.
*/
@Deprecated(forRemoval = true, since = "1.21")
public Matrix4f getPoseStack() {
return poseStack;
}
/**
* {@return the projection matrix}
*/
public Matrix4f getProjectionMatrix() {
return projectionMatrix;
}
/**
* {@return the current "ticks" value in the {@linkplain LevelRenderer level renderer}}
*/
public int getRenderTick() {
return renderTick;
}
/**
* {@return the current partialTick value used for rendering}
*/
public float getPartialTick() {
return partialTick;
}
/**
* {@return the camera}
*/
public Camera getCamera() {
return camera;
}
/**
* {@return the frustum}
*/
public Frustum getFrustum() {
return frustum;
}
/**
* Use to create a custom {@linkplain RenderLevelStageEvent.Stage stages}.
* Fired after the LevelRenderer has been created.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}. </p>
*
* <p>This event is fired on the {@linkplain FMLJavaModLoadingContext#getModEventBus() mod-specific event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}. </p>
*/
public static class RegisterStageEvent extends Event implements IModBusEvent {
/**
* @param name The name of your Stage.
* @param renderType
* If not null, called automatically by LevelRenderer.renderChunkLayer if the RenderType passed into it matches this one.
* If null, needs to be called manually by whoever implements it.
*
* @throws IllegalArgumentException if the RenderType passed is already mapped to a Stage.
*/
public Stage register(ResourceLocation name, @Nullable RenderType renderType) throws IllegalArgumentException {
return Stage.register(name, renderType);
}
}
/**
* A time during level rendering for you to render custom things into the world.
* @see RegisterStageEvent
*/
public static class Stage {
private static final Map<RenderType, Stage> RENDER_TYPE_STAGES = new HashMap<>();
/**
* Use this to render custom objects into the skybox.
* Called regardless of if they sky actually renders or not.
*/
public static final Stage AFTER_SKY = register("after_sky", null);
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_SOLID_BLOCKS = register("after_solid_blocks", RenderType.solid());
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_CUTOUT_MIPPED_BLOCKS_BLOCKS = register("after_cutout_mipped_blocks", RenderType.cutoutMipped());
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_CUTOUT_BLOCKS = register("after_cutout_blocks", RenderType.cutout());
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_ENTITIES = register("after_entities", null);
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_BLOCK_ENTITIES = register("after_block_entities", null);
/**
* Use this to render custom block-like geometry into the world.
* Due to how transparency sorting works, this stage may not work properly with translucency. If you intend to render translucency,
* try using {@link #AFTER_TRIPWIRE_BLOCKS} or {@link #AFTER_PARTICLES}.
* Although this is called within a fabulous graphics target, it does not function properly in many cases.
*/
public static final Stage AFTER_TRANSLUCENT_BLOCKS = register("after_translucent_blocks", RenderType.translucent());
/**
* Use this to render custom block-like geometry into the world.
*/
public static final Stage AFTER_TRIPWIRE_BLOCKS = register("after_tripwire_blocks", RenderType.tripwire());
/**
* Use this to render custom effects into the world, such as custom entity-like objects or special rendering effects.
* Called within a fabulous graphics target.
* Happens after entities render.
*
* @see ForgeRenderTypes#TRANSLUCENT_ON_PARTICLES_TARGET
*/
public static final Stage AFTER_PARTICLES = register("after_particles", null);
/**
* Use this to render custom weather effects into the world.
* Called within a fabulous graphics target.
*/
public static final Stage AFTER_WEATHER = register("after_weather", null);
/**
* Use this to render after everything in the level has been rendered.
* Called after {@link LevelRenderer#renderLevel(PoseStack, float, long, boolean, Camera, GameRenderer, LightTexture, Matrix4f)} finishes.
*/
public static final Stage AFTER_LEVEL = register("after_level", null);
private final String name;
private Stage(String name) {
this.name = name;
}
private static Stage register(ResourceLocation name, @Nullable RenderType renderType) throws IllegalArgumentException {
Stage stage = new Stage(name.toString());
if (renderType != null && RENDER_TYPE_STAGES.putIfAbsent(renderType, stage) != null)
throw new IllegalArgumentException("Attempted to replace an existing RenderLevelStageEvent.Stage for a RenderType: Stage = " + stage + ", RenderType = " + renderType);
return stage;
}
private static Stage register(String name, @Nullable RenderType renderType) throws IllegalArgumentException {
return register(ResourceLocation.parse(name), renderType);
}
@Override
public String toString() {
return this.name;
}
/**
* {@return the {@linkplain Stage stage} bound to the {@linkplain RenderType render type}, or null if no value is present}
*/
@Nullable
public static Stage fromRenderType(RenderType renderType) {
return RENDER_TYPE_STAGES.get(renderType);
}
/** Internal just to make our patch smaller, it just fires the event. If you have good reason for this to be external, ask. */
@ApiStatus.Internal
public void dispatch(LevelRenderer levelRenderer, Matrix4f poseStack, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
var mc = Minecraft.getInstance();
var profiler = mc.getProfiler();
profiler.push(this.toString());
MinecraftForge.EVENT_BUS.post(new RenderLevelStageEvent(this, levelRenderer, poseStack, projectionMatrix, renderTick, mc.getTimer().getRealtimeDeltaTicks(), camera, frustum));
profiler.pop();
}
}
}
@@ -10,6 +10,7 @@ import net.minecraft.client.model.EntityModel;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
import net.minecraft.world.entity.LivingEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
@@ -31,19 +32,17 @@ import org.jetbrains.annotations.ApiStatus;
* @see RenderPlayerEvent
* @see LivingEntityRenderer
*/
public abstract class RenderLivingEvent<T extends LivingEntity, M extends EntityModel<T>> extends Event {
private final LivingEntity entity;
private final LivingEntityRenderer<T, M> renderer;
private final float partialTick;
public abstract class RenderLivingEvent<T extends LivingEntity, S extends LivingEntityRenderState, M extends EntityModel<? super S>> extends Event {
private final S state;
private final LivingEntityRenderer<T, S, M> renderer;
private final PoseStack poseStack;
private final MultiBufferSource multiBufferSource;
private final int packedLight;
@ApiStatus.Internal
protected RenderLivingEvent(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
this.entity = entity;
protected RenderLivingEvent(S state, LivingEntityRenderer<T, S, M> renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
this.state = state;
this.renderer = renderer;
this.partialTick = partialTick;
this.poseStack = poseStack;
this.multiBufferSource = multiBufferSource;
this.packedLight = packedLight;
@@ -52,24 +51,17 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
/**
* @return the living entity being rendered
*/
public LivingEntity getEntity() {
return entity;
public S getState() {
return state;
}
/**
* @return the renderer for the living entity
*/
public LivingEntityRenderer<T, M> getRenderer() {
public LivingEntityRenderer<T, S, M> getRenderer() {
return renderer;
}
/**
* {@return the partial tick}
*/
public float getPartialTick() {
return partialTick;
}
/**
* {@return the pose stack used for rendering}
*/
@@ -108,10 +100,10 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
* @param <M> the model for the living entity
*/
@Cancelable
public static class Pre<T extends LivingEntity, M extends EntityModel<T>> extends RenderLivingEvent<T, M> {
public static class Pre<T extends LivingEntity, S extends LivingEntityRenderState, M extends EntityModel<? super S>> extends RenderLivingEvent<T, S, M> {
@ApiStatus.Internal
public Pre(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight);
public Pre(S state, LivingEntityRenderer<T, S, M> renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(state, renderer, poseStack, multiBufferSource, packedLight);
}
}
@@ -126,10 +118,10 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
* @param <T> the living entity that was rendered
* @param <M> the model for the living entity
*/
public static class Post<T extends LivingEntity, M extends EntityModel<T>> extends RenderLivingEvent<T, M> {
public static class Post<T extends LivingEntity, S extends LivingEntityRenderState, M extends EntityModel<? super S>> extends RenderLivingEvent<T, S, M> {
@ApiStatus.Internal
public Post(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight);
public Post(S state, LivingEntityRenderer<T, S, M> renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(state, renderer, poseStack, multiBufferSource, packedLight);
}
}
}
@@ -8,10 +8,9 @@ package net.minecraftforge.client.event;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.state.EntityRenderState;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.Entity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
@@ -33,25 +32,29 @@ import org.jetbrains.annotations.ApiStatus;
* @see EntityRenderer
*/
@Event.HasResult
public class RenderNameTagEvent extends EntityEvent {
public class RenderNameTagEvent extends Event {
private Component nameplateContent;
private final EntityRenderState state;
private final Component originalContent;
private final EntityRenderer<?> entityRenderer;
private final EntityRenderer<?, ?> entityRenderer;
private final PoseStack poseStack;
private final MultiBufferSource multiBufferSource;
private final int packedLight;
private final float partialTick;
@ApiStatus.Internal
public RenderNameTagEvent(Entity entity, Component content, EntityRenderer<?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, float partialTick) {
super(entity);
public RenderNameTagEvent(EntityRenderState state, Component content, EntityRenderer<?, ?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
this.state = state;
this.originalContent = content;
this.setContent(this.originalContent);
this.entityRenderer = entityRenderer;
this.poseStack = poseStack;
this.multiBufferSource = multiBufferSource;
this.packedLight = packedLight;
this.partialTick = partialTick;
}
@SuppressWarnings("unchecked")
public <T extends EntityRenderState> T getState() {
return (T)state;
}
/**
@@ -80,7 +83,7 @@ public class RenderNameTagEvent extends EntityEvent {
/**
* {@return the entity renderer rendering the nameplate}
*/
public EntityRenderer<?> getEntityRenderer() {
public EntityRenderer<?, ?> getEntityRenderer() {
return this.entityRenderer;
}
@@ -106,11 +109,4 @@ public class RenderNameTagEvent extends EntityEvent {
public int getPackedLight() {
return this.packedLight;
}
/**
* {@return the partial tick}
*/
public float getPartialTick() {
return this.partialTick;
}
}
@@ -9,10 +9,10 @@ import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.client.renderer.entity.state.PlayerRenderState;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
import org.jetbrains.annotations.ApiStatus;
@@ -24,23 +24,26 @@ import org.jetbrains.annotations.ApiStatus;
* @see RenderPlayerEvent.Post
* @see PlayerRenderer
*/
public abstract class RenderPlayerEvent extends PlayerEvent {
public abstract class RenderPlayerEvent extends Event {
private final PlayerRenderState state;
private final PlayerRenderer renderer;
private final float partialTick;
private final PoseStack poseStack;
private final MultiBufferSource multiBufferSource;
private final int packedLight;
@ApiStatus.Internal
protected RenderPlayerEvent(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(player);
protected RenderPlayerEvent(PlayerRenderState state, PlayerRenderer renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
this.state = state;
this.renderer = renderer;
this.partialTick = partialTick;
this.poseStack = poseStack;
this.multiBufferSource = multiBufferSource;
this.packedLight = packedLight;
}
public PlayerRenderState getState() {
return this.state;
}
/**
* {@return the player entity renderer}
*/
@@ -48,13 +51,6 @@ public abstract class RenderPlayerEvent extends PlayerEvent {
return renderer;
}
/**
* {@return the partial tick}
*/
public float getPartialTick() {
return partialTick;
}
/**
* {@return the pose stack used for rendering}
*/
@@ -92,8 +88,8 @@ public abstract class RenderPlayerEvent extends PlayerEvent {
@Cancelable
public static class Pre extends RenderPlayerEvent {
@ApiStatus.Internal
public Pre(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(player, renderer, partialTick, poseStack, multiBufferSource, packedLight);
public Pre(PlayerRenderState state, PlayerRenderer renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(state, renderer, poseStack, multiBufferSource, packedLight);
}
}
@@ -107,8 +103,8 @@ public abstract class RenderPlayerEvent extends PlayerEvent {
*/
public static class Post extends RenderPlayerEvent {
@ApiStatus.Internal
public Post(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(player, renderer, partialTick, poseStack, multiBufferSource, packedLight);
public Post(PlayerRenderState state, PlayerRenderer renderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
super(state, renderer, poseStack, multiBufferSource, packedLight);
}
}
}
@@ -11,6 +11,7 @@ import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner;
import net.minecraft.network.chat.FormattedText;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
@@ -20,6 +21,7 @@ import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.LogicalSide;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
@@ -30,7 +32,7 @@ import java.util.List;
*
* @see RenderTooltipEvent.GatherComponents
* @see RenderTooltipEvent.Pre
* @see RenderTooltipEvent.Color
* @see RenderTooltipEvent.Background
*/
public abstract class RenderTooltipEvent extends Event
{
@@ -113,7 +115,7 @@ public abstract class RenderTooltipEvent extends Event
*
* <p>This event is {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.
* If this event is cancelled, then the list of components will be empty, causing the tooltip to not be rendered and
* the corresponding {@link RenderTooltipEvent.Pre} and {@link RenderTooltipEvent.Color} to not be fired.</p>
* the corresponding {@link RenderTooltipEvent.Pre} and {@link RenderTooltipEvent.Background} to not be fired.</p>
*
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
@@ -202,7 +204,7 @@ public abstract class RenderTooltipEvent extends Event
*
* <p>This event is {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.
* If this event is cancelled, then the tooltip will not be rendered and the corresponding
* {@link RenderTooltipEvent.Color} will not be fired.</p>
* {@link RenderTooltipEvent.Background} will not be fired.</p>
*
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
@@ -279,151 +281,44 @@ public abstract class RenderTooltipEvent extends Event
}
/**
* Fired when the colours for the tooltip background are determined.
* This can be used to modify the background color and the border's gradient colors.
* Fired when the tooltip background prefix is determined.
* This can be used to modify the textures to be used for the tooltip background.
*
* <p>This event is not {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.</p>
*
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
public static class Color extends RenderTooltipEvent
{
private final int originalBackground;
private final int originalBorderStart;
private final int originalBorderEnd;
private int backgroundStart;
private int backgroundEnd;
private int borderStart;
private int borderEnd;
public static class Background extends RenderTooltipEvent {
private final ResourceLocation originalBackground;
private ResourceLocation background;
@ApiStatus.Internal
public Color(@NotNull ItemStack stack, GuiGraphics graphics, int x, int y, @NotNull Font fr, int background, int borderStart, int borderEnd, @NotNull List<ClientTooltipComponent> components)
{
public Background(@NotNull ItemStack stack, GuiGraphics graphics, int x, int y, @NotNull Font fr, @NotNull List<ClientTooltipComponent> components, @Nullable ResourceLocation background) {
super(stack, graphics, x, y, fr, components);
this.originalBackground = background;
this.originalBorderStart = borderStart;
this.originalBorderEnd = borderEnd;
this.backgroundStart = background;
this.backgroundEnd = background;
this.borderStart = borderStart;
this.borderEnd = borderEnd;
this.background = background;
}
/**
* {@return the gradient start color for the tooltip background (top edge)}
* Sets the new prefix for the background texture
*/
public int getBackgroundStart()
{
return backgroundStart;
public void setBackground(ResourceLocation background) {
this.background = background;
}
/**
* {@return the gradient end color for the tooltip background (bottom edge)}
* @return the potentially modified background's prefix, can be null for default
*/
public int getBackgroundEnd()
{
return backgroundEnd;
public ResourceLocation getBackground() {
return this.background;
}
/**
* Sets the new color for the tooltip background. This sets both the gradient start and end color for the
* background to this color.
*
* @param background the new color for the tooltip background
* @return the original tooltip background's prefix, can be null for default
*/
public void setBackground(int background)
{
this.backgroundStart = background;
this.backgroundEnd = background;
}
/**
* Sets the new start color for the gradient of the tooltip background (top edge).
*
* @param backgroundStart the new start color for the tooltip background
*/
public void setBackgroundStart(int backgroundStart)
{
this.backgroundStart = backgroundStart;
}
/**
* Sets the new end color for the gradient of the tooltip background (bottom edge).
*
* @param backgroundEnd the new end color for the tooltip background
*/
public void setBackgroundEnd(int backgroundEnd)
{
this.backgroundEnd = backgroundEnd;
}
/**
* {@return the gradient start color for the tooltip border (top edge)}
*/
public int getBorderStart()
{
return borderStart;
}
/**
* Sets the new start color for the gradient of the tooltip border (top edge).
*
* @param borderStart the new start color for the tooltip border
*/
public void setBorderStart(int borderStart)
{
this.borderStart = borderStart;
}
/**
* {@return the gradient end color for the tooltip border (bottom edge)}
*/
public int getBorderEnd()
{
return borderEnd;
}
/**
* Sets the new end color for the gradient of the tooltip border (bottom edge).
*
* @param borderEnd the new end color for the tooltip border
*/
public void setBorderEnd(int borderEnd)
{
this.borderEnd = borderEnd;
}
/**
* {@return the original tooltip background's gradient start color (top edge)}
*/
public int getOriginalBackgroundStart()
{
public ResourceLocation getOriginalBackground() {
return originalBackground;
}
/**
* {@return the original tooltip background's gradient end color (bottom edge)}
*/
public int getOriginalBackgroundEnd()
{
return originalBackground;
}
/**
* {@return the original tooltip border's gradient start color (top edge)}
*/
public int getOriginalBorderStart()
{
return originalBorderStart;
}
/**
* {@return the original tooltip border's gradient end color (bottom edge)}
*/
public int getOriginalBorderEnd()
{
return originalBorderEnd;
}
}
}
@@ -9,7 +9,6 @@ import com.mojang.blaze3d.platform.InputConstants;
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;
@@ -248,7 +247,7 @@ public abstract class ScreenEvent extends Event {
}
/**
* Fired ahead of rendering any active mob effects in the {@link EffectRenderingInventoryScreen inventory screen}.
* Fired ahead of rendering any active mob effects in the {@link EffectsInInventory inventory screen}.
* Can be used to select the size of the effects display (full or compact) or even hide or replace vanilla's rendering entirely.
* This event can also be used to modify the horizontal position of the stack of effects being rendered.
*
@@ -22,17 +22,14 @@ import net.minecraftforge.fml.LogicalSide;
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
*/
@Cancelable
public class ToastAddEvent extends Event
{
public class ToastAddEvent extends Event {
private final Toast toast;
public ToastAddEvent(Toast toast)
{
public ToastAddEvent(Toast toast) {
this.toast = toast;
}
public Toast getToast()
{
public Toast getToast() {
return toast;
}
}
@@ -80,6 +80,7 @@ public abstract class ViewportEvent extends Event {
private float nearPlaneDistance;
private FogShape fogShape;
@SuppressWarnings("resource")
@ApiStatus.Internal
public RenderFog(FogMode mode, FogType type, Camera camera, float partialTicks, float nearPlaneDistance, float farPlaneDistance, FogShape fogShape) {
super(Minecraft.getInstance().gameRenderer, camera, partialTicks);
@@ -186,6 +187,7 @@ public abstract class ViewportEvent extends Event {
private float green;
private float blue;
@SuppressWarnings("resource")
@ApiStatus.Internal
public ComputeFogColor(Camera camera, float partialTicks, float red, float green, float blue) {
super(Minecraft.getInstance().gameRenderer, camera, partialTicks);
@@ -327,10 +329,10 @@ public abstract class ViewportEvent extends Event {
*/
public static class ComputeFov extends ViewportEvent {
private final boolean usedConfiguredFov;
private double fov;
private float fov;
@ApiStatus.Internal
public ComputeFov(GameRenderer renderer, Camera camera, double renderPartialTicks, double fov, boolean usedConfiguredFov) {
public ComputeFov(GameRenderer renderer, Camera camera, double renderPartialTicks, float fov, boolean usedConfiguredFov) {
super(renderer, camera, renderPartialTicks);
this.usedConfiguredFov = usedConfiguredFov;
this.setFOV(fov);
@@ -339,7 +341,7 @@ public abstract class ViewportEvent extends Event {
/**
* {@return the raw field of view value}
*/
public double getFOV() {
public float getFOV() {
return fov;
}
@@ -348,7 +350,7 @@ public abstract class ViewportEvent extends Event {
*
* @param fov the new FOV value
*/
public void setFOV(double fov) {
public void setFOV(float fov) {
this.fov = fov;
}