diff --git a/src/main/java/org/dimdev/dimcore/schematic/Schematic.java b/src/main/java/org/dimdev/dimcore/schematic/Schematic.java index 0ceca495..88d7d82a 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/Schematic.java +++ b/src/main/java/org/dimdev/dimcore/schematic/Schematic.java @@ -366,7 +366,7 @@ public class Schematic implements BlockView { // Place the schematic's blocks this.setBlocks(world, xBase, yBase, zBase); - // Set BlockEntity data + // Set BlockEntity data for (CompoundTag BlockEntityNBT : tileEntities) { Vec3i schematicPos = new BlockPos(BlockEntityNBT.getInt("x"), BlockEntityNBT.getInt("y"), BlockEntityNBT.getInt("z")); BlockPos pos = new BlockPos(xBase, yBase, zBase).add(schematicPos); @@ -469,7 +469,7 @@ public class Schematic implements BlockView { ServerWorld w; - if(world instanceof ServerWorldAccess) { + if (world instanceof ServerWorldAccess) { w = ((ServerWorldAccess) world).toServerWorld(); } else { w = (ServerWorld) world; diff --git a/src/main/java/org/dimdev/dimcore/schematic/v2/RelativeBlockSample.java b/src/main/java/org/dimdev/dimcore/schematic/v2/RelativeBlockSample.java index f9928830..31f8f47a 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/v2/RelativeBlockSample.java +++ b/src/main/java/org/dimdev/dimcore/schematic/v2/RelativeBlockSample.java @@ -76,7 +76,7 @@ public class RelativeBlockSample implements BlockView, ModifiableWorld { if (block instanceof ConditionalBlockEntityProvider && ((ConditionalBlockEntityProvider) block).hasBlockEntity(this.getBlockState(pos)) && ((ConditionalBlockEntityProvider) block).hasBlockEntity(pos, this)) { return ((ConditionalBlockEntityProvider) block).createBlockEntity(this.world); } else { - return ((BlockEntityProvider)block).createBlockEntity(this.world); + return ((BlockEntityProvider) block).createBlockEntity(this.world); } } return null; diff --git a/src/main/java/org/dimdev/dimcore/schematic/v2/Schematic.java b/src/main/java/org/dimdev/dimcore/schematic/v2/Schematic.java index 3596f480..bce360a1 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/v2/Schematic.java +++ b/src/main/java/org/dimdev/dimcore/schematic/v2/Schematic.java @@ -35,7 +35,7 @@ public class Schematic { Codec.BYTE_BUFFER.fieldOf("BlockData").forGetter(Schematic::getBlockData), Codec.list(CompoundTag.CODEC).optionalFieldOf("BlockEntities", ImmutableList.of()).forGetter(Schematic::getBlockEntities), Codec.list(CompoundTag.CODEC).optionalFieldOf("Entities", ImmutableList.of()).forGetter(Schematic::getEntities) - ).apply(instance, Schematic::new); + ).apply(instance, Schematic::new); }); private final int version; diff --git a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java index 51118329..082d37bd 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java +++ b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicBlockPalette.java @@ -26,7 +26,7 @@ public class SchematicBlockPalette { static DataResult to(String string) { if (!string.contains("[") && !string.contains("]")) { - BlockState state = Registry.BLOCK.get(new Identifier(string)).getDefaultState(); + BlockState state = Registry.BLOCK.get(new Identifier(string)).getDefaultState(); return DataResult.success(state); } else { Block block = Objects.requireNonNull(Registry.BLOCK.get(new Identifier(string.substring(0, string.indexOf("["))))); @@ -37,7 +37,7 @@ public class SchematicBlockPalette { String[] stateArray = string.substring(string.indexOf("[") + 1, string.length() - 1).split(","); for (String stateString : stateArray) { Property property = Objects.requireNonNull(block.getStateManager().getProperty(stateString.split("=")[0])); - state = process(property,stateString.split("=")[1], state); + state = process(property, stateString.split("=")[1], state); } System.out.println(state); @@ -52,7 +52,7 @@ public class SchematicBlockPalette { // Ensures that [ and ] are only added when properties are present boolean flag = true; Iterator> iterator = state.getProperties().iterator(); - while(iterator.hasNext()) { + while (iterator.hasNext()) { if (flag) { builder.append("["); flag = false; diff --git a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicPlacer.java b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicPlacer.java index 2d310177..03461c55 100644 --- a/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicPlacer.java +++ b/src/main/java/org/dimdev/dimcore/schematic/v2/SchematicPlacer.java @@ -56,7 +56,7 @@ public final class SchematicPlacer { List entityTags = schematic.getEntities(); for (CompoundTag tag : entityTags) { // Ensures compatibility with worldedit schematics - if (SchematicPlacer.fixId(tag)){ + if (SchematicPlacer.fixId(tag)) { System.err.println("An unexpected error occurred parsing this entity"); System.err.println(tag.toString()); throw new IllegalStateException("Entity in schematic \"" + schematic.getMetadata().getName() + "\" did not have an Id tag, nor an id tag!"); @@ -93,7 +93,7 @@ public final class SchematicPlacer { DoubleTag.of(x + originX), DoubleTag.of(y + originY), DoubleTag.of(z + originZ) - ), + ), (byte) 6 ) ); diff --git a/src/main/java/org/dimdev/dimdoors/util/AnnotatedNbt.java b/src/main/java/org/dimdev/dimdoors/util/AnnotatedNbt.java index ded3df75..b9238efb 100644 --- a/src/main/java/org/dimdev/dimdoors/util/AnnotatedNbt.java +++ b/src/main/java/org/dimdev/dimdoors/util/AnnotatedNbt.java @@ -1,6 +1,5 @@ package org.dimdev.dimdoors.util; -import org.dimdev.dimdoors.util.RotatedLocation; import com.google.gson.Gson; import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps;