mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Added RegisterClientReloadListenersEvent which lets you register reload listeners with appropriate timing.
Added new entity rendering events. - EntityRenderersEvent.RegisterLayerDefinitions: Used to register layer definitions for entity models. - EntityRenderersEvent.RegisterRenderers: Used to register entity renderers. - EntityRenderersEvent.AddLayers: Called during resource reload after all renderers have been constructed and it's safe to add layers. Removed RenderingRegistry, which is now not necessary. Removed a few unused things. Fixes #7920
This commit is contained in:
1 parent
eeec737188
commit
6ddf56ef15
13 files changed
+405
-153
No files matched your search
@@ -58,6 +58,17 @@
|
||||
this.f_91064_ = new DebugRenderer(this);
|
||||
RenderSystem.m_69900_(this::m_91113_);
|
||||
if (this.f_91042_.f_83915_ == this.f_90990_.m_85441_() && this.f_91042_.f_83916_ == this.f_90990_.m_85442_()) {
|
||||
@@ -531,6 +_,10 @@
|
||||
TinyFileDialogs.tinyfd_messageBox("Minecraft", stringbuilder.toString(), "ok", "error", false);
|
||||
}
|
||||
|
||||
+ net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RegisterClientReloadListenersEvent(this.f_91036_));
|
||||
+ net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterLayerDefinitions());
|
||||
+ net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.RegisterRenderers());
|
||||
+
|
||||
this.f_90990_.m_85409_(this.f_91066_.f_92041_);
|
||||
this.f_90990_.m_85424_(this.f_91066_.f_92034_);
|
||||
this.f_90990_.m_85426_();
|
||||
@@ -546,13 +_,16 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
WoodType.m_61843_().forEach((p_171114_) -> {
|
||||
builder.put(ModelLayers.m_171291_(p_171114_), layerdefinition19);
|
||||
});
|
||||
+ net.minecraftforge.fmlclient.registry.RenderingRegistry.loadLayerDefinitions(builder);
|
||||
+ net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
|
||||
ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
|
||||
List<ModelLayerLocation> list = ModelLayers.m_171288_().filter((p_171117_) -> {
|
||||
return !immutablemap.containsKey(p_171117_);
|
||||
+11
-7
@@ -15,14 +15,18 @@
|
||||
p_114442_.m_85836_();
|
||||
double d3 = d0 + Mth.m_14139_((double)p_114445_, enderdragonpart.f_19790_, enderdragonpart.m_20185_());
|
||||
double d4 = d1 + Mth.m_14139_((double)p_114445_, enderdragonpart.f_19791_, enderdragonpart.m_20186_());
|
||||
@@ -322,6 +_,10 @@
|
||||
|
||||
public Quaternion m_114470_() {
|
||||
@@ -324,9 +_,14 @@
|
||||
return this.f_114367_;
|
||||
+ }
|
||||
+
|
||||
+ public Map<String, EntityRenderer<? extends Player>> getSkinMap() {
|
||||
+ return java.util.Collections.unmodifiableMap(f_114363_);
|
||||
}
|
||||
|
||||
+ public Map<String, EntityRenderer<? extends Player>> getSkinMap() {
|
||||
+ return java.util.Collections.unmodifiableMap(f_114363_);
|
||||
+ }
|
||||
+
|
||||
public void m_6213_(ResourceManager p_174004_) {
|
||||
EntityRendererProvider.Context entityrendererprovider$context = new EntityRendererProvider.Context(this, this.f_173995_, p_174004_, this.f_173996_, this.f_114365_);
|
||||
this.f_114362_ = EntityRenderers.m_174049_(entityrendererprovider$context);
|
||||
this.f_114363_ = EntityRenderers.m_174051_(entityrendererprovider$context);
|
||||
+ net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.EntityRenderersEvent.AddLayers(f_114362_, f_114363_));
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,12 @@
|
||||
package net.minecraftforge.client;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import net.minecraft.client.model.geom.ModelLayerLocation;
|
||||
import net.minecraft.client.model.geom.builders.LayerDefinition;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import com.mojang.blaze3d.platform.Window;
|
||||
@@ -112,11 +116,13 @@ import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.nio.Buffer;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.BOSSINFO;
|
||||
@@ -840,4 +846,17 @@ public class ForgeHooksClient
|
||||
ForgeTextureMetadata metadata = ForgeTextureMetadata.forResource(resource);
|
||||
return metadata.getLoader() == null ? null : metadata.getLoader().load(textureAtlas, resourceManager, textureInfo, resource, atlasWidth, atlasHeight, spriteX, spriteY, mipmapLevel, image);
|
||||
}
|
||||
|
||||
|
||||
private static final Map<ModelLayerLocation, Supplier<LayerDefinition>> layerDefinitions = new HashMap<>();
|
||||
|
||||
public static void registerLayerDefinition(ModelLayerLocation layerLocation, Supplier<LayerDefinition> supplier)
|
||||
{
|
||||
layerDefinitions.put(layerLocation, supplier);
|
||||
}
|
||||
|
||||
public static void loadLayerDefinitions(ImmutableMap.Builder<ModelLayerLocation, LayerDefinition> builder) {
|
||||
layerDefinitions.forEach((k, v) -> builder.put(k, v.get()));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.EntityModel;
|
||||
import net.minecraft.client.model.geom.EntityModelSet;
|
||||
import net.minecraft.client.model.geom.ModelLayerLocation;
|
||||
import net.minecraft.client.model.geom.builders.LayerDefinition;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderers;
|
||||
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.event.IModBusEvent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class EntityRenderersEvent extends Event implements IModBusEvent
|
||||
{
|
||||
public static class RegisterLayerDefinitions extends EntityRenderersEvent
|
||||
{
|
||||
/**
|
||||
* Registers a layer definition supplier with the given {@link ModelLayerLocation}.
|
||||
* These will be inserted into the main layer definition map for entity model layers at the appropriate time.
|
||||
*
|
||||
* @param layerLocation The model layer location, which should be used in conjunction with {@link EntityRendererProvider.Context#bakeLayer(ModelLayerLocation)}
|
||||
* @param supplier A supplier to create a {@link LayerDefinition}, generally a static method reference in the entity model class
|
||||
*/
|
||||
public void registerLayerDefinition(ModelLayerLocation layerLocation, Supplier<LayerDefinition> supplier)
|
||||
{
|
||||
ForgeHooksClient.registerLayerDefinition(layerLocation, supplier);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides a safe place to register entity renderers and layer renderers.
|
||||
*/
|
||||
public static class RegisterRenderers extends EntityRenderersEvent
|
||||
{
|
||||
/**
|
||||
* Registers an entity renderer.
|
||||
*
|
||||
* @param entityType The EntityType to register a renderer for
|
||||
* @param entityRendererProvider The renderer provider, can be a lambda like MyRenderer::new
|
||||
*/
|
||||
public <T extends Entity> void registerEntityRenderer(EntityType<? extends T> entityType, EntityRendererProvider<T> entityRendererProvider)
|
||||
{
|
||||
EntityRenderers.register(entityType, entityRendererProvider);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides a safe place to register entity renderer layers.
|
||||
*/
|
||||
public static class AddLayers extends EntityRenderersEvent
|
||||
{
|
||||
private final Map<EntityType<?>, EntityRenderer<?>> renderers;
|
||||
private final Map<String, EntityRenderer<? extends Player>> skinMap;
|
||||
private final EntityModelSet entityModels = Minecraft.getInstance().getEntityModels();
|
||||
|
||||
public AddLayers(Map<EntityType<?>, EntityRenderer<?>> renderers, Map<String, EntityRenderer<? extends Player>> playerRenderers)
|
||||
{
|
||||
this.renderers = renderers;
|
||||
this.skinMap = playerRenderers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the list of skins.
|
||||
*/
|
||||
public Set<String> getSkins()
|
||||
{
|
||||
return skinMap.keySet();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a player skin renderer. Vanilla skins are "default" and "slim".
|
||||
* @param skinName The name of the skin renderer to return
|
||||
* @param <R> The type of the skin renderer, usually PlayerRenderer
|
||||
* @return The skin renderer, or null if not found
|
||||
*/
|
||||
@Nullable
|
||||
@SuppressWarnings("unchecked")
|
||||
public <R extends LivingEntityRenderer<? extends Player, ? extends EntityModel<? extends Player>>> R getSkin(String skinName)
|
||||
{
|
||||
return (R) skinMap.get(skinName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an entity renderer for the given entity type.
|
||||
* @param entityType The entity to return a renderer for
|
||||
* @param <T> The type of entity the renderer is for
|
||||
* @param <R> The renderer type
|
||||
* @return The renderer
|
||||
*/
|
||||
@Nullable
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T extends LivingEntity, R extends LivingEntityRenderer<T, ? extends EntityModel<T>>> R getRenderer(EntityType<? extends T> entityType) {
|
||||
return (R) renderers.get(entityType);
|
||||
}
|
||||
|
||||
public EntityModelSet getEntityModels()
|
||||
{
|
||||
return entityModels;
|
||||
}
|
||||
}
|
||||
}
|
||||
+17
-6
@@ -17,13 +17,24 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.fmlclient.registry;
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.server.packs.resources.PreparableReloadListener;
|
||||
import net.minecraft.server.packs.resources.ReloadableResourceManager;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.event.IModBusEvent;
|
||||
|
||||
public interface IRenderFactory<T extends Entity>
|
||||
public class RegisterClientReloadListenersEvent extends Event implements IModBusEvent
|
||||
{
|
||||
EntityRenderer<? super T> createRenderFor(EntityRenderDispatcher manager);
|
||||
private final ReloadableResourceManager resourceManager;
|
||||
|
||||
public RegisterClientReloadListenersEvent(ReloadableResourceManager resourceManager)
|
||||
{
|
||||
this.resourceManager = resourceManager;
|
||||
}
|
||||
|
||||
public void registerReloadListener(PreparableReloadListener reloadListener)
|
||||
{
|
||||
resourceManager.registerReloadListener(reloadListener);
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,6 @@ import net.minecraft.server.packs.repository.Pack;
|
||||
import net.minecraft.server.packs.repository.PackRepository;
|
||||
import net.minecraft.world.level.DataPackConfig;
|
||||
import net.minecraftforge.fml.*;
|
||||
import net.minecraftforge.fmlclient.registry.RenderingRegistry;
|
||||
import net.minecraftforge.fmllegacy.BrandingControl;
|
||||
import net.minecraftforge.fmllegacy.CrashReportExtender;
|
||||
import net.minecraftforge.fmllegacy.LogicalSidedProvider;
|
||||
@@ -137,15 +136,6 @@ public class ClientModLoader
|
||||
createRunnableWithCatch(() -> ModLoader.get().loadMods(syncExecutor, parallelExecutor, new SpacedRunnable(earlyLoaderGUI::renderTick))).run();
|
||||
}
|
||||
|
||||
private static void postSidedRunnable() {
|
||||
LOGGER.debug(LOADING, "Running post client event work");
|
||||
RenderingRegistry.loadEntityRenderers();
|
||||
}
|
||||
|
||||
private static void preSidedRunnable() {
|
||||
LOGGER.debug(LOADING, "Running pre client event work");
|
||||
}
|
||||
|
||||
private static void finishModLoading(ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor)
|
||||
{
|
||||
createRunnableWithCatch(() -> ModLoader.get().finishMods(syncExecutor, parallelExecutor, new SpacedRunnable(earlyLoaderGUI::renderTick))).run();
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.fmlclient.registry;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import net.minecraft.client.model.geom.ModelLayerLocation;
|
||||
import net.minecraft.client.model.geom.builders.LayerDefinition;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderers;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
|
||||
public class RenderingRegistry
|
||||
{
|
||||
private static final RenderingRegistry INSTANCE = new RenderingRegistry();
|
||||
|
||||
private final Map<EntityType<? extends Entity>, EntityRendererProvider<? extends Entity>> entityRenderers = new ConcurrentHashMap<>();
|
||||
private final Map<ModelLayerLocation, Supplier<LayerDefinition>> layerDefinitions = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* Register an entity rendering handler. This will, after mod initialization, be inserted into the main
|
||||
* render map for entities.
|
||||
* Call this during {@link net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent}.
|
||||
* This method is safe to call during parallel mod loading.
|
||||
*/
|
||||
public static <T extends Entity> void registerEntityRenderingHandler(EntityType<T> entityClass, EntityRendererProvider<? super T> renderProvider)
|
||||
{
|
||||
INSTANCE.entityRenderers.put(entityClass, renderProvider);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a layer definition supplier with the given {@link ModelLayerLocation}. This will, after mod
|
||||
* initialization, be inserted into the main layer definition map for entity model layers.
|
||||
* <p>
|
||||
* Call this during {@link net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent}.
|
||||
* This method is safe to call during parallel mod loading.
|
||||
* @param layerLocation The model layer location, which should be used in conjunction with {@link EntityRendererProvider.Context#bakeLayer(ModelLayerLocation)}
|
||||
* @param supplier A supplier to create a {@link LayerDefinition}, generally a static method reference in the entity model class
|
||||
*/
|
||||
public static void registerLayerDefinition(ModelLayerLocation layerLocation, Supplier<LayerDefinition> supplier)
|
||||
{
|
||||
INSTANCE.layerDefinitions.put(layerLocation, supplier);
|
||||
}
|
||||
|
||||
public static void loadEntityRenderers()
|
||||
{
|
||||
INSTANCE.entityRenderers.forEach(RenderingRegistry::register);
|
||||
EntityRenderers.validateRegistrations();
|
||||
}
|
||||
|
||||
public static void loadLayerDefinitions(ImmutableMap.Builder<ModelLayerLocation, LayerDefinition> builder) {
|
||||
INSTANCE.layerDefinitions.forEach((k, v) -> builder.put(k, v.get()));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static <T extends Entity> void register(EntityType<T> entityType, EntityRendererProvider<?> renderProvider)
|
||||
{
|
||||
EntityRenderers.register(entityType, ((EntityRendererProvider<T>)renderProvider));
|
||||
}
|
||||
|
||||
private static ModelLayerLocation registerModelLayer(ResourceLocation model, String layer)
|
||||
{
|
||||
return new ModelLayerLocation(model, layer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a model layer location for the main layer definition of an entity.
|
||||
*
|
||||
* @param model The model {@link ResourceLocation}
|
||||
* @return A main model layer location
|
||||
*/
|
||||
public static ModelLayerLocation registerMainModelLayer(ResourceLocation model)
|
||||
{
|
||||
return registerModelLayer(model, "main");
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a model layer location for the inner armor layer definition of an entity.
|
||||
*
|
||||
* @param model The model {@link ResourceLocation}
|
||||
* @return An inner armor model layer location
|
||||
*/
|
||||
public static ModelLayerLocation registerInnerArmorModelLayer(ResourceLocation model)
|
||||
{
|
||||
return registerModelLayer(model, "inner_armor");
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a model layer location for the outer armor layer definition of an entity.
|
||||
*
|
||||
* @param model The model {@link ResourceLocation}
|
||||
* @return An outer armor model layer location
|
||||
*/
|
||||
public static ModelLayerLocation registerOuterArmorModelLayer(ResourceLocation model)
|
||||
{
|
||||
return registerModelLayer(model, "outer_armor");
|
||||
}
|
||||
}
|
||||
@@ -72,9 +72,6 @@ public net.minecraft.client.particle.ParticleEngine m_107381_(Lnet/minecraft/cor
|
||||
public net.minecraft.client.particle.ParticleEngine$SpriteParticleRegistration
|
||||
public net.minecraft.client.renderer.GameRenderer m_109128_(Lnet/minecraft/resources/ResourceLocation;)V # loadEffect
|
||||
protected-f net.minecraft.client.renderer.RenderStateShard f_110131_ # setupState
|
||||
public net.minecraft.client.renderer.RenderStateShard$TextureStateShard
|
||||
protected-f net.minecraft.client.renderer.RenderStateShard$TextureStateShard f_110329_ # blur
|
||||
protected-f net.minecraft.client.renderer.RenderStateShard$TextureStateShard f_110330_ # mipmap
|
||||
public net.minecraft.client.renderer.RenderStateShard$BooleanStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$CullStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$DepthTestStateShard
|
||||
@@ -86,8 +83,11 @@ public net.minecraft.client.renderer.RenderStateShard$OffsetTexturingStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$OutputStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$OverlayStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$ShaderStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$TextureStateShard
|
||||
protected-f net.minecraft.client.renderer.RenderStateShard$TextureStateShard f_110329_ # blur
|
||||
protected-f net.minecraft.client.renderer.RenderStateShard$TextureStateShard f_110330_ # mipmap
|
||||
public net.minecraft.client.renderer.RenderStateShard$TexturingStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$TransparencyStateShard
|
||||
public net.minecraft.client.renderer.RenderStateShard$WriteMaskStateShard
|
||||
public net.minecraft.client.renderer.RenderType m_173215_(Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;IZZLnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; # create
|
||||
public net.minecraft.client.renderer.RenderType$CompositeState
|
||||
@@ -412,4 +412,4 @@ public net.minecraft.world.level.newbiome.layer.Layers m_76729_(JLnet/minecraft/
|
||||
protected net.minecraft.world.level.portal.PortalForcer f_77648_ # level
|
||||
public net.minecraft.world.level.storage.LevelResource <init>(Ljava/lang/String;)V # constructor
|
||||
private-f net.minecraft.world.level.storage.loot.LootPool f_79028_ # rolls
|
||||
private-f net.minecraft.world.level.storage.loot.LootPool f_79029_ # bonusRolls
|
||||
private-f net.minecraft.world.level.storage.loot.LootPool f_79029_ # bonusRolls
|
||||
@@ -75,10 +75,6 @@ net/minecraft/world/item/crafting/Recipe m_6076_()Ljava/lang/String; # getGroup
|
||||
net/minecraft/world/item/crafting/ShapedRecipe m_6076_()Ljava/lang/String;
|
||||
net/minecraft/world/item/crafting/ShapelessRecipe m_6076_()Ljava/lang/String;
|
||||
net/minecraft/world/item/crafting/SingleItemRecipe m_6076_()Ljava/lang/String;
|
||||
net/minecraft/network/PacketBuffer m_130105_([J)[J
|
||||
net/minecraft/network/PacketBuffer m_130093_([JI)[J
|
||||
net/minecraft/network/PacketBuffer m_130277_()Ljava/lang/String;
|
||||
net/minecraft/network/PacketBuffer m_130157_()Lnet/minecraft/util/math/SectionPos;
|
||||
net/minecraft/nbt/NbtIo m_128953_(Ljava/io/File;)Lnet/minecraft/nbt/CompoundTag; # read
|
||||
net/minecraft/nbt/NbtIo m_128955_(Lnet/minecraft/nbt/CompoundTag;Ljava/io/File;)V # write
|
||||
net/minecraft/network/protocol/game/ClientboundCommandsPacket m_131884_()Lcom/mojang/brigadier/tree/RootCommandNode; # getRoot
|
||||
|
||||
+205
@@ -0,0 +1,205 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.client.rendering;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import net.minecraft.client.model.EntityModel;
|
||||
import net.minecraft.client.model.geom.ModelLayerLocation;
|
||||
import net.minecraft.client.model.geom.ModelPart;
|
||||
import net.minecraft.client.model.geom.PartPose;
|
||||
import net.minecraft.client.model.geom.builders.*;
|
||||
import net.minecraft.client.renderer.MultiBufferSource;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.layers.RenderLayer;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.*;
|
||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.world.entity.monster.Monster;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.EntityRenderersEvent;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
@Mod("entity_renderer_events_test")
|
||||
@Mod.EventBusSubscriber(value= Dist.CLIENT, bus= Mod.EventBusSubscriber.Bus.MOD)
|
||||
public class EntityRendererEventsTest
|
||||
{
|
||||
private static final ResourceLocation MY_ENTITY = new ResourceLocation("entity_renderer_events_test", "test_entity");
|
||||
private static final ModelLayerLocation MAIN_LAYER = new ModelLayerLocation(MY_ENTITY, "main");
|
||||
private static final ModelLayerLocation OUTER_LAYER = new ModelLayerLocation(MY_ENTITY, "main");
|
||||
private static final ModelLayerLocation ADDED_LAYER = new ModelLayerLocation(MY_ENTITY, "added");
|
||||
|
||||
@ObjectHolder("entity_renderer_events_test:test_entity")
|
||||
public static EntityType<MyEntity> MY_ENTITY_TYPE;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void entityRegistry(RegistryEvent.Register<EntityType<?>> event)
|
||||
{
|
||||
event.getRegistry().register(EntityType.Builder.of(MyEntity::new, MobCategory.MONSTER).build("test_entity").setRegistryName("test_entity"));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void entityRegistry(EntityAttributeCreationEvent event)
|
||||
{
|
||||
event.put(MY_ENTITY_TYPE, Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 1.0D).build());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void layerDefinitions(EntityRenderersEvent.RegisterLayerDefinitions event)
|
||||
{
|
||||
event.registerLayerDefinition(MAIN_LAYER, MyEntityModel::createMainLayer);
|
||||
event.registerLayerDefinition(OUTER_LAYER, () -> MyEntityModel.createLayer(new CubeDeformation(1.0f)));
|
||||
event.registerLayerDefinition(ADDED_LAYER, () -> MyEntityModel.createLayer(new CubeDeformation(2.0f)));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void entityRenderers(EntityRenderersEvent.RegisterRenderers event)
|
||||
{
|
||||
event.registerEntityRenderer(MY_ENTITY_TYPE, MyEntityRenderer::new);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void entityLayers(EntityRenderersEvent.AddLayers event)
|
||||
{
|
||||
MyEntityRenderer renderer = event.getRenderer(MY_ENTITY_TYPE);
|
||||
renderer.addLayer(new MyEntityLayer(renderer, new MyEntityModel(event.getEntityModels().bakeLayer(ADDED_LAYER)), 0.5f));
|
||||
}
|
||||
|
||||
private static class MyEntityModel extends EntityModel<MyEntity>
|
||||
{
|
||||
public static final String BODY = "body";
|
||||
public static final String HEAD = "head";
|
||||
|
||||
public static LayerDefinition createMainLayer()
|
||||
{
|
||||
return createLayer(CubeDeformation.NONE);
|
||||
}
|
||||
|
||||
public static LayerDefinition createLayer(CubeDeformation deformation)
|
||||
{
|
||||
MeshDefinition definition = new MeshDefinition();
|
||||
PartDefinition root = definition.getRoot();
|
||||
root.addOrReplaceChild(BODY, CubeListBuilder.create().addBox(-4,0,-4,4,10,4, deformation), PartPose.ZERO);
|
||||
root.addOrReplaceChild(HEAD, CubeListBuilder.create().addBox(-2,10,-2,2,4,2, deformation), PartPose.ZERO);
|
||||
return LayerDefinition.create(definition, 64, 32);
|
||||
}
|
||||
|
||||
private final ModelPart headRenderer;
|
||||
private final ModelPart bodyRenderer;
|
||||
|
||||
public MyEntityModel(ModelPart modelPart)
|
||||
{
|
||||
this.headRenderer = modelPart.getChild(HEAD);
|
||||
this.bodyRenderer = modelPart.getChild(BODY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setupAnim(MyEntity p_102618_, float p_102619_, float p_102620_, float p_102621_, float p_102622_, float p_102623_)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha)
|
||||
{
|
||||
headRenderer.render(poseStack, vertexConsumer, packedLightIn, packedOverlayIn, red, green, blue, alpha);
|
||||
bodyRenderer.render(poseStack, vertexConsumer, packedLightIn, packedOverlayIn, red, green, blue, alpha);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MyEntityRenderer extends LivingEntityRenderer<MyEntity, MyEntityModel>
|
||||
{
|
||||
private static final ResourceLocation TEXTURE = new ResourceLocation("entity_renderer_events_test:textures/entity/test_entity.png");
|
||||
|
||||
public MyEntityRenderer(EntityRendererProvider.Context context)
|
||||
{
|
||||
super(context, new MyEntityModel(context.bakeLayer(MAIN_LAYER)), 1.0f);
|
||||
addLayer(new MyEntityLayer(this, new MyEntityModel(context.bakeLayer(OUTER_LAYER)), 0.1f));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureLocation(MyEntity p_114482_)
|
||||
{
|
||||
return TEXTURE;
|
||||
}
|
||||
}
|
||||
|
||||
private static class MyEntityLayer extends RenderLayer<MyEntity, MyEntityModel>
|
||||
{
|
||||
private final MyEntityModel model;
|
||||
private final float r;
|
||||
|
||||
public MyEntityLayer(MyEntityRenderer renderer, MyEntityModel model, float r)
|
||||
{
|
||||
super(renderer);
|
||||
this.model = model;
|
||||
this.r = r;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(PoseStack poseStack, MultiBufferSource bufferSource, int lightness, MyEntity entity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch)
|
||||
{
|
||||
VertexConsumer vertexConsumer = bufferSource.getBuffer(this.getParentModel().renderType(this.getTextureLocation(entity)));
|
||||
model.renderToBuffer(poseStack, vertexConsumer, lightness, OverlayTexture.NO_OVERLAY, r, 1.0f, 1.0f, 1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MyEntity extends LivingEntity
|
||||
{
|
||||
protected MyEntity(EntityType<? extends LivingEntity> p_20966_, Level p_20967_)
|
||||
{
|
||||
super(p_20966_, p_20967_);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<ItemStack> getArmorSlots()
|
||||
{
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItemBySlot(EquipmentSlot p_21127_)
|
||||
{
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setItemSlot(EquipmentSlot p_21036_, ItemStack p_21037_)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public HumanoidArm getMainArm()
|
||||
{
|
||||
return HumanoidArm.LEFT;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -140,3 +140,7 @@ license="LGPL v2.1"
|
||||
modId="player_attack_knockback_test"
|
||||
[[mods]]
|
||||
modId="overlay_layers_test"
|
||||
[[mods]]
|
||||
modId="entity_renderer_events_test"
|
||||
|
||||
# ADD ABOVE THIS LINE
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 915 B |
Reference in new issue
Block a user