From b687792fbb8704ac32913a41c8ec2cc2833459a9 Mon Sep 17 00:00:00 2001 From: SD Date: Tue, 30 Mar 2021 08:24:17 +0530 Subject: [PATCH] Move toNbt to BlockBoxUtil --- .../java/org/dimdev/dimdoors/api/util/BlockBoxUtil.java | 5 +++++ .../dimdev/dimdoors/pockets/modifier/ShellModifier.java | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/dimdev/dimdoors/api/util/BlockBoxUtil.java b/src/main/java/org/dimdev/dimdoors/api/util/BlockBoxUtil.java index cfda7b3f..6f29a782 100644 --- a/src/main/java/org/dimdev/dimdoors/api/util/BlockBoxUtil.java +++ b/src/main/java/org/dimdev/dimdoors/api/util/BlockBoxUtil.java @@ -1,5 +1,6 @@ package org.dimdev.dimdoors.api.util; +import net.minecraft.nbt.IntArrayTag; import net.minecraft.util.math.BlockBox; public class BlockBoxUtil { @@ -11,4 +12,8 @@ public class BlockBoxUtil { public static boolean isRealBox(BlockBox box) { return box.minX <= box.maxX && box.minY <= box.maxY && box.minZ <= box.maxZ; } + + public static IntArrayTag toNbt(BlockBox box) { + return new IntArrayTag(new int[]{box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ}); + } } diff --git a/src/main/java/org/dimdev/dimdoors/pockets/modifier/ShellModifier.java b/src/main/java/org/dimdev/dimdoors/pockets/modifier/ShellModifier.java index 8783666b..1118ddd3 100644 --- a/src/main/java/org/dimdev/dimdoors/pockets/modifier/ShellModifier.java +++ b/src/main/java/org/dimdev/dimdoors/pockets/modifier/ShellModifier.java @@ -45,16 +45,12 @@ public class ShellModifier implements LazyModifier { } tag.put("layers", layersTag); if (boxToDrawAround != null) { - tag.put("box_to_draw_around", toNbt(boxToDrawAround)); + tag.put("box_to_draw_around", BlockBoxUtil.toNbt(boxToDrawAround)); } return tag; } - private static IntArrayTag toNbt(BlockBox box) { - return new IntArrayTag(new int[]{box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ}); - } - @Override public void applyToChunk(LazyGenerationPocket pocket, Chunk chunk) { @@ -213,7 +209,7 @@ public class ShellModifier implements LazyModifier { try { this.thicknessEquation = Equation.parse(thickness); } catch (Equation.EquationParseException e) { - LOGGER.error("Could not parse layer thickness equation"); + LOGGER.error("Could not parse layer thickness equation. Defaulting to 1"); this.thicknessEquation = variableMap -> 1d; }