Port726 (#737)

Author: someaddons

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

@@ -105,8 +105,9 @@ public void updateBlueprint(final BlueprintPreviewData previewData)
         }
     }
 
-    private void init(final Blueprint blueprint, final Map<Object, Exception> suppressedExceptions, final BlueprintPreviewData previewData)
+    private void init(final BlueprintPreviewData previewData, final Map<Object, Exception> suppressedExceptions)
     {
+        final Blueprint blueprint = previewData.getBlueprint();
         final BlockRenderDispatcher blockRenderer = Minecraft.getInstance().getBlockRenderer();
         final RandomSource random = RandomSource.create();
 
@@ -130,7 +131,7 @@ private void init(final Blueprint blueprint, final Map<Object, Exception> suppre
             final BlockPos blockPos = blockInfo.getPos();
             BlockState state = blockInfo.getState();
             // specially handle blockTagSub here cuz of block entity changes
-            if (Structurize.getConfig().getClient().renderPlaceholdersNice.get() && state.getBlock() == ModBlocks.blockTagSubstitution.get())
+            if (previewData.getRenderBlocksNice() && state.getBlock() == ModBlocks.blockTagSubstitution.get())
             {
                 if (tileEntitiesMap.remove(blockPos) instanceof final BlockEntityTagSubstitution tagTE)
                 {
@@ -150,7 +151,7 @@ private void init(final Blueprint blueprint, final Map<Object, Exception> suppre
             }
             else
             {
-                state = blockAccess.prepareBlockStateForRendering(state, blockPos);
+                state = blockAccess.prepareBlockStateForRendering(state, blockPos, previewData);
             }
 
             final FluidState fluidState = state.getFluidState();
@@ -309,7 +310,7 @@ public Map<Object, Exception> drawUnsafe(final BlueprintPreviewData previewData,
         // init
         if (vertexBuffers == null)
         {
-            init(previewData.getBlueprint(), suppressedExceptions, previewData);
+            init(previewData, suppressedExceptions);
         }
 
         profiler.popPush("struct_render_prepare");
@@ -634,11 +635,15 @@ public static void apply(final float overrideValue)
             }
 
             float alpha = Structurize.getConfig().getClient().rendererTransparency.get().floatValue();
+            if (overrideValue != -1)
+            {
+                alpha = Mth.clamp(overrideValue, 0, 1);
+            }
+
             if (alpha < 0 || alpha > THRESHOLD)
             {
                 return;
             }
-            alpha = overrideValue < 0 ? alpha : Mth.clamp(overrideValue, 0, 1);
 
             applied = true;
 

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

@@ -7,6 +7,7 @@
 import com.ldtteam.structurize.blockentities.BlockEntityTagSubstitution;
 import com.ldtteam.structurize.blocks.ModBlocks;
 import com.ldtteam.structurize.blueprints.v1.Blueprint;
+import com.ldtteam.structurize.storage.rendering.types.BlueprintPreviewData;
 import com.ldtteam.structurize.util.BlockUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -47,7 +48,12 @@ public BlockState getBlockState(final BlockPos pos)
 
     public BlockState prepareBlockStateForRendering(final BlockState state, final BlockPos pos)
     {
-        if (Structurize.getConfig().getClient().renderPlaceholdersNice.get())
+        return prepareBlockStateForRendering(state, pos, null);
+    }
+
+    public BlockState prepareBlockStateForRendering(final BlockState state, final BlockPos pos, final BlueprintPreviewData previewData)
+    {
+        if (previewData == null ? Structurize.getConfig().getClient().renderPlaceholdersNice.get() : previewData.getRenderBlocksNice())
         {
             if (state.getBlock() == ModBlocks.blockSolidSubstitution.get())
             {

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

@@ -76,6 +76,11 @@ public class BlueprintPreviewData
      */
     private BlockState solidSubstitutionOverride = null;
 
+    /**
+     * Setting for whether blocks render nice or not
+     */
+    private boolean renderBlocksNice = Structurize.getConfig().getClient() != null && Structurize.getConfig().getClient().renderPlaceholdersNice.get();
+
     /**
      * Default constructor to create a new setup.
      */
@@ -341,6 +346,25 @@ public boolean isServerSyncEnabled()
         return serverSyncEnabled;
     }
 
+    /**
+     * Sets whether substitution blocks should render nice
+     *
+     * @param renderNice
+     */
+    public void setRenderBlocksNice(final boolean renderNice)
+    {
+        renderBlocksNice = renderNice;
+    }
+
+    /**
+     * Whether substitution blocks render nice
+     * @return
+     */
+    public boolean getRenderBlocksNice()
+    {
+        return renderBlocksNice;
+    }
+
     /**
      * Overrides client config for preview transparency if already enabled, else does nothing.
      *