mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
1.20.6 Initial Update
New Decompiler Runtime Official mappings ItemStacks arnt Capability providers anymore, use Vanilla's system. Co-authored-by: RealMangoRage <[email protected]> Co-authored-by: Paint_Ninja <[email protected]>
This commit is contained in:
1114 files changed
+24245
-28536
No files matched your search
@@ -8,28 +8,28 @@ package net.minecraftforge.client;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.world.item.component.FireworkExplosion;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import net.minecraft.client.particle.FireworkParticles;
|
||||
import net.minecraft.world.item.FireworkRocketItem;
|
||||
|
||||
/**
|
||||
* Keeps track of custom firework shape types, because Particle is client side only this can't be on the Shape itself.
|
||||
* So sometime during your client initalization call register.
|
||||
*/
|
||||
public class FireworkShapeFactoryRegistry {
|
||||
private static final Map<FireworkRocketItem.Shape, Factory> factories = new HashMap<>();
|
||||
private static final Map<FireworkExplosion.Shape, Factory> factories = new HashMap<>();
|
||||
|
||||
public static interface Factory {
|
||||
public interface Factory {
|
||||
void build(FireworkParticles.Starter starter, boolean trail, boolean flicker, int[] colors, int[] fadecolors);
|
||||
}
|
||||
|
||||
public static void register(FireworkRocketItem.Shape shape, Factory factory) {
|
||||
public static void register(FireworkExplosion.Shape shape, Factory factory) {
|
||||
factories.put(shape, factory);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static Factory get(FireworkRocketItem.Shape shape) {
|
||||
public static Factory get(FireworkExplosion.Shape shape) {
|
||||
return factories.get(shape);
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
package net.minecraftforge.client;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
import com.mojang.blaze3d.platform.Window;
|
||||
import com.mojang.blaze3d.shaders.FogShape;
|
||||
@@ -70,6 +71,8 @@ import net.minecraft.client.resources.sounds.SoundInstance;
|
||||
import net.minecraft.client.sounds.SoundEngine;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.locale.Language;
|
||||
import net.minecraft.network.Connection;
|
||||
import net.minecraft.network.chat.ChatType;
|
||||
@@ -112,12 +115,12 @@ import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.ClientChatEvent;
|
||||
import net.minecraftforge.client.event.ClientChatReceivedEvent;
|
||||
import net.minecraftforge.client.event.ClientPauseChangeEvent;
|
||||
import net.minecraftforge.client.event.ClientPauseEvent;
|
||||
import net.minecraftforge.client.event.ClientPlayerChangeGameTypeEvent;
|
||||
import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
|
||||
import net.minecraftforge.client.event.ComputeFovModifierEvent;
|
||||
import net.minecraftforge.client.event.CustomizeGuiOverlayEvent;
|
||||
import net.minecraftforge.client.event.EntityRenderersEvent;
|
||||
import net.minecraftforge.client.event.ForgeEventFactoryClient;
|
||||
import net.minecraftforge.client.event.InputEvent;
|
||||
import net.minecraftforge.client.event.ModelEvent;
|
||||
import net.minecraftforge.client.event.MovementInputUpdateEvent;
|
||||
@@ -144,7 +147,6 @@ import net.minecraftforge.client.extensions.common.IClientItemExtensions;
|
||||
import net.minecraftforge.client.extensions.common.IClientMobEffectExtensions;
|
||||
import net.minecraftforge.client.gui.ClientTooltipComponentManager;
|
||||
import net.minecraftforge.client.gui.ModMismatchDisconnectedScreen;
|
||||
import net.minecraftforge.client.gui.overlay.GuiOverlayManager;
|
||||
import net.minecraftforge.client.model.data.ModelData;
|
||||
import net.minecraftforge.client.textures.ForgeTextureMetadata;
|
||||
import net.minecraftforge.client.textures.TextureAtlasSpriteLoaderManager;
|
||||
@@ -256,7 +258,6 @@ public class ForgeHooksClient {
|
||||
|
||||
public static void onClientPauseChangePost(boolean pause) {
|
||||
MinecraftForge.EVENT_BUS.post(new ClientPauseChangeEvent.Post(pause));
|
||||
MinecraftForge.EVENT_BUS.post(new ClientPauseEvent(pause));
|
||||
}
|
||||
|
||||
public static String getArmorTexture(Entity entity, ItemStack armor, String _default, EquipmentSlot slot, String type) {
|
||||
@@ -264,7 +265,9 @@ public class ForgeHooksClient {
|
||||
return result != null ? result : _default;
|
||||
}
|
||||
|
||||
public static boolean onDrawHighlight(LevelRenderer context, Camera camera, HitResult target, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource) {
|
||||
public static boolean onDrawHighlight(LevelRenderer context, Camera camera, HitResult target, float partialTick, Matrix4f ctxPos, MultiBufferSource bufferSource) {
|
||||
var poseStack = new PoseStack();
|
||||
poseStack.mulPose(ctxPos);
|
||||
switch (target.getType()) {
|
||||
case BLOCK:
|
||||
if (!(target instanceof BlockHitResult blockTarget)) return false;
|
||||
@@ -277,7 +280,7 @@ public class ForgeHooksClient {
|
||||
}
|
||||
}
|
||||
|
||||
public static void dispatchRenderStage(RenderType renderType, LevelRenderer levelRenderer, PoseStack poseStack, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
|
||||
public static void dispatchRenderStage(RenderType renderType, LevelRenderer levelRenderer, Matrix4f poseStack, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
|
||||
RenderLevelStageEvent.Stage stage = RenderLevelStageEvent.Stage.fromRenderType(renderType);
|
||||
if (stage != null)
|
||||
stage.dispatch(levelRenderer, poseStack, projectionMatrix, renderTick, camera, frustum);
|
||||
@@ -287,10 +290,6 @@ public class ForgeHooksClient {
|
||||
return MinecraftForge.EVENT_BUS.post(new RenderHandEvent(hand, poseStack, bufferSource, packedLight, partialTick, interpPitch, swingProgress, equipProgress, stack));
|
||||
}
|
||||
|
||||
public static boolean renderSpecificFirstPersonArm(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, AbstractClientPlayer player, HumanoidArm arm) {
|
||||
return MinecraftForge.EVENT_BUS.post(new RenderArmEvent(poseStack, multiBufferSource, packedLight, player, arm));
|
||||
}
|
||||
|
||||
public static void onTextureStitchedPost(TextureAtlas map) {
|
||||
ModLoader.get().postEvent(new TextureStitchEvent.Post(map));
|
||||
}
|
||||
@@ -342,12 +341,6 @@ public class ForgeHooksClient {
|
||||
return fovModifierEvent.getNewFovModifier();
|
||||
}
|
||||
|
||||
public static double getFieldOfView(GameRenderer renderer, Camera camera, double partialTick, double fov, boolean usedConfiguredFov) {
|
||||
ViewportEvent.ComputeFov event = new ViewportEvent.ComputeFov(renderer, camera, partialTick, fov, usedConfiguredFov);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
return event.getFOV();
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialization of Forge Renderers.
|
||||
*/
|
||||
@@ -429,12 +422,6 @@ public class ForgeHooksClient {
|
||||
}
|
||||
}
|
||||
|
||||
public static ViewportEvent.ComputeCameraAngles onCameraSetup(GameRenderer renderer, Camera camera, float partial) {
|
||||
ViewportEvent.ComputeCameraAngles event = new ViewportEvent.ComputeCameraAngles(renderer, camera, partial, camera.getYRot(), camera.getXRot(), 0);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
return event;
|
||||
}
|
||||
|
||||
public static void onModifyBakingResult(Map<ResourceLocation, BakedModel> models, ModelBakery modelBakery) {
|
||||
ModLoader.get().postEvent(new ModelEvent.ModifyBakingResult(models, modelBakery));
|
||||
}
|
||||
@@ -443,11 +430,6 @@ public class ForgeHooksClient {
|
||||
ModLoader.get().postEvent(new ModelEvent.BakingCompleted(modelManager, Collections.unmodifiableMap(models), modelBakery));
|
||||
}
|
||||
|
||||
public static BakedModel handleCameraTransforms(PoseStack poseStack, BakedModel model, ItemDisplayContext cameraTransformType, boolean applyLeftHandTransform) {
|
||||
model = model.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
|
||||
return model;
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static TextureAtlasSprite[] getFluidSprites(BlockAndTintGetter level, BlockPos pos, FluidState fluidStateIn) {
|
||||
IClientFluidTypeExtensions props = IClientFluidTypeExtensions.of(fluidStateIn);
|
||||
@@ -548,12 +530,6 @@ public class ForgeHooksClient {
|
||||
return evt;
|
||||
}
|
||||
|
||||
public static ScreenshotEvent onScreenshot(NativeImage image, File screenshotFile) {
|
||||
ScreenshotEvent event = new ScreenshotEvent(image, screenshotFile);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
return event;
|
||||
}
|
||||
|
||||
public static void onClientChangeGameType(PlayerInfo info, GameType currentGameMode, GameType newGameMode) {
|
||||
if (currentGameMode != newGameMode) {
|
||||
ClientPlayerChangeGameTypeEvent evt = new ClientPlayerChangeGameTypeEvent(info, currentGameMode, newGameMode);
|
||||
@@ -565,34 +541,22 @@ public class ForgeHooksClient {
|
||||
MinecraftForge.EVENT_BUS.post(new MovementInputUpdateEvent(player, movementInput));
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyPressedPre(Screen guiScreen, int keyCode, int scanCode, int modifiers) {
|
||||
Event event = new ScreenEvent.KeyPressed.Pre(guiScreen, keyCode, scanCode, modifiers);
|
||||
return MinecraftForge.EVENT_BUS.post(event);
|
||||
public static void onScreenKeyPressed(boolean[] state, Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
state[0] = ForgeEventFactoryClient.onScreenKeyPressedPre(screen, keyCode, scanCode, modifiers)
|
||||
|| screen.keyPressed(keyCode, scanCode, modifiers)
|
||||
|| ForgeEventFactoryClient.onScreenKeyPressedPost(screen, keyCode, scanCode, modifiers);
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyPressedPost(Screen guiScreen, int keyCode, int scanCode, int modifiers) {
|
||||
Event event = new ScreenEvent.KeyPressed.Post(guiScreen, keyCode, scanCode, modifiers);
|
||||
return MinecraftForge.EVENT_BUS.post(event);
|
||||
public static void onScreenKeyReleased(boolean[] state, Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
state[0] = ForgeEventFactoryClient.onScreenKeyReleasedPre(screen, keyCode, scanCode, modifiers)
|
||||
|| screen.keyReleased(keyCode, scanCode, modifiers)
|
||||
|| ForgeEventFactoryClient.onScreenKeyReleasedPost(screen, keyCode, scanCode, modifiers);
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyReleasedPre(Screen guiScreen, int keyCode, int scanCode, int modifiers) {
|
||||
Event event = new ScreenEvent.KeyReleased.Pre(guiScreen, keyCode, scanCode, modifiers);
|
||||
return MinecraftForge.EVENT_BUS.post(event);
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyReleasedPost(Screen guiScreen, int keyCode, int scanCode, int modifiers) {
|
||||
Event event = new ScreenEvent.KeyReleased.Post(guiScreen, keyCode, scanCode, modifiers);
|
||||
return MinecraftForge.EVENT_BUS.post(event);
|
||||
}
|
||||
|
||||
public static boolean onScreenCharTypedPre(Screen guiScreen, char codePoint, int modifiers) {
|
||||
Event event = new ScreenEvent.CharacterTyped.Pre(guiScreen, codePoint, modifiers);
|
||||
return MinecraftForge.EVENT_BUS.post(event);
|
||||
}
|
||||
|
||||
public static void onScreenCharTypedPost(Screen guiScreen, char codePoint, int modifiers) {
|
||||
Event event = new ScreenEvent.CharacterTyped.Post(guiScreen, codePoint, modifiers);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
public static boolean onScreenCharTyped(Screen screen, char codePoint, int modifiers) {
|
||||
return ForgeEventFactoryClient.onScreenCharTypedPre(screen, codePoint, modifiers)
|
||||
|| screen.charTyped(codePoint, modifiers)
|
||||
|| ForgeEventFactoryClient.onScreenCharTypedPost(screen, codePoint, modifiers);
|
||||
}
|
||||
|
||||
public static void onRecipesUpdated(RecipeManager mgr) {
|
||||
@@ -604,15 +568,9 @@ public class ForgeHooksClient {
|
||||
MinecraftForge.EVENT_BUS.post(new InputEvent.Key(key, scanCode, action, modifiers));
|
||||
}
|
||||
|
||||
public static InputEvent.InteractionKeyMappingTriggered onClickInput(int button, KeyMapping keyBinding, InteractionHand hand) {
|
||||
InputEvent.InteractionKeyMappingTriggered event = new InputEvent.InteractionKeyMappingTriggered(button, keyBinding, hand);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
return event;
|
||||
}
|
||||
|
||||
public static boolean isNameplateInRenderDistance(Entity entity, double squareDistance) {
|
||||
if (entity instanceof LivingEntity) {
|
||||
final AttributeInstance attribute = ((LivingEntity) entity).getAttribute(ForgeMod.NAMETAG_DISTANCE.get());
|
||||
if (entity instanceof LivingEntity living) {
|
||||
var attribute = living.getAttribute(ForgeMod.NAMETAG_DISTANCE.getHolder().get());
|
||||
if (attribute != null) {
|
||||
return !(squareDistance > (attribute.getValue() * attribute.getValue()));
|
||||
}
|
||||
@@ -620,14 +578,6 @@ public class ForgeHooksClient {
|
||||
return !(squareDistance > 4096.0f);
|
||||
}
|
||||
|
||||
public static void renderPistonMovedBlocks(BlockPos pos, BlockState state, PoseStack stack, MultiBufferSource bufferSource, Level level, boolean checkSides, int packedOverlay, BlockRenderDispatcher blockRenderer) {
|
||||
var model = blockRenderer.getBlockModel(state);
|
||||
for (var renderType : model.getRenderTypes(state, RandomSource.create(state.getSeed(pos)), ModelData.EMPTY)) {
|
||||
VertexConsumer vertexConsumer = bufferSource.getBuffer(RenderTypeHelper.getMovingBlockRenderType(renderType));
|
||||
blockRenderer.getModelRenderer().tesselateBlock(level, model, state, pos, stack, vertexConsumer, checkSides, RandomSource.create(), state.getSeed(pos), packedOverlay, ModelData.EMPTY, renderType);
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean shouldRenderEffect(MobEffectInstance effectInstance) {
|
||||
return IClientMobEffectExtensions.of(effectInstance).isVisibleInInventory(effectInstance);
|
||||
}
|
||||
@@ -757,7 +707,8 @@ public class ForgeHooksClient {
|
||||
if(relativeMouseX > width - 15 && relativeMouseX < width && relativeMouseY > 10 && relativeMouseY < 26) {
|
||||
//this is not the most proper way to do it,
|
||||
//but works best here and has the least maintenance overhead
|
||||
gui.setToolTip(Arrays.stream(tooltip.split("\n")).map(Component::literal).collect(Collectors.toList()));
|
||||
var lines = Arrays.stream(tooltip.split("\n")).map(Component::literal).toList();
|
||||
gui.setTooltipForNextRenderPass(Lists.transform(lines, Component::getVisualOrderText));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -772,18 +723,6 @@ public class ForgeHooksClient {
|
||||
GameData.revertToFrozen();
|
||||
}
|
||||
|
||||
public static void firePlayerLogin(MultiPlayerGameMode pc, LocalPlayer player, Connection networkManager) {
|
||||
MinecraftForge.EVENT_BUS.post(new ClientPlayerNetworkEvent.LoggingIn(pc, player, networkManager));
|
||||
}
|
||||
|
||||
public static void firePlayerLogout(@Nullable MultiPlayerGameMode pc, @Nullable LocalPlayer player) {
|
||||
MinecraftForge.EVENT_BUS.post(new ClientPlayerNetworkEvent.LoggingOut(pc, player, player != null ? player.connection != null ? player.connection.getConnection() : null : null));
|
||||
}
|
||||
|
||||
public static void firePlayerRespawn(MultiPlayerGameMode pc, LocalPlayer oldPlayer, LocalPlayer newPlayer, Connection networkManager) {
|
||||
MinecraftForge.EVENT_BUS.post(new ClientPlayerNetworkEvent.Clone(pc, oldPlayer, newPlayer, networkManager));
|
||||
}
|
||||
|
||||
public static void onRegisterParticleProviders(ParticleEngine particleEngine) {
|
||||
ModLoader.get().postEvent(new RegisterParticleProvidersEvent(particleEngine));
|
||||
}
|
||||
@@ -808,14 +747,14 @@ public class ForgeHooksClient {
|
||||
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
|
||||
}
|
||||
|
||||
private static final ChatTypeDecoration SYSTEM_CHAT_TYPE_DECORATION = new ChatTypeDecoration("forge.chatType.system", List.of(ChatTypeDecoration.Parameter.CONTENT), Style.EMPTY);
|
||||
private static final ChatType SYSTEM_CHAT_TYPE = new ChatType(SYSTEM_CHAT_TYPE_DECORATION, SYSTEM_CHAT_TYPE_DECORATION);
|
||||
private static final ChatType.Bound SYSTEM_CHAT_TYPE_BOUND = SYSTEM_CHAT_TYPE.bind(Component.literal("System"));
|
||||
|
||||
@Nullable
|
||||
public static Component onClientSystemChat(Component message, boolean overlay) {
|
||||
ClientChatReceivedEvent.System event = new ClientChatReceivedEvent.System(SYSTEM_CHAT_TYPE_BOUND, message, overlay);
|
||||
public static Component onClientSystemChat(Component message, boolean overlay, RegistryAccess registry) {
|
||||
return message;
|
||||
/*
|
||||
var bound = ChatType.bind(ForgeMod.SYSTEM_CHAT_TYPE.getKey(), registry, Component.literal("System"));
|
||||
var event = new ClientChatReceivedEvent.System(bound, message, overlay);
|
||||
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
|
||||
*/
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -1050,7 +989,7 @@ public class ForgeHooksClient {
|
||||
EntitySpectatorShaderManager.init();
|
||||
ForgeHooksClient.onRegisterKeyMappings(mc.options);
|
||||
RecipeBookManager.init();
|
||||
GuiOverlayManager.init();
|
||||
//GuiOverlayManager.init();
|
||||
DimensionSpecialEffectsManager.init();
|
||||
NamedRenderTypeManager.init();
|
||||
ColorResolverManager.init();
|
||||
@@ -1065,4 +1004,12 @@ public class ForgeHooksClient {
|
||||
mc.setScreen(new ModMismatchDisconnectedScreen(parent, CommonComponents.CONNECT_FAILED, message, mismatch));
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void onScreenMouseDrag(Screen screen, double mouseX, double mouseY, int mouseButton, double dragX, double dragY) {
|
||||
if (ForgeEventFactoryClient.onScreenMouseDragPre(screen, mouseX, mouseY, mouseButton, dragX, dragY))
|
||||
return;
|
||||
if (screen.mouseDragged(mouseX, mouseY, mouseButton, dragX, dragY))
|
||||
return;
|
||||
ForgeEventFactoryClient.onScreenMouseDragPost(screen, mouseX, mouseY, mouseButton, dragX, dragY);
|
||||
}
|
||||
}
|
||||
@@ -28,8 +28,7 @@ import java.util.function.Function;
|
||||
* <p>
|
||||
* Provides a recipe category lookup.
|
||||
*/
|
||||
public final class RecipeBookManager
|
||||
{
|
||||
public final class RecipeBookManager {
|
||||
// Not using ConcurrentHashMap here because it's slower for lookups, so we only use it during init
|
||||
private static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = new HashMap<>();
|
||||
private static final Map<RecipeBookType, List<RecipeBookCategories>> TYPE_CATEGORIES = new HashMap<>();
|
||||
@@ -40,27 +39,23 @@ public final class RecipeBookManager
|
||||
* Finds the category the specified recipe should display in, or null if none.
|
||||
*/
|
||||
@Nullable
|
||||
public static <T extends Recipe<?>> RecipeBookCategories findCategories(RecipeType<T> type, RecipeHolder<T> recipe)
|
||||
{
|
||||
public static <T extends Recipe<?>> RecipeBookCategories findCategories(RecipeType<T> type, RecipeHolder<T> recipe) {
|
||||
var lookup = RECIPE_CATEGORY_LOOKUPS.get(type);
|
||||
return lookup != null ? lookup.apply(recipe.value()) : null;
|
||||
}
|
||||
|
||||
@ApiStatus.Internal
|
||||
public static Map<RecipeBookCategories, List<RecipeBookCategories>> getAggregateCategories()
|
||||
{
|
||||
public static Map<RecipeBookCategories, List<RecipeBookCategories>> getAggregateCategories(Map<RecipeBookCategories, List<RecipeBookCategories>> vanilla) {
|
||||
return AGGREGATE_CATEGORIES_VIEW;
|
||||
}
|
||||
|
||||
@ApiStatus.Internal
|
||||
public static List<RecipeBookCategories> getCustomCategoriesOrEmpty(RecipeBookType recipeBookType)
|
||||
{
|
||||
public static List<RecipeBookCategories> getCustomCategoriesOrEmpty(RecipeBookType recipeBookType) {
|
||||
return TYPE_CATEGORIES.getOrDefault(recipeBookType, List.of());
|
||||
}
|
||||
|
||||
@ApiStatus.Internal
|
||||
public static void init()
|
||||
{
|
||||
public static void init() {
|
||||
// The ImmutableMap is the patched out value of AGGREGATE_CATEGORIES
|
||||
var aggregateCategories = new HashMap<>(ImmutableMap.of(
|
||||
RecipeBookCategories.CRAFTING_SEARCH, ImmutableList.of(RecipeBookCategories.CRAFTING_EQUIPMENT, RecipeBookCategories.CRAFTING_BUILDING_BLOCKS, RecipeBookCategories.CRAFTING_MISC, RecipeBookCategories.CRAFTING_REDSTONE),
|
||||
|
||||
@@ -13,26 +13,22 @@ import net.minecraft.client.renderer.RenderType;
|
||||
* {@code entityFabulous} may support custom render targets and other aspects of the fabulous pipeline, or can otherwise
|
||||
* be the same as {@code entity}.
|
||||
*/
|
||||
public record RenderTypeGroup(RenderType block, RenderType entity, RenderType entityFabulous)
|
||||
{
|
||||
public record RenderTypeGroup(RenderType block, RenderType entity, RenderType entityFabulous) {
|
||||
public static RenderTypeGroup EMPTY = new RenderTypeGroup(null, null, null);
|
||||
|
||||
public RenderTypeGroup
|
||||
{
|
||||
public RenderTypeGroup {
|
||||
if ((block == null) != (entity == null) || (block == null) != (entityFabulous == null))
|
||||
throw new IllegalArgumentException("The render types in a group must either be all null, or all non-null.");
|
||||
}
|
||||
|
||||
public RenderTypeGroup(RenderType block, RenderType entity)
|
||||
{
|
||||
public RenderTypeGroup(RenderType block, RenderType entity) {
|
||||
this(block, entity, entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return true if this group has render types or not. It either has all, or none}
|
||||
*/
|
||||
public boolean isEmpty()
|
||||
{
|
||||
public boolean isEmpty() {
|
||||
// We throw an exception in the constructor if nullability doesn't match, so checking this is enough
|
||||
return block == null;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
/**
|
||||
* Provides helper functions replacing those in {@link ItemBlockRenderTypes}.
|
||||
*/
|
||||
public final class RenderTypeHelper
|
||||
{
|
||||
public final class RenderTypeHelper {
|
||||
/**
|
||||
* Provides a {@link RenderType} using {@link DefaultVertexFormat#NEW_ENTITY} for the given {@link DefaultVertexFormat#BLOCK} format.
|
||||
* This should be called for each {@link RenderType} returned by {@link BakedModel#getRenderTypes(BlockState, RandomSource, ModelData)}.
|
||||
@@ -30,8 +29,7 @@ public final class RenderTypeHelper
|
||||
* Mimics the behavior of vanilla's {@link ItemBlockRenderTypes#getRenderType(BlockState, boolean)}.
|
||||
*/
|
||||
@NotNull
|
||||
public static RenderType getEntityRenderType(RenderType chunkRenderType, boolean cull)
|
||||
{
|
||||
public static RenderType getEntityRenderType(RenderType chunkRenderType, boolean cull) {
|
||||
if (chunkRenderType != RenderType.translucent())
|
||||
return Sheets.cutoutBlockSheet();
|
||||
return cull || !Minecraft.useShaderTransparency() ? Sheets.translucentCullBlockSheet() : Sheets.translucentItemSheet();
|
||||
@@ -44,8 +42,7 @@ public final class RenderTypeHelper
|
||||
* Mimics the behavior of vanilla's {@link ItemBlockRenderTypes#getMovingBlockRenderType(BlockState)}.
|
||||
*/
|
||||
@NotNull
|
||||
public static RenderType getMovingBlockRenderType(RenderType renderType)
|
||||
{
|
||||
public static RenderType getMovingBlockRenderType(RenderType renderType) {
|
||||
if (renderType == RenderType.translucent())
|
||||
return RenderType.translucentMovingBlock();
|
||||
return renderType;
|
||||
@@ -58,10 +55,8 @@ public final class RenderTypeHelper
|
||||
* but removes the need to query the model again if the item is a {@link BlockItem}.
|
||||
*/
|
||||
@NotNull
|
||||
public static RenderType getFallbackItemRenderType(ItemStack stack, BakedModel model, boolean cull)
|
||||
{
|
||||
if (stack.getItem() instanceof BlockItem blockItem)
|
||||
{
|
||||
public static RenderType getFallbackItemRenderType(ItemStack stack, BakedModel model, boolean cull) {
|
||||
if (stack.getItem() instanceof BlockItem blockItem) {
|
||||
var renderTypes = model.getRenderTypes(blockItem.getBlock().defaultBlockState(), RandomSource.create(42), ModelData.EMPTY);
|
||||
if (renderTypes.contains(RenderType.translucent()))
|
||||
return getEntityRenderType(RenderType.translucent(), cull);
|
||||
@@ -70,7 +65,5 @@ public final class RenderTypeHelper
|
||||
return cull ? Sheets.translucentCullBlockSheet() : Sheets.translucentItemSheet();
|
||||
}
|
||||
|
||||
private RenderTypeHelper()
|
||||
{
|
||||
}
|
||||
private RenderTypeHelper() {}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.eventbus.api.Cancelable;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraftforge.fml.LogicalSide;
|
||||
|
||||
/**
|
||||
* Fired when {@linkplain Minecraft#pause Minecraft.pause} value got updated by
|
||||
* the {@linkplain Minecraft#runTick(boolean) Minecraft.runTick(...)} on a single-player world
|
||||
*
|
||||
* <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>
|
||||
*
|
||||
* @deprecated use {@linkplain ClientPauseChangeEvent.Post ClientPauseChangeEvent.Post} instead
|
||||
* @see ClientPauseChangeEvent.Pre
|
||||
* @see ClientPauseChangeEvent.Post
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since="1.20.4")
|
||||
public class ClientPauseEvent extends Event
|
||||
{
|
||||
private final boolean paused;
|
||||
|
||||
public ClientPauseEvent(boolean isPaused)
|
||||
{
|
||||
this.paused = isPaused;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return game is paused}
|
||||
*/
|
||||
public boolean isPaused()
|
||||
{
|
||||
return paused;
|
||||
}
|
||||
}
|
||||
@@ -26,15 +26,13 @@ import org.jetbrains.annotations.Nullable;
|
||||
* @see LoggingOut
|
||||
* @see Clone
|
||||
**/
|
||||
public abstract class ClientPlayerNetworkEvent extends Event
|
||||
{
|
||||
public abstract class ClientPlayerNetworkEvent extends Event {
|
||||
private final MultiPlayerGameMode multiPlayerGameMode;
|
||||
private final LocalPlayer player;
|
||||
private final Connection connection;
|
||||
|
||||
@ApiStatus.Internal
|
||||
protected ClientPlayerNetworkEvent(final MultiPlayerGameMode multiPlayerGameMode, final LocalPlayer player, final Connection connection)
|
||||
{
|
||||
protected ClientPlayerNetworkEvent(final MultiPlayerGameMode multiPlayerGameMode, final LocalPlayer player, final Connection connection) {
|
||||
this.multiPlayerGameMode = multiPlayerGameMode;
|
||||
this.player = player;
|
||||
this.connection = connection;
|
||||
@@ -43,24 +41,21 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
/**
|
||||
* {@return the multiplayer game mode controller for the player}
|
||||
*/
|
||||
public MultiPlayerGameMode getMultiPlayerGameMode()
|
||||
{
|
||||
public MultiPlayerGameMode getMultiPlayerGameMode() {
|
||||
return multiPlayerGameMode;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the player instance}
|
||||
*/
|
||||
public LocalPlayer getPlayer()
|
||||
{
|
||||
public LocalPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the network connection for the player}
|
||||
*/
|
||||
public Connection getConnection()
|
||||
{
|
||||
public Connection getConnection() {
|
||||
return connection;
|
||||
}
|
||||
|
||||
@@ -72,11 +67,9 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
* <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 LoggingIn extends ClientPlayerNetworkEvent
|
||||
{
|
||||
public static class LoggingIn extends ClientPlayerNetworkEvent {
|
||||
@ApiStatus.Internal
|
||||
public LoggingIn(final MultiPlayerGameMode controller, final LocalPlayer player, final Connection networkManager)
|
||||
{
|
||||
public LoggingIn(final MultiPlayerGameMode controller, final LocalPlayer player, final Connection networkManager) {
|
||||
super(controller, player, networkManager);
|
||||
}
|
||||
}
|
||||
@@ -91,11 +84,9 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
*/
|
||||
@SuppressWarnings("NullableProblems")
|
||||
// Shush IntelliJ, we override non-nullables as nullables in this specific event; see later comment
|
||||
public static class LoggingOut extends ClientPlayerNetworkEvent
|
||||
{
|
||||
public static class LoggingOut extends ClientPlayerNetworkEvent {
|
||||
@ApiStatus.Internal
|
||||
public LoggingOut(@Nullable final MultiPlayerGameMode controller, @Nullable final LocalPlayer player, @Nullable final Connection networkManager)
|
||||
{
|
||||
public LoggingOut(@Nullable final MultiPlayerGameMode controller, @Nullable final LocalPlayer player, @Nullable final Connection networkManager) {
|
||||
//noinspection ConstantConditions we know these are nullable, but we don't want to annotate the super as nullable since this is the only event with nullables
|
||||
super(controller, player, networkManager);
|
||||
}
|
||||
@@ -107,8 +98,7 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
*/
|
||||
@Nullable
|
||||
@Override
|
||||
public MultiPlayerGameMode getMultiPlayerGameMode()
|
||||
{
|
||||
public MultiPlayerGameMode getMultiPlayerGameMode() {
|
||||
return super.getMultiPlayerGameMode();
|
||||
}
|
||||
|
||||
@@ -119,8 +109,7 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
*/
|
||||
@Nullable
|
||||
@Override
|
||||
public LocalPlayer getPlayer()
|
||||
{
|
||||
public LocalPlayer getPlayer() {
|
||||
return super.getPlayer();
|
||||
}
|
||||
|
||||
@@ -131,8 +120,7 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
*/
|
||||
@Nullable
|
||||
@Override
|
||||
public Connection getConnection()
|
||||
{
|
||||
public Connection getConnection() {
|
||||
return super.getConnection();
|
||||
}
|
||||
}
|
||||
@@ -145,13 +133,11 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
* <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 Clone extends ClientPlayerNetworkEvent
|
||||
{
|
||||
public static class Clone extends ClientPlayerNetworkEvent {
|
||||
private final LocalPlayer oldPlayer;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public Clone(final MultiPlayerGameMode pc, final LocalPlayer oldPlayer, final LocalPlayer newPlayer, final Connection networkManager)
|
||||
{
|
||||
public Clone(final MultiPlayerGameMode pc, final LocalPlayer oldPlayer, final LocalPlayer newPlayer, final Connection networkManager) {
|
||||
super(pc, newPlayer, networkManager);
|
||||
this.oldPlayer = oldPlayer;
|
||||
}
|
||||
@@ -159,16 +145,14 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
/**
|
||||
* {@return the previous player instance}
|
||||
*/
|
||||
public LocalPlayer getOldPlayer()
|
||||
{
|
||||
public LocalPlayer getOldPlayer() {
|
||||
return oldPlayer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the newly created player instance}
|
||||
*/
|
||||
public LocalPlayer getNewPlayer()
|
||||
{
|
||||
public LocalPlayer getNewPlayer() {
|
||||
return super.getPlayer();
|
||||
}
|
||||
|
||||
@@ -178,8 +162,7 @@ public abstract class ClientPlayerNetworkEvent extends Event
|
||||
* @see #getNewPlayer()
|
||||
*/
|
||||
@Override
|
||||
public LocalPlayer getPlayer()
|
||||
{
|
||||
public LocalPlayer getPlayer() {
|
||||
return super.getPlayer();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,21 +23,18 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see Render.Foreground
|
||||
* @see Render.Background
|
||||
*/
|
||||
public abstract class ContainerScreenEvent extends Event
|
||||
{
|
||||
public abstract class ContainerScreenEvent extends Event {
|
||||
private final AbstractContainerScreen<?> containerScreen;
|
||||
|
||||
@ApiStatus.Internal
|
||||
protected ContainerScreenEvent(AbstractContainerScreen<?> containerScreen)
|
||||
{
|
||||
protected ContainerScreenEvent(AbstractContainerScreen<?> containerScreen) {
|
||||
this.containerScreen = containerScreen;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the container screen}
|
||||
*/
|
||||
public AbstractContainerScreen<?> getContainerScreen()
|
||||
{
|
||||
public AbstractContainerScreen<?> getContainerScreen() {
|
||||
return containerScreen;
|
||||
}
|
||||
|
||||
@@ -51,15 +48,13 @@ public abstract class ContainerScreenEvent extends Event
|
||||
* @see Foreground
|
||||
* @see Background
|
||||
*/
|
||||
public static abstract class Render extends ContainerScreenEvent
|
||||
{
|
||||
public static abstract class Render extends ContainerScreenEvent {
|
||||
private final GuiGraphics guiGraphics;
|
||||
private final int mouseX;
|
||||
private final int mouseY;
|
||||
|
||||
@ApiStatus.Internal
|
||||
protected Render(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY)
|
||||
{
|
||||
protected Render(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY) {
|
||||
super(guiContainer);
|
||||
this.guiGraphics = guiGraphics;
|
||||
this.mouseX = mouseX;
|
||||
@@ -69,24 +64,21 @@ public abstract class ContainerScreenEvent extends Event
|
||||
/**
|
||||
* {@return the gui graphics used for rendering}
|
||||
*/
|
||||
public GuiGraphics getGuiGraphics()
|
||||
{
|
||||
public GuiGraphics getGuiGraphics() {
|
||||
return guiGraphics;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the X coordinate of the mouse pointer}
|
||||
*/
|
||||
public int getMouseX()
|
||||
{
|
||||
public int getMouseX() {
|
||||
return mouseX;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the Y coordinate of the mouse pointer}
|
||||
*/
|
||||
public int getMouseY()
|
||||
{
|
||||
public int getMouseY() {
|
||||
return mouseY;
|
||||
}
|
||||
|
||||
@@ -102,11 +94,9 @@ public abstract class ContainerScreenEvent extends Event
|
||||
* <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 Foreground extends Render
|
||||
{
|
||||
public static class Foreground extends Render {
|
||||
@ApiStatus.Internal
|
||||
public Foreground(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY)
|
||||
{
|
||||
public Foreground(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY) {
|
||||
super(guiContainer, guiGraphics, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
@@ -120,11 +110,9 @@ public abstract class ContainerScreenEvent extends Event
|
||||
* <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 Background extends Render
|
||||
{
|
||||
public static class Background extends Render {
|
||||
@ApiStatus.Internal
|
||||
public Background(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY)
|
||||
{
|
||||
public Background(AbstractContainerScreen<?> guiContainer, GuiGraphics guiGraphics, int mouseX, int mouseY) {
|
||||
super(guiContainer, guiGraphics, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,28 +5,59 @@
|
||||
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
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.KeyMapping;
|
||||
import net.minecraft.client.MouseHandler;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||
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.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.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.minecraftforge.client.event.sound.PlaySoundSourceEvent;
|
||||
import net.minecraftforge.client.event.sound.PlayStreamingSourceEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.ModLoader;
|
||||
|
||||
public class ForgeEventFactoryClient {
|
||||
public final class ForgeEventFactoryClient {
|
||||
private ForgeEventFactoryClient() {}
|
||||
|
||||
private static boolean post(Event e) {
|
||||
return MinecraftForge.EVENT_BUS.post(e);
|
||||
}
|
||||
@@ -36,27 +67,33 @@ public class ForgeEventFactoryClient {
|
||||
return e;
|
||||
}
|
||||
|
||||
public static void gatherLayers(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...
|
||||
ModLoader.get().postEvent(new EntityRenderersEvent.AddLayers(renderers, playerRenderers, context));
|
||||
}
|
||||
|
||||
public static boolean onScreenMouseReleasedPre(Screen guiScreen, double mouseX, double mouseY, int button) {
|
||||
return post(new ScreenEvent.MouseButtonReleased.Pre(guiScreen, mouseX, mouseY, button));
|
||||
public static void onRegisterShaders(ResourceProvider resourceProvider, List<Pair<ShaderInstance, Consumer<ShaderInstance>>> shaderList) {
|
||||
// TODO: Why i this a ModLoader event...
|
||||
ModLoader.get().postEvent(new RegisterShadersEvent(resourceProvider, shaderList));
|
||||
}
|
||||
|
||||
public static boolean onScreenMouseReleasedPost(Screen guiScreen, double mouseX, double mouseY, int button, boolean handled) {
|
||||
var result = fire(new ScreenEvent.MouseButtonReleased.Post(guiScreen, mouseX, mouseY, button, handled)).getResult();
|
||||
return result == Event.Result.DEFAULT ? handled : 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 onScreenMouseClickedPre(Screen guiScreen, double mouseX, double mouseY, int button) {
|
||||
return post(new ScreenEvent.MouseButtonPressed.Pre(guiScreen, 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);
|
||||
}
|
||||
|
||||
public static boolean onScreenMouseClickedPost(Screen guiScreen, double mouseX, double mouseY, int button, boolean handled) {
|
||||
var result = fire(new ScreenEvent.MouseButtonPressed.Post(guiScreen, mouseX, mouseY, button, handled)).getResult();
|
||||
return result == Event.Result.DEFAULT ? handled : result == Event.Result.ALLOW;
|
||||
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;
|
||||
}
|
||||
|
||||
public static boolean onMouseButtonPre(int button, int action, int mods) {
|
||||
@@ -105,4 +142,96 @@ public class ForgeEventFactoryClient {
|
||||
public static void onPlayStreamingSource(SoundEngine engine, SoundInstance sound, Channel channel) {
|
||||
post(new PlayStreamingSourceEvent(engine, sound, channel));
|
||||
}
|
||||
|
||||
public static ScreenshotEvent onScreenshot(NativeImage image, File screenshotFile) {
|
||||
return fire(new ScreenshotEvent(image, screenshotFile));
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyPressedPre(Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
return post(new ScreenEvent.KeyPressed.Pre(screen, keyCode, scanCode, modifiers));
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyPressedPost(Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
return post(new ScreenEvent.KeyPressed.Post(screen, keyCode, scanCode, modifiers));
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyReleasedPre(Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
return post(new ScreenEvent.KeyReleased.Pre(screen, keyCode, scanCode, modifiers));
|
||||
}
|
||||
|
||||
public static boolean onScreenKeyReleasedPost(Screen screen, int keyCode, int scanCode, int modifiers) {
|
||||
return post(new ScreenEvent.KeyReleased.Post(screen, keyCode, scanCode, modifiers));
|
||||
}
|
||||
|
||||
public static boolean onScreenCharTypedPre(Screen screen, char codePoint, int modifiers) {
|
||||
return post(new ScreenEvent.CharacterTyped.Pre(screen, codePoint, modifiers));
|
||||
}
|
||||
|
||||
public static boolean onScreenCharTypedPost(Screen screen, char codePoint, int modifiers) {
|
||||
return post(new ScreenEvent.CharacterTyped.Post(screen, codePoint, modifiers));
|
||||
}
|
||||
|
||||
public static InputEvent.InteractionKeyMappingTriggered onClickInput(int button, KeyMapping keyBinding, InteractionHand hand) {
|
||||
return fire(new InputEvent.InteractionKeyMappingTriggered(button, keyBinding, hand));
|
||||
}
|
||||
|
||||
public static void onContainerRenderBackground(AbstractContainerScreen<?> screen, GuiGraphics graphics, int mouseX, int mouseY) {
|
||||
post(new ContainerScreenEvent.Render.Background(screen, graphics, mouseX, mouseY));
|
||||
}
|
||||
|
||||
public static void onContainerRenderForeground(AbstractContainerScreen<?> screen, GuiGraphics graphics, int mouseX, int mouseY) {
|
||||
post(new ContainerScreenEvent.Render.Foreground(screen, graphics, mouseX, mouseY));
|
||||
}
|
||||
|
||||
public static void firePlayerLogin(MultiPlayerGameMode pc, LocalPlayer player, Connection networkManager) {
|
||||
post(new ClientPlayerNetworkEvent.LoggingIn(pc, player, networkManager));
|
||||
}
|
||||
|
||||
public static void firePlayerLogout(@Nullable MultiPlayerGameMode pc, @Nullable LocalPlayer player) {
|
||||
post(new ClientPlayerNetworkEvent.LoggingOut(pc, player, player != null ? player.connection != null ? player.connection.getConnection() : null : null));
|
||||
}
|
||||
|
||||
public static void firePlayerRespawn(MultiPlayerGameMode pc, LocalPlayer oldPlayer, LocalPlayer newPlayer, Connection networkManager) {
|
||||
post(new ClientPlayerNetworkEvent.Clone(pc, oldPlayer, newPlayer, networkManager));
|
||||
}
|
||||
|
||||
public static ViewportEvent.ComputeFov fireComputeFov(GameRenderer renderer, Camera camera, double partialTick, double fov, boolean usedConfiguredFov) {
|
||||
return fire(new ViewportEvent.ComputeFov(renderer, camera, partialTick, fov, usedConfiguredFov));
|
||||
}
|
||||
|
||||
public static ViewportEvent.ComputeCameraAngles fireComputeCameraAngles(GameRenderer renderer, Camera camera, float partial) {
|
||||
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, 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 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 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 onRenderArm(PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, AbstractClientPlayer player, HumanoidArm arm) {
|
||||
return post(new RenderArmEvent(poseStack, multiBufferSource, packedLight, player, 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 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 void onRenderScreenBackground(Screen screen, GuiGraphics guiGraphics) {
|
||||
fire(new ScreenEvent.BackgroundRendered(screen, guiGraphics));
|
||||
}
|
||||
}
|
||||
@@ -295,6 +295,7 @@ public abstract class InputEvent extends Event {
|
||||
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*/
|
||||
// TODO: Change the 'button' to sub events. - Lex 0422202
|
||||
@Cancelable
|
||||
public static class InteractionKeyMappingTriggered extends InputEvent {
|
||||
private final int button;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
@@ -29,7 +30,7 @@ import java.util.Map;
|
||||
*
|
||||
* <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 RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
{
|
||||
private final Map<ResourceLocation, IGuiOverlay> overlays;
|
||||
@@ -47,7 +48,7 @@ public class RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
*
|
||||
* @param id A unique resource id for this overlay
|
||||
* @param overlay The overlay
|
||||
*/
|
||||
* /
|
||||
public void registerBelowAll(@NotNull String id, @NotNull IGuiOverlay overlay)
|
||||
{
|
||||
register(Ordering.BEFORE, null, id, overlay);
|
||||
@@ -60,7 +61,7 @@ public class RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
* {@link VanillaGuiOverlay vanilla overlay}. Do not use other mods' overlays.
|
||||
* @param id A unique resource id for this overlay
|
||||
* @param overlay The overlay
|
||||
*/
|
||||
* /
|
||||
public void registerBelow(@NotNull ResourceLocation other, @NotNull String id, @NotNull IGuiOverlay overlay)
|
||||
{
|
||||
register(Ordering.BEFORE, other, id, overlay);
|
||||
@@ -73,7 +74,7 @@ public class RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
* {@link VanillaGuiOverlay vanilla overlay}. Do not use other mods' overlays.
|
||||
* @param id A unique resource id for this overlay
|
||||
* @param overlay The overlay
|
||||
*/
|
||||
* /
|
||||
public void registerAbove(@NotNull ResourceLocation other, @NotNull String id, @NotNull IGuiOverlay overlay)
|
||||
{
|
||||
register(Ordering.AFTER, other, id, overlay);
|
||||
@@ -84,7 +85,7 @@ public class RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
*
|
||||
* @param id A unique resource id for this overlay
|
||||
* @param overlay The overlay
|
||||
*/
|
||||
* /
|
||||
public void registerAboveAll(@NotNull String id, @NotNull IGuiOverlay overlay)
|
||||
{
|
||||
register(Ordering.AFTER, null, id, overlay);
|
||||
@@ -116,3 +117,4 @@ public class RegisterGuiOverlaysEvent extends Event implements IModBusEvent
|
||||
BEFORE, AFTER
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -7,7 +7,6 @@ package net.minecraftforge.client.event;
|
||||
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.client.renderer.ShaderInstance;
|
||||
import net.minecraft.server.packs.resources.ResourceManager;
|
||||
import net.minecraft.server.packs.resources.ResourceProvider;
|
||||
import net.minecraftforge.eventbus.api.Cancelable;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
@@ -28,14 +27,12 @@ import java.util.function.Consumer;
|
||||
* <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
|
||||
{
|
||||
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)
|
||||
{
|
||||
public RegisterShadersEvent(ResourceProvider resourceProvider, List<Pair<ShaderInstance, Consumer<ShaderInstance>>> shaderList) {
|
||||
this.resourceProvider = resourceProvider;
|
||||
this.shaderList = shaderList;
|
||||
}
|
||||
@@ -43,8 +40,7 @@ public class RegisterShadersEvent extends Event implements IModBusEvent
|
||||
/**
|
||||
* {@return the client-side resource provider}
|
||||
*/
|
||||
public ResourceProvider getResourceProvider()
|
||||
{
|
||||
public ResourceProvider getResourceProvider() {
|
||||
return resourceProvider;
|
||||
}
|
||||
|
||||
@@ -60,8 +56,7 @@ public class RegisterShadersEvent extends Event implements IModBusEvent
|
||||
* @param shaderInstance a shader
|
||||
* @param onLoaded a callback for when the shader is loaded
|
||||
*/
|
||||
public void registerShader(ShaderInstance shaderInstance, Consumer<ShaderInstance> onLoaded)
|
||||
{
|
||||
public void registerShader(ShaderInstance shaderInstance, Consumer<ShaderInstance> onLoaded) {
|
||||
shaderList.add(Pair.of(shaderInstance, onLoaded));
|
||||
}
|
||||
}
|
||||
@@ -28,8 +28,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*/
|
||||
@Cancelable
|
||||
public class RenderArmEvent extends Event
|
||||
{
|
||||
public class RenderArmEvent extends Event {
|
||||
private final PoseStack poseStack;
|
||||
private final MultiBufferSource multiBufferSource;
|
||||
private final int packedLight;
|
||||
@@ -37,8 +36,7 @@ public class RenderArmEvent extends Event
|
||||
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, AbstractClientPlayer player, HumanoidArm arm) {
|
||||
this.poseStack = poseStack;
|
||||
this.multiBufferSource = multiBufferSource;
|
||||
this.packedLight = packedLight;
|
||||
@@ -49,24 +47,21 @@ public class RenderArmEvent extends Event
|
||||
/**
|
||||
* {@return the arm being rendered}
|
||||
*/
|
||||
public HumanoidArm getArm()
|
||||
{
|
||||
public HumanoidArm getArm() {
|
||||
return arm;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack()
|
||||
{
|
||||
public PoseStack getPoseStack() {
|
||||
return poseStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the source of rendering buffers}
|
||||
*/
|
||||
public MultiBufferSource getMultiBufferSource()
|
||||
{
|
||||
public MultiBufferSource getMultiBufferSource() {
|
||||
return multiBufferSource;
|
||||
}
|
||||
|
||||
@@ -75,8 +70,7 @@ public class RenderArmEvent extends Event
|
||||
*
|
||||
* @see LightTexture
|
||||
*/
|
||||
public int getPackedLight()
|
||||
{
|
||||
public int getPackedLight() {
|
||||
return packedLight;
|
||||
}
|
||||
|
||||
@@ -84,8 +78,7 @@ public class RenderArmEvent extends Event
|
||||
* {@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()
|
||||
{
|
||||
public AbstractClientPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import com.mojang.blaze3d.platform.Window;
|
||||
@@ -12,14 +13,13 @@ import net.minecraftforge.eventbus.api.Cancelable;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.LogicalSide;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
/**
|
||||
* Fired when the HUD is rendered to the screen.
|
||||
* See the two subclasses for listening to the two possible phases.
|
||||
*
|
||||
* @see Pre
|
||||
* @see Post
|
||||
*/
|
||||
* /
|
||||
public abstract class RenderGuiEvent extends Event
|
||||
{
|
||||
private final Window window;
|
||||
@@ -60,7 +60,7 @@ public abstract class RenderGuiEvent extends Event
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*
|
||||
* @see Post
|
||||
*/
|
||||
* /
|
||||
@Cancelable
|
||||
public static class Pre extends RenderGuiEvent
|
||||
{
|
||||
@@ -78,7 +78,7 @@ public abstract class RenderGuiEvent extends Event
|
||||
*
|
||||
* <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 Post extends RenderGuiEvent
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
@@ -88,3 +88,4 @@ public abstract class RenderGuiEvent extends Event
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import com.mojang.blaze3d.platform.Window;
|
||||
@@ -22,7 +23,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
*
|
||||
* @see Pre
|
||||
* @see Post
|
||||
*/
|
||||
* /
|
||||
public abstract class RenderGuiOverlayEvent extends Event
|
||||
{
|
||||
private final Window window;
|
||||
@@ -70,7 +71,7 @@ public abstract class RenderGuiOverlayEvent extends Event
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*
|
||||
* @see Post
|
||||
*/
|
||||
* /
|
||||
@Cancelable
|
||||
public static class Pre extends RenderGuiOverlayEvent
|
||||
{
|
||||
@@ -88,7 +89,7 @@ public abstract class RenderGuiOverlayEvent extends Event
|
||||
*
|
||||
* <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 Post extends RenderGuiOverlayEvent
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
@@ -98,3 +99,4 @@ public abstract class RenderGuiOverlayEvent extends Event
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -30,8 +30,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see ItemFrameRenderer
|
||||
*/
|
||||
@Cancelable
|
||||
public class RenderItemInFrameEvent extends Event
|
||||
{
|
||||
public class RenderItemInFrameEvent extends Event {
|
||||
private final ItemStack itemStack;
|
||||
private final ItemFrame itemFrameEntity;
|
||||
private final ItemFrameRenderer<?> renderer;
|
||||
@@ -40,9 +39,7 @@ public class RenderItemInFrameEvent extends Event
|
||||
private final int packedLight;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public RenderItemInFrameEvent(ItemFrame itemFrame, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack,
|
||||
MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
public RenderItemInFrameEvent(ItemFrame itemFrame, ItemFrameRenderer<?> renderItemFrame, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
itemStack = itemFrame.getItem();
|
||||
itemFrameEntity = itemFrame;
|
||||
renderer = renderItemFrame;
|
||||
@@ -54,40 +51,35 @@ public class RenderItemInFrameEvent extends Event
|
||||
/**
|
||||
* {@return the item stack being rendered}
|
||||
*/
|
||||
public ItemStack getItemStack()
|
||||
{
|
||||
public ItemStack getItemStack() {
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the item frame entity}
|
||||
*/
|
||||
public ItemFrame getItemFrameEntity()
|
||||
{
|
||||
public ItemFrame getItemFrameEntity() {
|
||||
return itemFrameEntity;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the renderer for the item frame entity}
|
||||
*/
|
||||
public ItemFrameRenderer<?> getRenderer()
|
||||
{
|
||||
public ItemFrameRenderer<?> getRenderer() {
|
||||
return renderer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack()
|
||||
{
|
||||
public PoseStack getPoseStack() {
|
||||
return poseStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the source of rendering buffers}
|
||||
*/
|
||||
public MultiBufferSource getMultiBufferSource()
|
||||
{
|
||||
public MultiBufferSource getMultiBufferSource() {
|
||||
return multiBufferSource;
|
||||
}
|
||||
|
||||
@@ -96,8 +88,7 @@ public class RenderItemInFrameEvent extends Event
|
||||
*
|
||||
* @see LightTexture
|
||||
*/
|
||||
public int getPackedLight()
|
||||
{
|
||||
public int getPackedLight() {
|
||||
return packedLight;
|
||||
}
|
||||
}
|
||||
@@ -43,14 +43,14 @@ import org.joml.Matrix4f;
|
||||
public class RenderLevelStageEvent extends Event {
|
||||
private final Stage stage;
|
||||
private final LevelRenderer levelRenderer;
|
||||
private final PoseStack poseStack;
|
||||
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, PoseStack poseStack, Matrix4f projectionMatrix, int renderTick, float partialTick, Camera camera, 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;
|
||||
@@ -79,7 +79,7 @@ public class RenderLevelStageEvent extends Event {
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack() {
|
||||
public Matrix4f getPoseStack() {
|
||||
return poseStack;
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ public class RenderLevelStageEvent extends Event {
|
||||
|
||||
/** 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, PoseStack poseStack, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
|
||||
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());
|
||||
|
||||
@@ -31,8 +31,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see RenderPlayerEvent
|
||||
* @see LivingEntityRenderer
|
||||
*/
|
||||
public abstract class RenderLivingEvent<T extends LivingEntity, M extends EntityModel<T>> extends Event
|
||||
{
|
||||
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;
|
||||
@@ -41,9 +40,7 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
|
||||
private final int packedLight;
|
||||
|
||||
@ApiStatus.Internal
|
||||
protected RenderLivingEvent(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack,
|
||||
MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
protected RenderLivingEvent(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
this.entity = entity;
|
||||
this.renderer = renderer;
|
||||
this.partialTick = partialTick;
|
||||
@@ -55,40 +52,35 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
|
||||
/**
|
||||
* @return the living entity being rendered
|
||||
*/
|
||||
public LivingEntity getEntity()
|
||||
{
|
||||
public LivingEntity getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the renderer for the living entity
|
||||
*/
|
||||
public LivingEntityRenderer<T, M> getRenderer()
|
||||
{
|
||||
public LivingEntityRenderer<T, M> getRenderer() {
|
||||
return renderer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the partial tick}
|
||||
*/
|
||||
public float getPartialTick()
|
||||
{
|
||||
public float getPartialTick() {
|
||||
return partialTick;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack()
|
||||
{
|
||||
public PoseStack getPoseStack() {
|
||||
return poseStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the source of rendering buffers}
|
||||
*/
|
||||
public MultiBufferSource getMultiBufferSource()
|
||||
{
|
||||
public MultiBufferSource getMultiBufferSource() {
|
||||
return multiBufferSource;
|
||||
}
|
||||
|
||||
@@ -97,8 +89,7 @@ public abstract class RenderLivingEvent<T extends LivingEntity, M extends Entity
|
||||
*
|
||||
* @see LightTexture
|
||||
*/
|
||||
public int getPackedLight()
|
||||
{
|
||||
public int getPackedLight() {
|
||||
return packedLight;
|
||||
}
|
||||
|
||||
@@ -117,11 +108,9 @@ 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, M extends EntityModel<T>> extends RenderLivingEvent<T, M> {
|
||||
@ApiStatus.Internal
|
||||
public Pre(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
public Pre(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
super(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight);
|
||||
}
|
||||
}
|
||||
@@ -137,11 +126,9 @@ 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, M extends EntityModel<T>> extends RenderLivingEvent<T, M> {
|
||||
@ApiStatus.Internal
|
||||
public Post(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
public Post(LivingEntity entity, LivingEntityRenderer<T, M> renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
super(entity, renderer, partialTick, poseStack, multiBufferSource, packedLight);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,8 +33,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see EntityRenderer
|
||||
*/
|
||||
@Event.HasResult
|
||||
public class RenderNameTagEvent extends EntityEvent
|
||||
{
|
||||
public class RenderNameTagEvent extends EntityEvent {
|
||||
private Component nameplateContent;
|
||||
private final Component originalContent;
|
||||
private final EntityRenderer<?> entityRenderer;
|
||||
@@ -44,8 +43,7 @@ public class RenderNameTagEvent extends EntityEvent
|
||||
private final float partialTick;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public RenderNameTagEvent(Entity entity, Component content, EntityRenderer<?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, float partialTick)
|
||||
{
|
||||
public RenderNameTagEvent(Entity entity, Component content, EntityRenderer<?> entityRenderer, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, float partialTick) {
|
||||
super(entity);
|
||||
this.originalContent = content;
|
||||
this.setContent(this.originalContent);
|
||||
@@ -61,48 +59,42 @@ public class RenderNameTagEvent extends EntityEvent
|
||||
*
|
||||
* @param contents the new text
|
||||
*/
|
||||
public void setContent(Component contents)
|
||||
{
|
||||
public void setContent(Component contents) {
|
||||
this.nameplateContent = contents;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the text on the nameplate that will be rendered, if the event is not {@link Result#DENY DENIED}}
|
||||
*/
|
||||
public Component getContent()
|
||||
{
|
||||
public Component getContent() {
|
||||
return this.nameplateContent;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the original text on the nameplate}
|
||||
*/
|
||||
public Component getOriginalContent()
|
||||
{
|
||||
public Component getOriginalContent() {
|
||||
return this.originalContent;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the entity renderer rendering the nameplate}
|
||||
*/
|
||||
public EntityRenderer<?> getEntityRenderer()
|
||||
{
|
||||
public EntityRenderer<?> getEntityRenderer() {
|
||||
return this.entityRenderer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack()
|
||||
{
|
||||
public PoseStack getPoseStack() {
|
||||
return this.poseStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the source of rendering buffers}
|
||||
*/
|
||||
public MultiBufferSource getMultiBufferSource()
|
||||
{
|
||||
public MultiBufferSource getMultiBufferSource() {
|
||||
return this.multiBufferSource;
|
||||
}
|
||||
|
||||
@@ -111,16 +103,14 @@ public class RenderNameTagEvent extends EntityEvent
|
||||
*
|
||||
* @see net.minecraft.client.renderer.LightTexture
|
||||
*/
|
||||
public int getPackedLight()
|
||||
{
|
||||
public int getPackedLight() {
|
||||
return this.packedLight;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the partial tick}
|
||||
*/
|
||||
public float getPartialTick()
|
||||
{
|
||||
public float getPartialTick() {
|
||||
return this.partialTick;
|
||||
}
|
||||
}
|
||||
@@ -24,8 +24,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see RenderPlayerEvent.Post
|
||||
* @see PlayerRenderer
|
||||
*/
|
||||
public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
{
|
||||
public abstract class RenderPlayerEvent extends PlayerEvent {
|
||||
private final PlayerRenderer renderer;
|
||||
private final float partialTick;
|
||||
private final PoseStack poseStack;
|
||||
@@ -33,8 +32,7 @@ public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
private final int packedLight;
|
||||
|
||||
@ApiStatus.Internal
|
||||
protected RenderPlayerEvent(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
protected RenderPlayerEvent(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
super(player);
|
||||
this.renderer = renderer;
|
||||
this.partialTick = partialTick;
|
||||
@@ -46,32 +44,28 @@ public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
/**
|
||||
* {@return the player entity renderer}
|
||||
*/
|
||||
public PlayerRenderer getRenderer()
|
||||
{
|
||||
public PlayerRenderer getRenderer() {
|
||||
return renderer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the partial tick}
|
||||
*/
|
||||
public float getPartialTick()
|
||||
{
|
||||
public float getPartialTick() {
|
||||
return partialTick;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pose stack used for rendering}
|
||||
*/
|
||||
public PoseStack getPoseStack()
|
||||
{
|
||||
public PoseStack getPoseStack() {
|
||||
return poseStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the source of rendering buffers}
|
||||
*/
|
||||
public MultiBufferSource getMultiBufferSource()
|
||||
{
|
||||
public MultiBufferSource getMultiBufferSource() {
|
||||
return multiBufferSource;
|
||||
}
|
||||
|
||||
@@ -80,8 +74,7 @@ public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
*
|
||||
* @see LightTexture
|
||||
*/
|
||||
public int getPackedLight()
|
||||
{
|
||||
public int getPackedLight() {
|
||||
return packedLight;
|
||||
}
|
||||
|
||||
@@ -97,11 +90,9 @@ public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*/
|
||||
@Cancelable
|
||||
public static class Pre extends RenderPlayerEvent
|
||||
{
|
||||
public static class Pre extends RenderPlayerEvent {
|
||||
@ApiStatus.Internal
|
||||
public Pre(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
public Pre(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
super(player, renderer, partialTick, poseStack, multiBufferSource, packedLight);
|
||||
}
|
||||
}
|
||||
@@ -114,11 +105,9 @@ public abstract class RenderPlayerEvent extends PlayerEvent
|
||||
* <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 Post extends RenderPlayerEvent
|
||||
{
|
||||
public static class Post extends RenderPlayerEvent {
|
||||
@ApiStatus.Internal
|
||||
public Post(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight)
|
||||
{
|
||||
public Post(Player player, PlayerRenderer renderer, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight) {
|
||||
super(player, renderer, partialTick, poseStack, multiBufferSource, packedLight);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,15 +30,13 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* @see ComputeCameraAngles
|
||||
* @see ComputeFov
|
||||
*/
|
||||
public abstract class ViewportEvent extends Event
|
||||
{
|
||||
public abstract class ViewportEvent extends Event {
|
||||
private final GameRenderer renderer;
|
||||
private final Camera camera;
|
||||
private final double partialTick;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public ViewportEvent(GameRenderer renderer, Camera camera, double partialTick)
|
||||
{
|
||||
public ViewportEvent(GameRenderer renderer, Camera camera, double partialTick) {
|
||||
this.renderer = renderer;
|
||||
this.camera = camera;
|
||||
this.partialTick = partialTick;
|
||||
@@ -47,24 +45,21 @@ public abstract class ViewportEvent extends Event
|
||||
/**
|
||||
* {@return the game renderer}
|
||||
*/
|
||||
public GameRenderer getRenderer()
|
||||
{
|
||||
public GameRenderer getRenderer() {
|
||||
return renderer;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the camera information}
|
||||
*/
|
||||
public Camera getCamera()
|
||||
{
|
||||
public Camera getCamera() {
|
||||
return camera;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the partial tick}
|
||||
*/
|
||||
public double getPartialTick()
|
||||
{
|
||||
public double getPartialTick() {
|
||||
return partialTick;
|
||||
}
|
||||
|
||||
@@ -78,8 +73,7 @@ public abstract class ViewportEvent extends Event
|
||||
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||
*/
|
||||
@Cancelable
|
||||
public static class RenderFog extends ViewportEvent
|
||||
{
|
||||
public static class RenderFog extends ViewportEvent {
|
||||
private final FogMode mode;
|
||||
private final FogType type;
|
||||
private float farPlaneDistance;
|
||||
@@ -87,8 +81,7 @@ public abstract class ViewportEvent extends Event
|
||||
private FogShape fogShape;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public RenderFog(FogMode mode, FogType type, Camera camera, float partialTicks, float nearPlaneDistance, float farPlaneDistance, FogShape fogShape)
|
||||
{
|
||||
public RenderFog(FogMode mode, FogType type, Camera camera, float partialTicks, float nearPlaneDistance, float farPlaneDistance, FogShape fogShape) {
|
||||
super(Minecraft.getInstance().gameRenderer, camera, partialTicks);
|
||||
this.mode = mode;
|
||||
this.type = type;
|
||||
@@ -100,40 +93,35 @@ public abstract class ViewportEvent extends Event
|
||||
/**
|
||||
* {@return the mode of fog being rendered}
|
||||
*/
|
||||
public FogMode getMode()
|
||||
{
|
||||
public FogMode getMode() {
|
||||
return mode;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the type of fog being rendered}
|
||||
*/
|
||||
public FogType getType()
|
||||
{
|
||||
public FogType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the distance to the far plane where the fog ends}
|
||||
*/
|
||||
public float getFarPlaneDistance()
|
||||
{
|
||||
public float getFarPlaneDistance() {
|
||||
return farPlaneDistance;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the distance to the near plane where the fog starts}
|
||||
*/
|
||||
public float getNearPlaneDistance()
|
||||
{
|
||||
public float getNearPlaneDistance() {
|
||||
return nearPlaneDistance;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the shape of the fog being rendered}
|
||||
*/
|
||||
public FogShape getFogShape()
|
||||
{
|
||||
public FogShape getFogShape() {
|
||||
return fogShape;
|
||||
}
|
||||
|
||||
@@ -143,8 +131,7 @@ public abstract class ViewportEvent extends Event
|
||||
* @param distance the new distance to the far place
|
||||
* @see #scaleFarPlaneDistance(float)
|
||||
*/
|
||||
public void setFarPlaneDistance(float distance)
|
||||
{
|
||||
public void setFarPlaneDistance(float distance) {
|
||||
farPlaneDistance = distance;
|
||||
}
|
||||
|
||||
@@ -154,8 +141,7 @@ public abstract class ViewportEvent extends Event
|
||||
* @param distance the new distance to the near plane
|
||||
* @see #scaleNearPlaneDistance(float)
|
||||
*/
|
||||
public void setNearPlaneDistance(float distance)
|
||||
{
|
||||
public void setNearPlaneDistance(float distance) {
|
||||
nearPlaneDistance = distance;
|
||||
}
|
||||
|
||||
@@ -164,8 +150,7 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param shape the new shape of the fog
|
||||
*/
|
||||
public void setFogShape(FogShape shape)
|
||||
{
|
||||
public void setFogShape(FogShape shape) {
|
||||
fogShape = shape;
|
||||
}
|
||||
|
||||
@@ -174,8 +159,7 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param factor the factor to scale the far plane distance by
|
||||
*/
|
||||
public void scaleFarPlaneDistance(float factor)
|
||||
{
|
||||
public void scaleFarPlaneDistance(float factor) {
|
||||
farPlaneDistance *= factor;
|
||||
}
|
||||
|
||||
@@ -184,8 +168,7 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param factor the factor to scale the near plane distance by
|
||||
*/
|
||||
public void scaleNearPlaneDistance(float factor)
|
||||
{
|
||||
public void scaleNearPlaneDistance(float factor) {
|
||||
nearPlaneDistance *= factor;
|
||||
}
|
||||
}
|
||||
@@ -198,15 +181,13 @@ public abstract class ViewportEvent extends Event
|
||||
* <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 ComputeFogColor extends ViewportEvent
|
||||
{
|
||||
public static class ComputeFogColor extends ViewportEvent {
|
||||
private float red;
|
||||
private float green;
|
||||
private float blue;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public ComputeFogColor(Camera camera, float partialTicks, float red, float green, float blue)
|
||||
{
|
||||
public ComputeFogColor(Camera camera, float partialTicks, float red, float green, float blue) {
|
||||
super(Minecraft.getInstance().gameRenderer, camera, partialTicks);
|
||||
this.setRed(red);
|
||||
this.setGreen(green);
|
||||
@@ -216,8 +197,7 @@ public abstract class ViewportEvent extends Event
|
||||
/**
|
||||
* {@return the red color value of the fog}
|
||||
*/
|
||||
public float getRed()
|
||||
{
|
||||
public float getRed() {
|
||||
return red;
|
||||
}
|
||||
|
||||
@@ -226,16 +206,14 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param red the new red color value
|
||||
*/
|
||||
public void setRed(float red)
|
||||
{
|
||||
public void setRed(float red) {
|
||||
this.red = red;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the green color value of the fog}
|
||||
*/
|
||||
public float getGreen()
|
||||
{
|
||||
public float getGreen() {
|
||||
return green;
|
||||
}
|
||||
|
||||
@@ -244,16 +222,14 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param green the new blue color value
|
||||
*/
|
||||
public void setGreen(float green)
|
||||
{
|
||||
public void setGreen(float green) {
|
||||
this.green = green;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the blue color value of the fog}
|
||||
*/
|
||||
public float getBlue()
|
||||
{
|
||||
public float getBlue() {
|
||||
return blue;
|
||||
}
|
||||
|
||||
@@ -262,8 +238,7 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param blue the new blue color value
|
||||
*/
|
||||
public void setBlue(float blue)
|
||||
{
|
||||
public void setBlue(float blue) {
|
||||
this.blue = blue;
|
||||
}
|
||||
}
|
||||
@@ -277,15 +252,13 @@ public abstract class ViewportEvent extends Event
|
||||
* <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 ComputeCameraAngles extends ViewportEvent
|
||||
{
|
||||
public static class ComputeCameraAngles extends ViewportEvent {
|
||||
private float yaw;
|
||||
private float pitch;
|
||||
private float roll;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public ComputeCameraAngles(GameRenderer renderer, Camera camera, double renderPartialTicks, float yaw, float pitch, float roll)
|
||||
{
|
||||
public ComputeCameraAngles(GameRenderer renderer, Camera camera, double renderPartialTicks, float yaw, float pitch, float roll) {
|
||||
super(renderer, camera, renderPartialTicks);
|
||||
this.setYaw(yaw);
|
||||
this.setPitch(pitch);
|
||||
@@ -295,8 +268,7 @@ public abstract class ViewportEvent extends Event
|
||||
/**
|
||||
* {@return the yaw of the player's camera}
|
||||
*/
|
||||
public float getYaw()
|
||||
{
|
||||
public float getYaw() {
|
||||
return yaw;
|
||||
}
|
||||
|
||||
@@ -305,16 +277,14 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param yaw the new yaw
|
||||
*/
|
||||
public void setYaw(float yaw)
|
||||
{
|
||||
public void setYaw(float yaw) {
|
||||
this.yaw = yaw;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the pitch of the player's camera}
|
||||
*/
|
||||
public float getPitch()
|
||||
{
|
||||
public float getPitch() {
|
||||
return pitch;
|
||||
}
|
||||
|
||||
@@ -323,16 +293,14 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param pitch the new pitch
|
||||
*/
|
||||
public void setPitch(float pitch)
|
||||
{
|
||||
public void setPitch(float pitch) {
|
||||
this.pitch = pitch;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return the roll of the player's camera}
|
||||
*/
|
||||
public float getRoll()
|
||||
{
|
||||
public float getRoll() {
|
||||
return roll;
|
||||
}
|
||||
|
||||
@@ -341,8 +309,7 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param roll the new roll
|
||||
*/
|
||||
public void setRoll(float roll)
|
||||
{
|
||||
public void setRoll(float roll) {
|
||||
this.roll = roll;
|
||||
}
|
||||
}
|
||||
@@ -358,14 +325,12 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @see ComputeFovModifierEvent
|
||||
*/
|
||||
public static class ComputeFov extends ViewportEvent
|
||||
{
|
||||
public static class ComputeFov extends ViewportEvent {
|
||||
private final boolean usedConfiguredFov;
|
||||
private double fov;
|
||||
|
||||
@ApiStatus.Internal
|
||||
public ComputeFov(GameRenderer renderer, Camera camera, double renderPartialTicks, double fov, boolean usedConfiguredFov)
|
||||
{
|
||||
public ComputeFov(GameRenderer renderer, Camera camera, double renderPartialTicks, double fov, boolean usedConfiguredFov) {
|
||||
super(renderer, camera, renderPartialTicks);
|
||||
this.usedConfiguredFov = usedConfiguredFov;
|
||||
this.setFOV(fov);
|
||||
@@ -374,8 +339,7 @@ public abstract class ViewportEvent extends Event
|
||||
/**
|
||||
* {@return the raw field of view value}
|
||||
*/
|
||||
public double getFOV()
|
||||
{
|
||||
public double getFOV() {
|
||||
return fov;
|
||||
}
|
||||
|
||||
@@ -384,16 +348,14 @@ public abstract class ViewportEvent extends Event
|
||||
*
|
||||
* @param fov the new FOV value
|
||||
*/
|
||||
public void setFOV(double fov)
|
||||
{
|
||||
public void setFOV(double fov) {
|
||||
this.fov = fov;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return whether the base fov value started with a constant or was sourced from the fov set in the options}
|
||||
*/
|
||||
public boolean usedConfiguredFov()
|
||||
{
|
||||
public boolean usedConfiguredFov() {
|
||||
return usedConfiguredFov;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,29 +30,24 @@ import java.util.List;
|
||||
/**
|
||||
* Extension interface for {@link IForgeBakedModel}.
|
||||
*/
|
||||
public interface IForgeBakedModel
|
||||
{
|
||||
private BakedModel self()
|
||||
{
|
||||
return (BakedModel) this;
|
||||
public interface IForgeBakedModel {
|
||||
private BakedModel self() {
|
||||
return (BakedModel)this;
|
||||
}
|
||||
|
||||
/**
|
||||
* A null {@link RenderType} is used for the breaking overlay as well as non-standard rendering, so models should return all their quads.
|
||||
*/
|
||||
@NotNull
|
||||
default List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand, @NotNull ModelData data, @Nullable RenderType renderType)
|
||||
{
|
||||
default List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand, @NotNull ModelData data, @Nullable RenderType renderType) {
|
||||
return self().getQuads(state, side, rand);
|
||||
}
|
||||
|
||||
default boolean useAmbientOcclusion(BlockState state)
|
||||
{
|
||||
default boolean useAmbientOcclusion(BlockState state) {
|
||||
return self().useAmbientOcclusion();
|
||||
}
|
||||
|
||||
default boolean useAmbientOcclusion(BlockState state, RenderType renderType)
|
||||
{
|
||||
default boolean useAmbientOcclusion(BlockState state, RenderType renderType) {
|
||||
return self().useAmbientOcclusion(state);
|
||||
}
|
||||
|
||||
@@ -60,19 +55,16 @@ public interface IForgeBakedModel
|
||||
* Applies a transform for the given {@link ItemTransforms.TransformType} and {@code applyLeftHandTransform}, and
|
||||
* returns the model to be rendered.
|
||||
*/
|
||||
default BakedModel applyTransform(ItemDisplayContext transformType, PoseStack poseStack, boolean applyLeftHandTransform)
|
||||
{
|
||||
default BakedModel applyTransform(ItemDisplayContext transformType, PoseStack poseStack, boolean applyLeftHandTransform) {
|
||||
self().getTransforms().getTransform(transformType).apply(applyLeftHandTransform, poseStack);
|
||||
return self();
|
||||
}
|
||||
|
||||
default @NotNull ModelData getModelData(@NotNull BlockAndTintGetter level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull ModelData modelData)
|
||||
{
|
||||
default @NotNull ModelData getModelData(@NotNull BlockAndTintGetter level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull ModelData modelData) {
|
||||
return modelData;
|
||||
}
|
||||
|
||||
default TextureAtlasSprite getParticleIcon(@NotNull ModelData data)
|
||||
{
|
||||
default TextureAtlasSprite getParticleIcon(@NotNull ModelData data) {
|
||||
return self().getParticleIcon();
|
||||
}
|
||||
|
||||
@@ -82,8 +74,7 @@ public interface IForgeBakedModel
|
||||
* <p>
|
||||
* By default, defers query to {@link ItemBlockRenderTypes}.
|
||||
*/
|
||||
default ChunkRenderTypeSet getRenderTypes(@NotNull BlockState state, @NotNull RandomSource rand, @NotNull ModelData data)
|
||||
{
|
||||
default ChunkRenderTypeSet getRenderTypes(@NotNull BlockState state, @NotNull RandomSource rand, @NotNull ModelData data) {
|
||||
return ItemBlockRenderTypes.getRenderLayers(state);
|
||||
}
|
||||
|
||||
@@ -97,8 +88,7 @@ public interface IForgeBakedModel
|
||||
*
|
||||
* @see #getRenderPasses(ItemStack, boolean)
|
||||
*/
|
||||
default List<RenderType> getRenderTypes(ItemStack itemStack, boolean fabulous)
|
||||
{
|
||||
default List<RenderType> getRenderTypes(ItemStack itemStack, boolean fabulous) {
|
||||
return List.of(RenderTypeHelper.getFallbackItemRenderType(itemStack, self(), fabulous));
|
||||
}
|
||||
|
||||
@@ -110,8 +100,7 @@ public interface IForgeBakedModel
|
||||
*
|
||||
* @see #getRenderTypes(ItemStack, boolean)
|
||||
*/
|
||||
default List<BakedModel> getRenderPasses(ItemStack itemStack, boolean fabulous)
|
||||
{
|
||||
default List<BakedModel> getRenderPasses(ItemStack itemStack, boolean fabulous) {
|
||||
return List.of(self());
|
||||
}
|
||||
}
|
||||
+7
-13
@@ -16,11 +16,9 @@ import org.joml.Vector3f;
|
||||
/**
|
||||
* Extension interface for {@link DimensionSpecialEffects}.
|
||||
*/
|
||||
public interface IForgeDimensionSpecialEffects
|
||||
{
|
||||
private DimensionSpecialEffects self()
|
||||
{
|
||||
return (DimensionSpecialEffects) this;
|
||||
public interface IForgeDimensionSpecialEffects {
|
||||
private DimensionSpecialEffects self() {
|
||||
return (DimensionSpecialEffects)this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -28,8 +26,7 @@ public interface IForgeDimensionSpecialEffects
|
||||
*
|
||||
* @return true to prevent vanilla cloud rendering
|
||||
*/
|
||||
default boolean renderClouds(ClientLevel level, int ticks, float partialTick, PoseStack poseStack, double camX, double camY, double camZ, Matrix4f projectionMatrix)
|
||||
{
|
||||
default boolean renderClouds(ClientLevel level, int ticks, float partialTick, PoseStack poseStack, double camX, double camY, double camZ, Matrix4f projectionMatrix) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -38,8 +35,7 @@ public interface IForgeDimensionSpecialEffects
|
||||
*
|
||||
* @return true to prevent vanilla sky rendering
|
||||
*/
|
||||
default boolean renderSky(ClientLevel level, int ticks, float partialTick, PoseStack poseStack, Camera camera, Matrix4f projectionMatrix, boolean isFoggy, Runnable setupFog)
|
||||
{
|
||||
default boolean renderSky(ClientLevel level, int ticks, float partialTick, Camera camera, Matrix4f projectionMatrix, boolean isFoggy, Runnable setupFog) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -48,8 +44,7 @@ public interface IForgeDimensionSpecialEffects
|
||||
*
|
||||
* @return true to prevent vanilla snow and rain rendering
|
||||
*/
|
||||
default boolean renderSnowAndRain(ClientLevel level, int ticks, float partialTick, LightTexture lightTexture, double camX, double camY, double camZ)
|
||||
{
|
||||
default boolean renderSnowAndRain(ClientLevel level, int ticks, float partialTick, LightTexture lightTexture, double camX, double camY, double camZ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -58,8 +53,7 @@ public interface IForgeDimensionSpecialEffects
|
||||
*
|
||||
* @return true to prevent vanilla rain ticking
|
||||
*/
|
||||
default boolean tickRain(ClientLevel level, int ticks, Camera camera)
|
||||
{
|
||||
default boolean tickRain(ClientLevel level, int ticks, Camera camera) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,8 +13,7 @@ import net.minecraft.resources.ResourceLocation;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import java.util.function.Function;
|
||||
|
||||
public interface IForgeModelBaker
|
||||
{
|
||||
public interface IForgeModelBaker {
|
||||
@Nullable
|
||||
BakedModel bake(ResourceLocation location, ModelState state, Function<Material, TextureAtlasSprite> sprites);
|
||||
|
||||
|
||||
@@ -12,11 +12,9 @@ import org.joml.Vector3f;
|
||||
/**
|
||||
* Extension interface for {@link com.mojang.blaze3d.vertex.PoseStack}.
|
||||
*/
|
||||
public interface IForgePoseStack
|
||||
{
|
||||
private PoseStack self()
|
||||
{
|
||||
return (PoseStack) this;
|
||||
public interface IForgePoseStack {
|
||||
private PoseStack self() {
|
||||
return (PoseStack)this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -25,8 +23,7 @@ public interface IForgePoseStack
|
||||
*
|
||||
* @param transformation the transformation to push
|
||||
*/
|
||||
default void pushTransformation(Transformation transformation)
|
||||
{
|
||||
default void pushTransformation(Transformation transformation) {
|
||||
final PoseStack self = self();
|
||||
self.pushPose();
|
||||
|
||||
|
||||
@@ -18,11 +18,9 @@ import java.nio.ByteBuffer;
|
||||
/**
|
||||
* Extension interface for {@link VertexConsumer}.
|
||||
*/
|
||||
public interface IForgeVertexConsumer
|
||||
{
|
||||
private VertexConsumer self()
|
||||
{
|
||||
return (VertexConsumer) this;
|
||||
public interface IForgeVertexConsumer {
|
||||
private VertexConsumer self() {
|
||||
return (VertexConsumer)this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -30,21 +28,18 @@ public interface IForgeVertexConsumer
|
||||
* <p>
|
||||
* If the consumer needs to store the data for later use, it must copy it. There are no guarantees on immutability.
|
||||
*/
|
||||
default VertexConsumer misc(VertexFormatElement element, int... rawData)
|
||||
{
|
||||
default VertexConsumer misc(VertexFormatElement element, int... rawData) {
|
||||
return self();
|
||||
}
|
||||
|
||||
/**
|
||||
* Variant with no per-vertex shading.
|
||||
*/
|
||||
default void putBulkData(PoseStack.Pose pose, BakedQuad bakedQuad, float red, float green, float blue, float alpha, int packedLight, int packedOverlay, boolean readExistingColor)
|
||||
{
|
||||
default void putBulkData(PoseStack.Pose pose, BakedQuad bakedQuad, float red, float green, float blue, float alpha, int packedLight, int packedOverlay, boolean readExistingColor) {
|
||||
self().putBulkData(pose, bakedQuad, new float[] { 1.0F, 1.0F, 1.0F, 1.0F }, red, green, blue, alpha, new int[] { packedLight, packedLight, packedLight, packedLight }, packedOverlay, readExistingColor);
|
||||
}
|
||||
|
||||
default int applyBakedLighting(int packedLight, ByteBuffer data)
|
||||
{
|
||||
default int applyBakedLighting(int packedLight, ByteBuffer data) {
|
||||
int bl = packedLight & 0xFFFF;
|
||||
int sl = (packedLight >> 16) & 0xFFFF;
|
||||
int offset = IQuadTransformer.UV2 * 4; // int offset for vertex 0 * 4 bytes per int
|
||||
@@ -55,13 +50,11 @@ public interface IForgeVertexConsumer
|
||||
return bl | (sl << 16);
|
||||
}
|
||||
|
||||
default void applyBakedNormals(Vector3f generated, ByteBuffer data, Matrix3f normalTransform)
|
||||
{
|
||||
default void applyBakedNormals(Vector3f generated, ByteBuffer data, Matrix3f normalTransform) {
|
||||
byte nx = data.get(28);
|
||||
byte ny = data.get(29);
|
||||
byte nz = data.get(30);
|
||||
if (nx != 0 || ny != 0 || nz != 0)
|
||||
{
|
||||
if (nx != 0 || ny != 0 || nz != 0) {
|
||||
generated.set(nx / 127f, ny / 127f, nz / 127f);
|
||||
generated.mul(normalTransform);
|
||||
}
|
||||
|
||||
+12
-25
@@ -30,23 +30,20 @@ import java.util.function.Consumer;
|
||||
*
|
||||
* @see Block#initializeClient(Consumer)
|
||||
*/
|
||||
public interface IClientBlockExtensions
|
||||
{
|
||||
public interface IClientBlockExtensions {
|
||||
IClientBlockExtensions DEFAULT = new IClientBlockExtensions() { };
|
||||
|
||||
static IClientBlockExtensions of(BlockState state)
|
||||
{
|
||||
static IClientBlockExtensions of(BlockState state) {
|
||||
return of(state.getBlock());
|
||||
}
|
||||
|
||||
static IClientBlockExtensions of(Block block)
|
||||
{
|
||||
static IClientBlockExtensions of(Block block) {
|
||||
return block.getRenderPropertiesInternal() instanceof IClientBlockExtensions e ? e : DEFAULT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Spawn a digging particle effect in the level, this is a wrapper
|
||||
* around EffectRenderer.addBlockHitEffects to allow the block more
|
||||
* around EffectRenderer.crack to allow the block more
|
||||
* control over the particles. Useful when you have entirely different
|
||||
* texture sheets for different sides/locations in the level.
|
||||
*
|
||||
@@ -56,8 +53,7 @@ public interface IClientBlockExtensions
|
||||
* @param manager A reference to the current particle manager.
|
||||
* @return True to prevent vanilla digging particles form spawning.
|
||||
*/
|
||||
default boolean addHitEffects(BlockState state, Level level, HitResult target, ParticleEngine manager)
|
||||
{
|
||||
default boolean addHitEffects(BlockState state, Level level, HitResult target, ParticleEngine manager) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -72,8 +68,7 @@ public interface IClientBlockExtensions
|
||||
* @param manager A reference to the current particle manager.
|
||||
* @return True to prevent vanilla break particles from spawning.
|
||||
*/
|
||||
default boolean addDestroyEffects(BlockState state, Level Level, BlockPos pos, ParticleEngine manager)
|
||||
{
|
||||
default boolean addDestroyEffects(BlockState state, Level Level, BlockPos pos, ParticleEngine manager) {
|
||||
return !state.shouldSpawnTerrainParticles();
|
||||
}
|
||||
|
||||
@@ -90,27 +85,20 @@ public interface IClientBlockExtensions
|
||||
* @param originalColor The current fog color, You are not expected to use this, Return as the default if applicable.
|
||||
* @return The new fog color.
|
||||
*/
|
||||
default Vector3d getFogColor(BlockState state, LevelReader level, BlockPos pos, Entity entity, Vector3d originalColor, float partialTick)
|
||||
{
|
||||
default Vector3d getFogColor(BlockState state, LevelReader level, BlockPos pos, Entity entity, Vector3d originalColor, float partialTick) {
|
||||
FluidState fluidState = level.getFluidState(pos);
|
||||
if (fluidState.is(FluidTags.WATER))
|
||||
{
|
||||
if (fluidState.is(FluidTags.WATER)) {
|
||||
float f12 = 0.0F;
|
||||
|
||||
if (entity instanceof LivingEntity)
|
||||
{
|
||||
LivingEntity ent = (LivingEntity) entity;
|
||||
if (entity instanceof LivingEntity ent) {
|
||||
f12 = (float) EnchantmentHelper.getRespiration(ent) * 0.2F;
|
||||
|
||||
if (ent.hasEffect(MobEffects.WATER_BREATHING))
|
||||
{
|
||||
if (ent.hasEffect(MobEffects.WATER_BREATHING)) {
|
||||
f12 = f12 * 0.3F + 0.6F;
|
||||
}
|
||||
}
|
||||
return new Vector3d(0.02F + f12, 0.02F + f12, 0.2F + f12);
|
||||
}
|
||||
else if (fluidState.is(FluidTags.LAVA))
|
||||
{
|
||||
} else if (fluidState.is(FluidTags.LAVA)) {
|
||||
return new Vector3d(0.6F, 0.1F, 0.0F);
|
||||
}
|
||||
return originalColor;
|
||||
@@ -124,8 +112,7 @@ public interface IClientBlockExtensions
|
||||
* @param pos The position of the block
|
||||
* @return {@code true} if the particles should be tinted.
|
||||
*/
|
||||
default boolean areBreakingParticlesTinted(BlockState state, ClientLevel level, BlockPos pos)
|
||||
{
|
||||
default boolean areBreakingParticlesTinted(BlockState state, ClientLevel level, BlockPos pos) {
|
||||
return !state.is(Blocks.GRASS_BLOCK);
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -19,17 +19,14 @@ import java.util.function.Consumer;
|
||||
*
|
||||
* @see MobEffect#initializeClient(Consumer)
|
||||
*/
|
||||
public interface IClientMobEffectExtensions
|
||||
{
|
||||
public interface IClientMobEffectExtensions {
|
||||
IClientMobEffectExtensions DEFAULT = new IClientMobEffectExtensions() { };
|
||||
|
||||
static IClientMobEffectExtensions of(MobEffectInstance instance)
|
||||
{
|
||||
return of(instance.getEffect());
|
||||
static IClientMobEffectExtensions of(MobEffectInstance instance) {
|
||||
return of(instance.getEffect().value());
|
||||
}
|
||||
|
||||
static IClientMobEffectExtensions of(MobEffect effect)
|
||||
{
|
||||
static IClientMobEffectExtensions of(MobEffect effect) {
|
||||
return effect.getEffectRendererInternal() instanceof IClientMobEffectExtensions r ? r : DEFAULT;
|
||||
}
|
||||
|
||||
@@ -38,8 +35,7 @@ public interface IClientMobEffectExtensions
|
||||
* <p>
|
||||
* By default, this returns {@code true}.
|
||||
*/
|
||||
default boolean isVisibleInInventory(MobEffectInstance instance)
|
||||
{
|
||||
default boolean isVisibleInInventory(MobEffectInstance instance) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -48,8 +44,7 @@ public interface IClientMobEffectExtensions
|
||||
* <p>
|
||||
* By default, this returns {@code true}.
|
||||
*/
|
||||
default boolean isVisibleInGui(MobEffectInstance instance)
|
||||
{
|
||||
default boolean isVisibleInGui(MobEffectInstance instance) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,8 +60,7 @@ public interface IClientMobEffectExtensions
|
||||
* @param blitOffset The blit offset
|
||||
* @return true to prevent default rendering, false otherwise
|
||||
*/
|
||||
default boolean renderInventoryIcon(MobEffectInstance instance, EffectRenderingInventoryScreen<?> screen, GuiGraphics guiGraphics, int x, int y, int blitOffset)
|
||||
{
|
||||
default boolean renderInventoryIcon(MobEffectInstance instance, EffectRenderingInventoryScreen<?> screen, GuiGraphics guiGraphics, int x, int y, int blitOffset) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -81,8 +75,7 @@ public interface IClientMobEffectExtensions
|
||||
* @param blitOffset The blit offset
|
||||
* @return true to prevent default rendering, false otherwise
|
||||
*/
|
||||
default boolean renderInventoryText(MobEffectInstance instance, EffectRenderingInventoryScreen<?> screen, GuiGraphics guiGraphics, int x, int y, int blitOffset)
|
||||
{
|
||||
default boolean renderInventoryText(MobEffectInstance instance, EffectRenderingInventoryScreen<?> screen, GuiGraphics guiGraphics, int x, int y, int blitOffset) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -99,8 +92,7 @@ public interface IClientMobEffectExtensions
|
||||
* @param alpha The alpha value. Blinks when the effect is about to run out
|
||||
* @return true to prevent default rendering, false otherwise
|
||||
*/
|
||||
default boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha)
|
||||
{
|
||||
default boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class TitleScreenModUpdateIndicator extends Screen
|
||||
public static TitleScreenModUpdateIndicator init(TitleScreen guiMainMenu, Button modButton)
|
||||
{
|
||||
TitleScreenModUpdateIndicator titleScreenModUpdateIndicator = new TitleScreenModUpdateIndicator(modButton);
|
||||
titleScreenModUpdateIndicator.resize(guiMainMenu.getMinecraft(), guiMainMenu.width, guiMainMenu.height);
|
||||
//titleScreenModUpdateIndicator.resize(guiMainMenu.getMinecraft(), guiMainMenu.width, guiMainMenu.height);
|
||||
titleScreenModUpdateIndicator.init();
|
||||
return titleScreenModUpdateIndicator;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.gui.overlay;
|
||||
|
||||
import com.mojang.blaze3d.platform.Window;
|
||||
@@ -47,7 +48,7 @@ import java.util.List;
|
||||
|
||||
/**
|
||||
* Forge wrapper around {@link Gui} to be able to render {@link IGuiOverlay HUD overlays}.
|
||||
*/
|
||||
* /
|
||||
public class ForgeGui extends Gui {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
|
||||
@@ -55,14 +56,14 @@ public class ForgeGui extends Gui {
|
||||
|
||||
/*
|
||||
* If the Euclidean distance to the moused-over block in meters is less than this value, the "Looking at" text will appear on the debug overlay.
|
||||
*/
|
||||
* /
|
||||
public static double rayTraceDistance = 20.0D;
|
||||
|
||||
public int leftHeight = 39;
|
||||
public int rightHeight = 39;
|
||||
|
||||
public ForgeGui(Minecraft mc) {
|
||||
super(mc, mc.getItemRenderer());
|
||||
super(mc);
|
||||
this.debugOverlay = new OverlayAccess(mc);
|
||||
}
|
||||
|
||||
@@ -457,7 +458,7 @@ public class ForgeGui extends Gui {
|
||||
guiGraphics.pose().translate(event.getPosX(), (event.getPosY() - height + 40) / chat.getScale(), 0.0D);
|
||||
int mouseX = Mth.floor(minecraft.mouseHandler.xpos() * window.getGuiScaledWidth() / window.getScreenWidth());
|
||||
int mouseY = Mth.floor(minecraft.mouseHandler.ypos() * window.getGuiScaledHeight() / window.getScreenHeight());
|
||||
chat.render(guiGraphics, tickCount, mouseX, mouseY);
|
||||
chat.render(guiGraphics, tickCount, mouseX, mouseY, false);
|
||||
guiGraphics.pose().popPose();
|
||||
|
||||
minecraft.getProfiler().pop();
|
||||
@@ -533,3 +534,4 @@ public class ForgeGui extends Gui {
|
||||
@Override protected void renderLines(GuiGraphics gfx, List<String> lines, boolean leftAlign) { super.renderLines(gfx, lines, leftAlign); }
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.gui.overlay;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
@@ -21,7 +22,7 @@ import java.util.function.Function;
|
||||
* Manager for {@linkplain IGuiOverlay HUD overlays}.
|
||||
* <p>
|
||||
* Provides a lookup by ID, as well as all registered {@link IGuiOverlay overlays}.
|
||||
*/
|
||||
* /
|
||||
public final class GuiOverlayManager
|
||||
{
|
||||
private static ImmutableList<NamedGuiOverlay> OVERLAYS;
|
||||
@@ -29,7 +30,7 @@ public final class GuiOverlayManager
|
||||
|
||||
/**
|
||||
* Retrieves an ordered list of all registered overlays.
|
||||
*/
|
||||
* /
|
||||
public static ImmutableList<NamedGuiOverlay> getOverlays()
|
||||
{
|
||||
return OVERLAYS;
|
||||
@@ -38,7 +39,7 @@ public final class GuiOverlayManager
|
||||
/**
|
||||
* Finds the overlay corresponding to a given ID.
|
||||
* Do not call this before {@link RegisterGuiOverlaysEvent} has finished firing.
|
||||
*/
|
||||
* /
|
||||
@Nullable
|
||||
public static NamedGuiOverlay findOverlay(ResourceLocation id)
|
||||
{
|
||||
@@ -63,7 +64,7 @@ public final class GuiOverlayManager
|
||||
|
||||
/**
|
||||
* Pre-registers vanilla overlays so they are available for ordering.
|
||||
*/
|
||||
* /
|
||||
private static void preRegisterVanillaOverlays(HashMap<ResourceLocation, IGuiOverlay> overlays, ArrayList<ResourceLocation> orderedOverlays)
|
||||
{
|
||||
for (var entry : VanillaGuiOverlay.values())
|
||||
@@ -83,3 +84,4 @@ public final class GuiOverlayManager
|
||||
{
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.gui.overlay;
|
||||
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
@@ -12,8 +13,9 @@ import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
|
||||
* A HUD overlay.
|
||||
*
|
||||
* @see RegisterGuiOverlaysEvent
|
||||
*/
|
||||
* /
|
||||
@FunctionalInterface
|
||||
public interface IGuiOverlay {
|
||||
void render(ForgeGui gui, GuiGraphics guiGraphics, float partialTick, int screenWidth, int screenHeight);
|
||||
}
|
||||
*/
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.gui.overlay;
|
||||
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
@@ -14,7 +15,7 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
* Useful to identify overlays in {@link net.minecraftforge.client.event.RenderGuiOverlayEvent}.
|
||||
* <p>
|
||||
* Users should not be instantiating this themselves. Retrieve from {@link GuiOverlayManager}.
|
||||
*/
|
||||
* /
|
||||
public record NamedGuiOverlay(ResourceLocation id, IGuiOverlay overlay)
|
||||
{
|
||||
@ApiStatus.Internal
|
||||
@@ -22,3 +23,4 @@ public record NamedGuiOverlay(ResourceLocation id, IGuiOverlay overlay)
|
||||
{
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -3,6 +3,7 @@
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
/** Forge 1.20.5 - Removed, Mojang created a layered rendering system that should make this all obsolete finally.. - Lex 042724
|
||||
package net.minecraftforge.client.gui.overlay;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
@@ -22,7 +23,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
/**
|
||||
* All the vanilla {@linkplain IGuiOverlay HUD overlays} in the order that they render.
|
||||
*/
|
||||
* /
|
||||
@SuppressWarnings("resource")
|
||||
public enum VanillaGuiOverlay {
|
||||
VIGNETTE("vignette", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
|
||||
@@ -233,3 +234,4 @@ public enum VanillaGuiOverlay {
|
||||
return type;
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -155,7 +155,7 @@ public abstract class ScrollPanel extends AbstractContainerEventHandler implemen
|
||||
|
||||
if (this.client.level != null) {
|
||||
this.drawGradientRect(guiGraphics, this.left, this.top, this.right, this.bottom, bgColorFrom, bgColorTo);
|
||||
} else { // Draw dark dirt background
|
||||
} /* else { // Draw dark dirt background
|
||||
RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
|
||||
RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
|
||||
final float texScale = 32.0F;
|
||||
@@ -166,6 +166,7 @@ public abstract class ScrollPanel extends AbstractContainerEventHandler implemen
|
||||
worldr.vertex(this.left, this.top, 0.0D).uv(this.left / texScale, (this.top + (int)this.scrollDistance) / texScale).color(0x20, 0x20, 0x20, 0xFF).endVertex();
|
||||
tess.end();
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -39,7 +39,7 @@ public record ForgeFaceData(int color, int blockLight, int skyLight, boolean amb
|
||||
|
||||
public static final ForgeFaceData DEFAULT = new ForgeFaceData(0xFFFFFFFF, 0, 0, true, false);
|
||||
|
||||
public static final Codec<Integer> COLOR = ExtraCodecs.either(Codec.INT, Codec.STRING).xmap(
|
||||
public static final Codec<Integer> COLOR = Codec.either(Codec.INT, Codec.STRING).xmap(
|
||||
either -> either.map(Function.identity(), str -> (int) Long.parseLong(str, 16)),
|
||||
color -> Either.right(Integer.toHexString(color)));
|
||||
|
||||
@@ -65,6 +65,6 @@ public record ForgeFaceData(int color, int blockLight, int skyLight, boolean amb
|
||||
{
|
||||
return fallback;
|
||||
}
|
||||
return CODEC.parse(JsonOps.INSTANCE, obj).getOrThrow(false, JsonParseException::new);
|
||||
return CODEC.parse(JsonOps.INSTANCE, obj).getOrThrow(JsonParseException::new);
|
||||
}
|
||||
}
|
||||
@@ -23,43 +23,36 @@ import java.util.Map;
|
||||
/**
|
||||
* Wrapper around {@link ItemModelShaper} that cleans up the internal maps to respect ID remapping.
|
||||
*/
|
||||
public class ForgeItemModelShaper extends ItemModelShaper
|
||||
{
|
||||
public class ForgeItemModelShaper extends ItemModelShaper {
|
||||
private final Map<Holder.Reference<Item>, ModelResourceLocation> locations = Maps.newHashMap();
|
||||
private final Map<Holder.Reference<Item>, BakedModel> models = Maps.newHashMap();
|
||||
|
||||
public ForgeItemModelShaper(ModelManager manager)
|
||||
{
|
||||
public ForgeItemModelShaper(ModelManager manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public BakedModel getItemModel(Item item)
|
||||
{
|
||||
public BakedModel getItemModel(Item item) {
|
||||
return models.get(ForgeRegistries.ITEMS.getDelegateOrThrow(item));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(Item item, ModelResourceLocation location)
|
||||
{
|
||||
public void register(Item item, ModelResourceLocation location) {
|
||||
Holder.Reference<Item> key = ForgeRegistries.ITEMS.getDelegateOrThrow(item);
|
||||
locations.put(key, location);
|
||||
models.put(key, getModelManager().getModel(location));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void rebuildCache()
|
||||
{
|
||||
public void rebuildCache() {
|
||||
final ModelManager manager = this.getModelManager();
|
||||
for (Map.Entry<Holder.Reference<Item>, ModelResourceLocation> e : locations.entrySet())
|
||||
{
|
||||
for (Map.Entry<Holder.Reference<Item>, ModelResourceLocation> e : locations.entrySet()) {
|
||||
models.put(e.getKey(), manager.getModel(e.getValue()));
|
||||
}
|
||||
}
|
||||
|
||||
public ModelResourceLocation getLocation(@NotNull ItemStack stack)
|
||||
{
|
||||
public ModelResourceLocation getLocation(@NotNull ItemStack stack) {
|
||||
ModelResourceLocation location = locations.get(ForgeRegistries.ITEMS.getDelegateOrThrow(stack.getItem()));
|
||||
return location == null ? ModelBakery.MISSING_MODEL_LOCATION : location;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,9 @@ import java.util.List;
|
||||
/**
|
||||
* Convenience interface with default implementation of {@link IForgeBakedModel#getQuads(BlockState, Direction, RandomSource, ModelData, RenderType)}.
|
||||
*/
|
||||
public interface IDynamicBakedModel extends BakedModel
|
||||
{
|
||||
public interface IDynamicBakedModel extends BakedModel {
|
||||
@Override
|
||||
default @NotNull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand)
|
||||
{
|
||||
default @NotNull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand) {
|
||||
return getQuads(state, side, rand, ModelData.EMPTY, null);
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
|
||||
@Override
|
||||
public BakedModel build()
|
||||
{
|
||||
return builder.build(renderTypes);
|
||||
return builder.renderTypes(renderTypes).build();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -154,7 +154,9 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
|
||||
|
||||
for(Int2ObjectMap.Entry<ForgeFaceData> entry : this.faceData.int2ObjectEntrySet())
|
||||
{
|
||||
layerObj.add(String.valueOf(entry.getIntKey()), ForgeFaceData.CODEC.encodeStart(JsonOps.INSTANCE, entry.getValue()).getOrThrow(false, s -> {}));
|
||||
layerObj.add(String.valueOf(entry.getIntKey()), ForgeFaceData.CODEC.encodeStart(JsonOps.INSTANCE, entry.getValue()).getOrThrow(s -> {
|
||||
return new RuntimeException(); // Perhaps not the best way to deal with this? - MangoRage
|
||||
}));
|
||||
}
|
||||
|
||||
forgeData.add("layers", layerObj);
|
||||
|
||||
@@ -131,7 +131,7 @@ public abstract class QuadLighter
|
||||
}
|
||||
|
||||
var color = quad.isTinted() ? getColorFast(quad.getTintIndex()) : WHITE;
|
||||
consumer.putBulkData(pose, quad, brightness, color[0], color[1], color[2], lightmap, overlay, true);
|
||||
consumer.putBulkData(pose, quad, brightness, color[0], color[1], color[2], 1.0f, lightmap, overlay, true);
|
||||
}
|
||||
|
||||
private float[] getColorFast(int tintIndex)
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
package net.minecraftforge.client.model.obj;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import joptsimple.internal.Strings;
|
||||
import org.joml.Vector4f;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* An OBJ material library (MTL), composed of named {@link Material materials}.
|
||||
@@ -37,7 +37,7 @@ public class ObjMaterialLibrary
|
||||
{
|
||||
case "newmtl":
|
||||
{
|
||||
String name = Strings.join(Arrays.copyOfRange(line, 1, line.length), " ");
|
||||
String name = Arrays.asList(Arrays.copyOfRange(line, 1, line.length)).stream().collect(Collectors.joining(" "));
|
||||
currentMaterial = new Material(name);
|
||||
materials.put(name, currentMaterial);
|
||||
break;
|
||||
|
||||
@@ -9,7 +9,6 @@ import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.mojang.math.Transformation;
|
||||
import joptsimple.internal.Strings;
|
||||
import net.minecraft.client.renderer.LightTexture;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
@@ -145,7 +144,8 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
|
||||
|
||||
case "usemtl": // Sets the current material (starts new mesh)
|
||||
{
|
||||
String mat = Strings.join(Arrays.copyOfRange(line, 1, line.length), " ");
|
||||
|
||||
String mat = Arrays.asList(Arrays.copyOfRange(line, 1, line.length)).stream().collect(Collectors.joining(" "));
|
||||
ObjMaterialLibrary.Material newMat = mtllib.getMaterial(mat);
|
||||
if (!Objects.equals(newMat, currentMat))
|
||||
{
|
||||
@@ -201,7 +201,7 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
|
||||
{
|
||||
String vertexData = line[i + 1];
|
||||
String[] vertexParts = vertexData.split("/");
|
||||
int[] vertex = Arrays.stream(vertexParts).mapToInt(num -> Strings.isNullOrEmpty(num) ? 0 : Integer.parseInt(num)).toArray();
|
||||
int[] vertex = Arrays.stream(vertexParts).mapToInt(num -> num == null || num.isEmpty() ? 0 : Integer.parseInt(num)).toArray();
|
||||
if (vertex[0] < 0) vertex[0] = model.positions.size() + vertex[0];
|
||||
else vertex[0]--;
|
||||
if (vertex.length > 1)
|
||||
|
||||
@@ -60,7 +60,7 @@ public class CompositeRenderable implements IRenderable<CompositeRenderable.Tran
|
||||
if (matrix != null)
|
||||
{
|
||||
poseStack.pushPose();
|
||||
poseStack.mulPoseMatrix(matrix);
|
||||
poseStack.mulPose(matrix);
|
||||
}
|
||||
|
||||
for (var part : children)
|
||||
|
||||
@@ -23,32 +23,6 @@ public class KeyMappingLookup {
|
||||
map.put(modifier, new HashMap<>());
|
||||
}
|
||||
|
||||
/** Replaced by {@link #getAll(InputConstants.Key) getAll} */
|
||||
@Deprecated(forRemoval = true, since = "1.20.1")
|
||||
@Nullable
|
||||
public KeyMapping get(InputConstants.Key keyCode) {
|
||||
var activeModifier = KeyModifier.getActiveModifier();
|
||||
if (!activeModifier.matches(keyCode)) {
|
||||
var binding = get(keyCode, activeModifier);
|
||||
if (binding != null)
|
||||
return binding;
|
||||
}
|
||||
return get(keyCode, KeyModifier.NONE);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Deprecated(forRemoval = true, since = "1.20.1")
|
||||
private KeyMapping get(InputConstants.Key keyCode, KeyModifier keyModifier) {
|
||||
var bindings = map.get(keyModifier).get(keyCode);
|
||||
if (bindings != null) {
|
||||
for (var binding : bindings) {
|
||||
if (binding.isActiveAndMatches(keyCode))
|
||||
return binding;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all active keys associated with the given key code and the active
|
||||
* modifiers and conflict context.
|
||||
|
||||
Reference in new issue
Block a user