Skip to content

Commit 76f7c26

Browse files
NightenomNightenom
committed
Revert miss merge
This reverts commit 886ced7. This reverts commit 3b186c7.
1 parent 886ced7 commit 76f7c26

File tree

3 files changed

+39
-58
lines changed

3 files changed

+39
-58
lines changed

‎src/main/java/com/ldtteam/structurize/client/BlueprintRenderer.java‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,26 @@
1717
import com.mojang.blaze3d.platform.Lighting;
1818
import com.mojang.blaze3d.shaders.Uniform;
1919
import com.mojang.blaze3d.systems.RenderSystem;
20-
import com.mojang.blaze3d.vertex.*;
20+
import com.mojang.blaze3d.vertex.BufferBuilder;
21+
import com.mojang.blaze3d.vertex.MeshData;
22+
import com.mojang.blaze3d.vertex.PoseStack;
23+
import com.mojang.blaze3d.vertex.VertexBuffer;
2124
import com.mojang.blaze3d.vertex.VertexBuffer.Usage;
25+
import com.mojang.blaze3d.vertex.VertexFormat;
2226
import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
2327
import net.minecraft.CrashReport;
2428
import net.minecraft.ReportType;
2529
import net.minecraft.ReportedException;
2630
import net.minecraft.client.Camera;
2731
import net.minecraft.client.DeltaTracker;
2832
import net.minecraft.client.Minecraft;
29-
import net.minecraft.client.renderer.*;
33+
import net.minecraft.client.renderer.FogRenderer;
34+
import net.minecraft.client.renderer.ItemBlockRenderTypes;
35+
import net.minecraft.client.renderer.MultiBufferSource;
36+
import net.minecraft.client.renderer.RenderBuffers;
37+
import net.minecraft.client.renderer.RenderType;
38+
import net.minecraft.client.renderer.ShaderInstance;
39+
import net.minecraft.client.renderer.Sheets;
3040
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
3141
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
3242
import net.minecraft.client.renderer.culling.Frustum;
@@ -39,8 +49,18 @@
3949
import net.minecraft.world.entity.Entity;
4050
import net.minecraft.world.inventory.InventoryMenu;
4151
import net.minecraft.world.level.Level;
42-
import net.minecraft.world.level.block.*;
43-
import net.minecraft.world.level.block.entity.*;
52+
import net.minecraft.world.level.block.Blocks;
53+
import net.minecraft.world.level.block.CampfireBlock;
54+
import net.minecraft.world.level.block.RenderShape;
55+
import net.minecraft.world.level.block.SkullBlock;
56+
import net.minecraft.world.level.block.TrialSpawnerBlock;
57+
import net.minecraft.world.level.block.entity.BeaconBlockEntity;
58+
import net.minecraft.world.level.block.entity.BlockEntity;
59+
import net.minecraft.world.level.block.entity.CampfireBlockEntity;
60+
import net.minecraft.world.level.block.entity.EnchantingTableBlockEntity;
61+
import net.minecraft.world.level.block.entity.SkullBlockEntity;
62+
import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
63+
import net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity;
4464
import net.minecraft.world.level.block.entity.vault.VaultBlockEntity;
4565
import net.minecraft.world.level.block.state.BlockState;
4666
import net.minecraft.world.level.material.FluidState;
@@ -54,7 +74,13 @@
5474
import org.slf4j.Logger;
5575
import org.slf4j.LoggerFactory;
5676

57-
import java.util.*;
77+
import java.util.ArrayList;
78+
import java.util.Collections;
79+
import java.util.HashMap;
80+
import java.util.IdentityHashMap;
81+
import java.util.List;
82+
import java.util.Map;
83+
import java.util.Set;
5884

