mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
255 lines
16 KiB
Diff
255 lines
16 KiB
Diff
--- a/net/minecraft/client/renderer/LevelRenderer.java
|
|
+++ b/net/minecraft/client/renderer/LevelRenderer.java
|
|
@@ -265,6 +_,8 @@
|
|
}
|
|
|
|
private void m_109703_(LightTexture p_109704_, float p_109705_, double p_109706_, double p_109707_, double p_109708_) {
|
|
+ if (f_109465_.m_104583_().renderSnowAndRain(f_109465_, f_109477_, p_109705_, p_109704_, p_109706_, p_109707_, p_109708_))
|
|
+ return;
|
|
float f = this.f_109461_.f_91073_.m_46722_(p_109705_);
|
|
if (!(f <= 0.0F)) {
|
|
p_109704_.m_109896_();
|
|
@@ -384,6 +_,8 @@
|
|
}
|
|
|
|
public void m_109693_(Camera p_109694_) {
|
|
+ if (f_109465_.m_104583_().tickRain(f_109465_, f_109477_, p_109694_))
|
|
+ return;
|
|
float f = this.f_109461_.f_91073_.m_46722_(1.0F) / (Minecraft.m_91405_() ? 1.0F : 2.0F);
|
|
if (!(f <= 0.0F)) {
|
|
RandomSource randomsource = RandomSource.m_216335_((long)this.f_109477_ * 312987231L);
|
|
@@ -1144,11 +_,13 @@
|
|
RenderSystem.m_69421_(16640, Minecraft.f_91002_);
|
|
float f = p_109605_.m_109152_();
|
|
boolean flag2 = this.f_109461_.f_91073_.m_104583_().m_5781_(Mth.m_14107_(d0), Mth.m_14107_(d1)) || this.f_109461_.f_91065_.m_93090_().m_93715_();
|
|
+ FogRenderer.m_234172_(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2, p_109601_);
|
|
profilerfiller.m_6182_("sky");
|
|
RenderSystem.m_157427_(GameRenderer::m_172808_);
|
|
this.m_202423_(p_109600_, p_254120_, p_109601_, p_109604_, flag2, () -> {
|
|
FogRenderer.m_234172_(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2, p_109601_);
|
|
});
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_SKY, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
profilerfiller.m_6182_("fog");
|
|
FogRenderer.m_234172_(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f, 32.0F), flag2, p_109601_);
|
|
profilerfiller.m_6182_("terrain_setup");
|
|
@@ -1157,7 +_,9 @@
|
|
this.m_194370_(p_109604_);
|
|
profilerfiller.m_6182_("terrain");
|
|
this.m_172993_(RenderType.m_110451_(), p_109600_, d0, d1, d2, p_254120_);
|
|
+ this.f_109461_.m_91304_().m_119428_(TextureAtlas.f_118259_).setBlurMipmap(false, this.f_109461_.f_91066_.m_232119_().m_231551_() > 0); // FORGE: fix flickering leaves when mods mess up the blurMipmap settings
|
|
this.m_172993_(RenderType.m_110457_(), p_109600_, d0, d1, d2, p_254120_);
|
|
+ this.f_109461_.m_91304_().m_119428_(TextureAtlas.f_118259_).restoreLastBlurMipmap();
|
|
this.m_172993_(RenderType.m_110463_(), p_109600_, d0, d1, d2, p_254120_);
|
|
if (this.f_109465_.m_104583_().m_108885_()) {
|
|
Lighting.m_252995_(p_109600_.m_85850_().m_252922_());
|
|
@@ -1189,7 +_,7 @@
|
|
for(Entity entity : this.f_109465_.m_104735_()) {
|
|
if (this.f_109463_.m_114397_(entity, frustum, d0, d1, d2) || entity.m_20367_(this.f_109461_.f_91074_)) {
|
|
BlockPos blockpos = entity.m_20183_();
|
|
- if ((this.f_109465_.m_151562_(blockpos.m_123342_()) || this.m_202430_(blockpos)) && (entity != p_109604_.m_90592_() || p_109604_.m_90594_() || p_109604_.m_90592_() instanceof LivingEntity && ((LivingEntity)p_109604_.m_90592_()).m_5803_()) && (!(entity instanceof LocalPlayer) || p_109604_.m_90592_() == entity)) {
|
|
+ if ((this.f_109465_.m_151562_(blockpos.m_123342_()) || this.m_202430_(blockpos)) && (entity != p_109604_.m_90592_() || p_109604_.m_90594_() || p_109604_.m_90592_() instanceof LivingEntity && ((LivingEntity)p_109604_.m_90592_()).m_5803_()) && (!(entity instanceof LocalPlayer) || p_109604_.m_90592_() == entity || (entity == f_109461_.f_91074_ && !f_109461_.f_91074_.m_5833_()))) { //FORGE: render local player entity when it is not the renderViewEntity
|
|
++this.f_109439_;
|
|
if (entity.f_19797_ == 0) {
|
|
entity.f_19790_ = entity.m_20185_();
|
|
@@ -1205,6 +_,9 @@
|
|
int i = entity.m_19876_();
|
|
outlinebuffersource.m_109929_(FastColor.ARGB32.m_13665_(i), FastColor.ARGB32.m_13667_(i), FastColor.ARGB32.m_13669_(i), 255);
|
|
} else {
|
|
+ if (this.m_109817_() && entity.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
|
|
+ flag3 = true;
|
|
+ }
|
|
multibuffersource = multibuffersource$buffersource;
|
|
}
|
|
|
|
@@ -1219,12 +_,14 @@
|
|
multibuffersource$buffersource.m_109912_(RenderType.m_110452_(TextureAtlas.f_118259_));
|
|
multibuffersource$buffersource.m_109912_(RenderType.m_110458_(TextureAtlas.f_118259_));
|
|
multibuffersource$buffersource.m_109912_(RenderType.m_110476_(TextureAtlas.f_118259_));
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_ENTITIES, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
profilerfiller.m_6182_("blockentities");
|
|
|
|
for(LevelRenderer.RenderChunkInfo levelrenderer$renderchunkinfo : this.f_194297_) {
|
|
List<BlockEntity> list = levelrenderer$renderchunkinfo.f_109839_.m_112835_().m_112773_();
|
|
if (!list.isEmpty()) {
|
|
for(BlockEntity blockentity1 : list) {
|
|
+ if(!frustum.m_113029_(blockentity1.getRenderBoundingBox())) continue;
|
|
BlockPos blockpos4 = blockentity1.m_58899_();
|
|
MultiBufferSource multibuffersource1 = multibuffersource$buffersource;
|
|
p_109600_.m_85836_();
|
|
@@ -1241,6 +_,9 @@
|
|
};
|
|
}
|
|
}
|
|
+ if (this.m_109817_() && blockentity1.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
|
|
+ flag3 = true;
|
|
+ }
|
|
|
|
this.f_172946_.m_112267_(blockentity1, p_109601_, p_109600_, multibuffersource1);
|
|
p_109600_.m_85849_();
|
|
@@ -1250,9 +_,13 @@
|
|
|
|
synchronized(this.f_109468_) {
|
|
for(BlockEntity blockentity : this.f_109468_) {
|
|
+ if(!frustum.m_113029_(blockentity.getRenderBoundingBox())) continue;
|
|
BlockPos blockpos3 = blockentity.m_58899_();
|
|
p_109600_.m_85836_();
|
|
p_109600_.m_85837_((double)blockpos3.m_123341_() - d0, (double)blockpos3.m_123342_() - d1, (double)blockpos3.m_123343_() - d2);
|
|
+ if (this.m_109817_() && blockentity.hasCustomOutlineRendering(this.f_109461_.f_91074_)) { // FORGE: allow custom outline rendering
|
|
+ flag3 = true;
|
|
+ }
|
|
this.f_172946_.m_112267_(blockentity, p_109601_, p_109600_, multibuffersource$buffersource);
|
|
p_109600_.m_85849_();
|
|
}
|
|
@@ -1275,6 +_,7 @@
|
|
this.f_109461_.m_91385_().m_83947_(false);
|
|
}
|
|
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_BLOCK_ENTITIES, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
profilerfiller.m_6182_("destroyProgress");
|
|
|
|
for(Long2ObjectMap.Entry<SortedSet<BlockDestructionProgress>> entry : this.f_109409_.long2ObjectEntrySet()) {
|
|
@@ -1290,7 +_,8 @@
|
|
p_109600_.m_85837_((double)blockpos2.m_123341_() - d0, (double)blockpos2.m_123342_() - d1, (double)blockpos2.m_123343_() - d2);
|
|
PoseStack.Pose posestack$pose1 = p_109600_.m_85850_();
|
|
VertexConsumer vertexconsumer1 = new SheetedDecalTextureGenerator(this.f_109464_.m_110108_().m_6299_(ModelBakery.f_119229_.get(k)), posestack$pose1.m_252922_(), posestack$pose1.m_252943_(), 1.0F);
|
|
- this.f_109461_.m_91289_().m_110918_(this.f_109465_.m_8055_(blockpos2), blockpos2, this.f_109465_, p_109600_, vertexconsumer1);
|
|
+ net.minecraftforge.client.model.data.ModelData modelData = f_109465_.getModelDataManager().getAt(blockpos2);
|
|
+ this.f_109461_.m_91289_().renderBreakingTexture(this.f_109465_.m_8055_(blockpos2), blockpos2, this.f_109465_, p_109600_, vertexconsumer1, modelData == null ? net.minecraftforge.client.model.data.ModelData.EMPTY : modelData);
|
|
p_109600_.m_85849_();
|
|
}
|
|
}
|
|
@@ -1302,10 +_,13 @@
|
|
profilerfiller.m_6182_("outline");
|
|
BlockPos blockpos1 = ((BlockHitResult)hitresult).m_82425_();
|
|
BlockState blockstate = this.f_109465_.m_8055_(blockpos1);
|
|
+ if (!net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, p_109600_, multibuffersource$buffersource))
|
|
if (!blockstate.m_60795_() && this.f_109465_.m_6857_().m_61937_(blockpos1)) {
|
|
VertexConsumer vertexconsumer2 = multibuffersource$buffersource.m_6299_(RenderType.m_110504_());
|
|
this.m_109637_(p_109600_, vertexconsumer2, p_109604_.m_90592_(), d0, d1, d2, blockpos1, blockstate);
|
|
}
|
|
+ } else if (hitresult != null && hitresult.m_6662_() == HitResult.Type.ENTITY) {
|
|
+ net.minecraftforge.client.ForgeHooksClient.onDrawHighlight(this, p_109604_, hitresult, p_109601_, p_109600_, multibuffersource$buffersource);
|
|
}
|
|
|
|
this.f_109461_.f_91064_.m_113457_(p_109600_, multibuffersource$buffersource, d0, d1, d2);
|
|
@@ -1337,7 +_,8 @@
|
|
this.f_109415_.m_83945_(this.f_109461_.m_91385_());
|
|
RenderStateShard.f_110126_.m_110185_();
|
|
profilerfiller.m_6182_("particles");
|
|
- this.f_109461_.f_91061_.m_107336_(p_109600_, multibuffersource$buffersource, p_109606_, p_109604_, p_109601_);
|
|
+ this.f_109461_.f_91061_.render(p_109600_, multibuffersource$buffersource, p_109606_, p_109604_, p_109601_, frustum);
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
RenderStateShard.f_110126_.m_110188_();
|
|
} else {
|
|
profilerfiller.m_6182_("translucent");
|
|
@@ -1351,7 +_,8 @@
|
|
profilerfiller.m_6182_("string");
|
|
this.m_172993_(RenderType.m_110503_(), p_109600_, d0, d1, d2, p_254120_);
|
|
profilerfiller.m_6182_("particles");
|
|
- this.f_109461_.f_91061_.m_107336_(p_109600_, multibuffersource$buffersource, p_109606_, p_109604_, p_109601_);
|
|
+ this.f_109461_.f_91061_.render(p_109600_, multibuffersource$buffersource, p_109606_, p_109604_, p_109601_, frustum);
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
}
|
|
|
|
posestack.m_85836_();
|
|
@@ -1375,6 +_,7 @@
|
|
RenderStateShard.f_110127_.m_110185_();
|
|
profilerfiller.m_6182_("weather");
|
|
this.m_109703_(p_109606_, p_109601_, d0, d1, d2);
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_WEATHER, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
this.m_173012_(p_109604_);
|
|
RenderStateShard.f_110127_.m_110188_();
|
|
this.f_109418_.m_110023_(p_109601_);
|
|
@@ -1383,6 +_,7 @@
|
|
RenderSystem.m_69458_(false);
|
|
profilerfiller.m_6182_("weather");
|
|
this.m_109703_(p_109606_, p_109601_, d0, d1, d2);
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_WEATHER, this, p_109600_, p_254120_, this.f_109477_, p_109604_, frustum);
|
|
this.m_173012_(p_109604_);
|
|
RenderSystem.m_69458_(true);
|
|
}
|
|
@@ -1526,6 +_,7 @@
|
|
shaderinstance.m_173362_();
|
|
VertexBuffer.m_85931_();
|
|
this.f_109461_.m_91307_().m_7238_();
|
|
+ net.minecraftforge.client.ForgeHooksClient.dispatchRenderStage(p_172994_, this, p_172995_, p_254039_, this.f_109477_, this.f_109461_.f_91063_.m_109153_(), this.f_109442_ != null ? this.f_109442_ : this.f_172938_);
|
|
p_172994_.m_110188_();
|
|
}
|
|
|
|
@@ -1740,6 +_,8 @@
|
|
}
|
|
|
|
public void m_202423_(PoseStack p_202424_, Matrix4f p_254034_, float p_202426_, Camera p_202427_, boolean p_202428_, Runnable p_202429_) {
|
|
+ if (f_109465_.m_104583_().renderSky(f_109465_, f_109477_, p_202426_, p_202424_, p_202427_, p_254034_, p_202428_, p_202429_))
|
|
+ return;
|
|
p_202429_.run();
|
|
if (!p_202428_) {
|
|
FogType fogtype = p_202427_.m_167685_();
|
|
@@ -1861,6 +_,8 @@
|
|
}
|
|
|
|
public void m_253054_(PoseStack p_254145_, Matrix4f p_254537_, float p_254364_, double p_253843_, double p_253663_, double p_253795_) {
|
|
+ if (f_109465_.m_104583_().renderClouds(f_109465_, f_109477_, p_254364_, p_254145_, p_253843_, p_253663_, p_253795_, p_254537_))
|
|
+ return;
|
|
float f = this.f_109465_.m_104583_().m_108871_();
|
|
if (!Float.isNaN(f)) {
|
|
RenderSystem.m_69464_();
|
|
@@ -2047,7 +_,7 @@
|
|
boolean flag = false;
|
|
if (this.f_109461_.f_91066_.m_232080_().m_231551_() == PrioritizeChunkUpdates.NEARBY) {
|
|
BlockPos blockpos1 = chunkrenderdispatcher$renderchunk.m_112839_().m_7918_(8, 8, 8);
|
|
- flag = blockpos1.m_123331_(blockpos) < 768.0D || chunkrenderdispatcher$renderchunk.m_112842_();
|
|
+ flag = !net.minecraftforge.common.ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.get() && (blockpos1.m_123331_(blockpos) < 768.0D || chunkrenderdispatcher$renderchunk.m_112842_()); // the target is the else block below, so invert the forge addition to get there early
|
|
} else if (this.f_109461_.f_91066_.m_232080_().m_231551_() == PrioritizeChunkUpdates.PLAYER_AFFECTED) {
|
|
flag = chunkrenderdispatcher$renderchunk.m_112842_();
|
|
}
|
|
@@ -2354,7 +_,12 @@
|
|
this.f_109469_.m_110859_(p_109502_, p_109503_, p_109504_, p_109505_);
|
|
}
|
|
|
|
+ @Deprecated // Forge: use item aware function below
|
|
public void m_109514_(@Nullable SoundEvent p_109515_, BlockPos p_109516_) {
|
|
+ this.playStreamingMusic(p_109515_, p_109516_, p_109515_ == null? null : RecordItem.m_43040_(p_109515_));
|
|
+ }
|
|
+
|
|
+ public void playStreamingMusic(@Nullable SoundEvent p_109515_, BlockPos p_109516_, @Nullable RecordItem musicDiscItem) {
|
|
SoundInstance soundinstance = this.f_109410_.get(p_109516_);
|
|
if (soundinstance != null) {
|
|
this.f_109461_.m_91106_().m_120399_(soundinstance);
|
|
@@ -2362,7 +_,7 @@
|
|
}
|
|
|
|
if (p_109515_ != null) {
|
|
- RecordItem recorditem = RecordItem.m_43040_(p_109515_);
|
|
+ RecordItem recorditem = musicDiscItem;
|
|
if (recorditem != null) {
|
|
this.f_109461_.f_91065_.m_93055_(recorditem.m_43050_());
|
|
}
|
|
@@ -2503,7 +_,7 @@
|
|
case 1010:
|
|
Item item = Item.m_41445_(p_234307_);
|
|
if (item instanceof RecordItem recorditem) {
|
|
- this.m_109514_(recorditem.m_43051_(), p_234306_);
|
|
+ this.playStreamingMusic(recorditem.m_43051_(), p_234306_, recorditem);
|
|
}
|
|
break;
|
|
case 1011:
|
|
@@ -2656,7 +_,7 @@
|
|
case 2001:
|
|
BlockState blockstate = Block.m_49803_(p_234307_);
|
|
if (!blockstate.m_60795_()) {
|
|
- SoundType soundtype = blockstate.m_60827_();
|
|
+ SoundType soundtype = blockstate.getSoundType(this.f_109465_, p_234306_, null);
|
|
this.f_109465_.m_245747_(p_234306_, soundtype.m_56775_(), SoundSource.BLOCKS, (soundtype.m_56773_() + 1.0F) / 2.0F, soundtype.m_56774_() * 0.8F, false);
|
|
}
|
|
|
|
@@ -2875,7 +_,7 @@
|
|
} else {
|
|
int i = p_109538_.m_45517_(LightLayer.SKY, p_109540_);
|
|
int j = p_109538_.m_45517_(LightLayer.BLOCK, p_109540_);
|
|
- int k = p_109539_.m_60791_();
|
|
+ int k = p_109539_.getLightEmission(p_109538_, p_109540_);
|
|
if (j < k) {
|
|
j = k;
|
|
}
|