Some patch cleanup (#9951)

This commit is contained in:
Paint_Ninja authored and GitHub committed 2024-05-09 18:07:41 +01:00
1 parent 0cad6b14d9
commit 58012bfb17
18 files changed
+233 -113

No files matched your search

@@ -14,7 +14,7 @@ import net.minecraft.client.renderer.RenderType;
* be the same as {@code entity}.
*/
public record RenderTypeGroup(RenderType block, RenderType entity, RenderType entityFabulous) {
public static RenderTypeGroup EMPTY = new RenderTypeGroup(null, null, null);
public static final RenderTypeGroup EMPTY = new RenderTypeGroup(null, null, null);
public RenderTypeGroup {
if ((block == null) != (entity == null) || (block == null) != (entityFabulous == null))
@@ -10,6 +10,11 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.event.IModBusEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import com.mojang.blaze3d.audio.Channel;
@@ -50,31 +55,46 @@ 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;
@ApiStatus.Internal
public final class ForgeEventFactoryClient {
private static final ModLoader ML = ModLoader.get();
private ForgeEventFactoryClient() {}
/**
* Post an event to the {@link MinecraftForge#EVENT_BUS}
* @return true if the event is {@link Cancelable} and has been canceled
*/
private static boolean post(Event e) {
return MinecraftForge.EVENT_BUS.post(e);
}
/**
* Post an event to the {@link MinecraftForge#EVENT_BUS}, then return the event object
* @return the event object passed in and possibly modified by listeners
*/
private static <E extends Event> E fire(E e) {
MinecraftForge.EVENT_BUS.post(e);
post(e);
return e;
}
/**
* Post an event to the {@link ModLoader#get()} event bus
*/
private static <T extends Event & IModBusEvent> void postModBus(T e) {
ML.postEvent(e);
}
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));
postModBus(new EntityRenderersEvent.AddLayers(renderers, playerRenderers, context));
}
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));
// TODO: Why is this a ModLoader event...
postModBus(new RegisterShadersEvent(resourceProvider, shaderList));
}
public static void onScreenMouseReleased(boolean[] state, Screen screen, double mouseX, double mouseY, int button) {
@@ -0,0 +1,38 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.client.extensions;
import net.minecraft.client.renderer.entity.layers.ElytraLayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
public interface IForgeElytraLayer<T> {
/**
* Determines if the ElytraLayer should render.
* ItemStack and Entity are provided for modder convenience,
* For example, using the same ElytraLayer for multiple custom Elytra.
*
* @param stack The Elytra ItemStack
* @param entity The entity being rendered.
* @return If the ElytraLayer should render.
*/
default boolean shouldRender(ItemStack stack, T entity) {
return stack.getItem() == Items.ELYTRA;
}
/**
* Gets the texture to use with this ElytraLayer.
* This assumes the vanilla Elytra model.
*
* @param stack The Elytra ItemStack.
* @param entity The entity being rendered.
* @return The texture.
*/
default ResourceLocation getElytraTexture(ItemStack stack, T entity) {
return ElytraLayer.WINGS_LOCATION;
}
}
@@ -0,0 +1,38 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.client.extensions;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
/**
* Extension interface for {@link VertexFormat}.
*/
public interface IForgeVertexFormat {
ImmutableList<VertexFormatElement> getElements();
default boolean hasPosition() {
return getElements().stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.POSITION);
}
default boolean hasNormal() {
return getElements().stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.NORMAL);
}
default boolean hasColor() {
return getElements().stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.COLOR);
}
default boolean hasUV(int which) {
for (var e : getElements()) {
if (e.getUsage() == VertexFormatElement.Usage.UV && e.getIndex() == which) {
return true;
}
}
return false;
}
}