From 3abedf387635bccd660b639a40f89b4c11f7db20 Mon Sep 17 00:00:00 2001 From: peter1745 Date: Sat, 2 Mar 2019 23:30:33 +0100 Subject: [PATCH 1/3] Fixed VoxelShape Generator for 1.13 --- .../java/com/mrcrayfish/modelcreator/ExporterJavaCode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java index 186cc73..e7ad8f5 100644 --- a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java +++ b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java @@ -94,7 +94,7 @@ protected void write(BufferedWriter writer) throws IOException double y = element.getStartY(); double z = element.getStartZ(); writer.write(" "); - writeField(writer, null, name, x, y, z, x + element.getWidth(), y + element.getHeight(), z + element.getDepth()); + writeField(writer, null, name, x * 16.0, y * 16.0, z * 16.0, (x + element.getWidth()) * 16.0, (y + element.getHeight()) * 16.0, (z + element.getDepth()) * 16.0); } else { @@ -139,7 +139,7 @@ protected void write(BufferedWriter writer) throws IOException double y = element.getStartY(); double z = element.getStartZ(); writer.write(" "); - writeField(writer, null, name, x, y, z, x + element.getWidth(), y + element.getHeight(), z + element.getDepth()); + writeField(writer, null, name, x * 16.0, y * 16.0, z * 16.0, (x + element.getWidth()) * 16.0, (y + element.getHeight()) * 16.0, (z + element.getDepth()) * 16.0); } else { From ddbeea3e96b3e5462eb84e8f23fdab2560dd16f1 Mon Sep 17 00:00:00 2001 From: peter1745 Date: Sat, 2 Mar 2019 23:37:14 +0100 Subject: [PATCH 2/3] Fixed incorrect class name for VoxelShape Generator --- .../java/com/mrcrayfish/modelcreator/ExporterJavaCode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java index e7ad8f5..66ef396 100644 --- a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java +++ b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java @@ -155,10 +155,10 @@ protected void write(BufferedWriter writer) throws IOException else { writer.newLine(); - writeNewLine(writer, " VoxelShape result = ShapeUtils.empty();"); + writeNewLine(writer, " VoxelShape result = VoxelShapes.empty();"); writeNewLine(writer, " for(VoxelShape shape : shapes)"); writeNewLine(writer, " {"); - writeNewLine(writer, " result = ShapeUtils.combine(result, shape, IBooleanFunction.OR);"); + writeNewLine(writer, " result = VoxelShapes.combine(result, shape, IBooleanFunction.OR);"); writeNewLine(writer, " }"); writeNewLine(writer, " return result.simplify();"); } From 2c2edea4987422d0c6640d48f78be49b4bac1a13 Mon Sep 17 00:00:00 2001 From: peter1745 Date: Sun, 3 Mar 2019 00:45:46 +0100 Subject: [PATCH 3/3] Fixed accidental issue with ExporterJavaCode and rotated models --- src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java index 66ef396..6d2284c 100644 --- a/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java +++ b/src/main/java/com/mrcrayfish/modelcreator/ExporterJavaCode.java @@ -94,7 +94,7 @@ protected void write(BufferedWriter writer) throws IOException double y = element.getStartY(); double z = element.getStartZ(); writer.write(" "); - writeField(writer, null, name, x * 16.0, y * 16.0, z * 16.0, (x + element.getWidth()) * 16.0, (y + element.getHeight()) * 16.0, (z + element.getDepth()) * 16.0); + writeField(writer, null, name, x, y, z, x + element.getWidth(), y + element.getHeight(), z + element.getDepth()); } else {