5985
/**
6086
* The renderer for blueprint.
@@ -105,7 +131,7 @@ public void updateBlueprint(final BlueprintPreviewData previewData)
105131
}
106132
}
107133

108-
private void init(final Blueprint blueprint, final Map<Object, Exception> suppressedExceptions, final BlueprintPreviewData previewData)
134+
private void init(final Blueprint blueprint, final Map<Object, Exception> suppressedExceptions)
109135
{
110136
final BlockRenderDispatcher blockRenderer = Minecraft.getInstance().getBlockRenderer();
111137
final RandomSource random = RandomSource.create();
@@ -117,11 +143,6 @@ private void init(final Blueprint blueprint, final Map<Object, Exception> suppre
117143
blockAccess.setBlockEntities(tileEntitiesMap);
118144
blockAccess.setEntities(entities);
119145

120-
if (previewData.getSolidSubstitutionOverride() != null)
121-
{
122-
blockAccess.setSolidSubstitutionOverride(previewData.getSolidSubstitutionOverride());
123-
}
124-
125146
final PoseStack matrixStack = new PoseStack();
126147
matrixStack.translate(0.001, 0.001, 0.001);
127148

@@ -152,6 +173,11 @@ private void init(final Blueprint blueprint, final Map<Object, Exception> suppre
152173
state = Blocks.AIR.defaultBlockState();
153174
}
154175
}
176+
else if (Structurize.getConfig().getClient().renderPlaceholdersNice.get() && state.getBlock() == ModBlocks.blockSolidSubstitution.get()
177+
&& previewData.getSolidSubstitutionOverride() != null)
178+
{
179+
state = previewData.getSolidSubstitutionOverride();
180+
}
155181
else
156182
{
157183
state = blockAccess.prepareBlockStateForRendering(state, blockPos);
@@ -311,7 +337,7 @@ public Map<Object, Exception> drawUnsafe(final BlueprintPreviewData previewData,
311337
// init
312338
if (vertexBuffers == null)
313339
{
314-
init(previewData.getBlueprint(), suppressedExceptions, previewData);
340+
init(previewData.getBlueprint(), suppressedExceptions);
315341
}
316342

317343
profiler.popPush("struct_render_prepare");

‎src/main/java/com/ldtteam/structurize/client/fakelevel/BlueprintBlockAccess.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public class BlueprintBlockAccess extends FakeLevel<Blueprint>
2323
public static final IFakeLevelLightProvider LIGHT_PROVIDER = new ConfigBasedLightProvider(Structurize.getConfig().getClient().rendererLightLevel);
2424
private static final Scoreboard SCOREBOARD = new Scoreboard();
2525

26-
/**
27-
* Override blockstate for solid placeholders
28-
*/
29-
private BlockState solidSubstitutionOverride = null;
30-
3126
public BlueprintBlockAccess(final Blueprint blueprint)
3227
{
3328
super(blueprint, LIGHT_PROVIDER, Minecraft.getInstance().level, SCOREBOARD, true);
@@ -51,10 +46,6 @@ public BlockState prepareBlockStateForRendering(final BlockState state, final Bl
5146
{
5247
if (state.getBlock() == ModBlocks.blockSolidSubstitution.get())
5348
{
54-
if (solidSubstitutionOverride != null)
55-
{
56-
return solidSubstitutionOverride;
57-
}
5849
return BlockUtils.getSubstitutionBlockAtWorld(anyLevel(), worldPos.offset(pos), levelSource.getRawBlockStateFunction().compose(b -> b.subtract(worldPos)));
5950
}
6051
else if (state.getBlock() == ModBlocks.blockFluidSubstitution.get())
@@ -77,14 +68,4 @@ else if (state.getBlock() == ModBlocks.blockTagSubstitution.get())
7768

7869
return state;
7970
}
80-
81-
/**
82-
* Set the solid placeholder blockstate override, only updates when the renderer is recalculated
83-
*
84-
* @return
85-
*/
86-
public void setSolidSubstitutionOverride(final BlockState solidSubstitutionOverride)
87-
{
88-
this.solidSubstitutionOverride = solidSubstitutionOverride;
89-
}
9071
}

‎src/main/java/com/ldtteam/structurize/storage/rendering/types/BlueprintPreviewData.java‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package com.ldtteam.structurize.storage.rendering.types;
22

33
import com.ldtteam.structurize.Structurize;
4-
import com.ldtteam.structurize.api.RotationMirror;
54
import com.ldtteam.structurize.blueprints.v1.Blueprint;
65
import com.ldtteam.structurize.client.RenderingCacheKey;
76
import com.ldtteam.structurize.network.messages.SyncPreviewCacheToServer;
87
import com.ldtteam.structurize.storage.StructurePacks;
8+
import com.ldtteam.structurize.api.RotationMirror;
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.core.BlockPos;
1111
import net.minecraft.network.FriendlyByteBuf;
1212
import net.minecraft.network.RegistryFriendlyByteBuf;
1313
import net.minecraft.util.Mth;
1414
import net.minecraft.world.level.block.Rotation;
15-
import net.minecraft.world.level.block.state.BlockState;
1615
import net.neoforged.api.distmarker.Dist;
1716
import net.neoforged.api.distmarker.OnlyIn;
1817
import org.jetbrains.annotations.Nullable;
@@ -71,11 +70,6 @@ public class BlueprintPreviewData
7170
*/
7271
private float overridePreviewTransparency = -1;
7372

74-
/**
75-
* Override blockstate for solid placeholders
76-
*/
77-
private BlockState solidSubstitutionOverride = null;
78-
7973
/**
8074
* Default constructor to create a new setup.
8175
*/
@@ -355,24 +349,4 @@ public float getOverridePreviewTransparency()
355349
{
356350
return overridePreviewTransparency;
357351
}
358-
359-
/**
360-
* Get the solid placeholder blockstate override
361-
*
362-
* @return
363-
*/
364-
public BlockState getSolidSubstitutionOverride()
365-
{
366-
return solidSubstitutionOverride;
367-
}
368-
369-
/**
370-
* Set the solid placeholder blockstate override, only updates when the renderer is recalculated
371-
*
372-
* @return
373-
*/
374-
public void setSolidSubstitutionOverride(final BlockState solidSubstitutionOverride)
375-
{
376-
this.solidSubstitutionOverride = solidSubstitutionOverride;
377-
}
378352
}

0 commit comments

Comments
 (0)