the shape brothers

reorganize shape classes

Author: TropheusJ

src/main/java/io/github/fusionflux/portalcubed/content/button/CubeButtonBlock.java

@@ -5,7 +5,7 @@
 import io.github.fusionflux.portalcubed.content.PortalCubedSounds;
 import io.github.fusionflux.portalcubed.content.prop.entity.Prop;
 import io.github.fusionflux.portalcubed.data.tags.PortalCubedEntityTags;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;

src/main/java/io/github/fusionflux/portalcubed/content/button/FloorButtonBlock.java

@@ -14,7 +14,7 @@
 import io.github.fusionflux.portalcubed.data.tags.PortalCubedEntityTags;
 import io.github.fusionflux.portalcubed.framework.block.PortalCubedStateProperties;
 import io.github.fusionflux.portalcubed.framework.block.multiblock.AbstractMultiBlock;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
 import io.github.fusionflux.portalcubed.mixin.utils.accessors.PufferfishAccessor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/io/github/fusionflux/portalcubed/content/button/pedestal/PedestalButtonBlock.java

@@ -14,8 +14,8 @@
 import io.github.fusionflux.portalcubed.framework.block.HammerableBlock;
 import io.github.fusionflux.portalcubed.framework.block.PortalCubedStateProperties;
 import io.github.fusionflux.portalcubed.framework.extension.BigShapeBlock;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper.DefaultRotationValues;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper.DefaultRotationValues;
 import io.github.fusionflux.portalcubed.packet.PortalCubedPackets;
 import io.github.fusionflux.portalcubed.packet.clientbound.OpenPedestalButtonConfigPacket;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;

src/main/java/io/github/fusionflux/portalcubed/content/decoration/CrossbarPillarBlock.java

@@ -1,13 +1,11 @@
 package io.github.fusionflux.portalcubed.content.decoration;
 
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
-
-import net.minecraft.core.Direction.Axis;
-
 import org.jetbrains.annotations.NotNull;
 
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;

src/main/java/io/github/fusionflux/portalcubed/content/decoration/signage/SignageBlock.java

@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import io.github.fusionflux.portalcubed.framework.block.HammerableBlock;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
 import net.minecraft.Optionull;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/io/github/fusionflux/portalcubed/content/door/ChamberDoorBlock.java

@@ -7,7 +7,7 @@
 import io.github.fusionflux.portalcubed.PortalCubed;
 import io.github.fusionflux.portalcubed.content.PortalCubedSounds;
 import io.github.fusionflux.portalcubed.framework.extension.BigShapeBlock;
-import io.github.fusionflux.portalcubed.framework.util.VoxelShaper;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShaper;
 import net.fabricmc.fabric.api.object.builder.v1.block.type.BlockSetTypeBuilder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/io/github/fusionflux/portalcubed/content/portal/PortalInstance.java

@@ -7,9 +7,9 @@
 
 import io.github.fusionflux.portalcubed.content.portal.transform.SinglePortalTransform;
 import io.github.fusionflux.portalcubed.framework.shape.OBB;
-import io.github.fusionflux.portalcubed.framework.shape.VoxelShenanigans;
-import io.github.fusionflux.portalcubed.framework.util.Plane;
-import io.github.fusionflux.portalcubed.framework.util.Quad;
+import io.github.fusionflux.portalcubed.framework.shape.Plane;
+import io.github.fusionflux.portalcubed.framework.shape.Quad;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShenanigans;
 import io.github.fusionflux.portalcubed.framework.util.TransformUtils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import net.minecraft.core.BlockPos;

src/main/java/io/github/fusionflux/portalcubed/content/portal/PortalTeleportHandler.java

@@ -9,7 +9,7 @@
 import io.github.fusionflux.portalcubed.content.portal.transform.SinglePortalTransform;
 import io.github.fusionflux.portalcubed.data.tags.PortalCubedEntityTags;
 import io.github.fusionflux.portalcubed.framework.shape.OBB;
-import io.github.fusionflux.portalcubed.framework.shape.VoxelShenanigans;
+import io.github.fusionflux.portalcubed.framework.shape.voxel.VoxelShenanigans;
 import io.github.fusionflux.portalcubed.mixin.utils.accessors.EntityAccessor;
 import io.github.fusionflux.portalcubed.packet.PortalCubedPackets;
 import io.github.fusionflux.portalcubed.packet.clientbound.PortalTeleportPacket;

src/main/java/io/github/fusionflux/portalcubed/content/portal/sync/TrackedTeleport.java

@@ -3,7 +3,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.github.fusionflux.portalcubed.content.portal.transform.SinglePortalTransform;
-import io.github.fusionflux.portalcubed.framework.util.Plane;
+import io.github.fusionflux.portalcubed.framework.shape.Plane;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;

src/main/java/io/github/fusionflux/portalcubed/framework/util/Line.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/Line.java

@@ -1,4 +1,4 @@
-package io.github.fusionflux.portalcubed.framework.util;
+package io.github.fusionflux.portalcubed.framework.shape;
 
 import net.minecraft.world.phys.Vec3;
 

src/main/java/io/github/fusionflux/portalcubed/framework/shape/OBB.java

@@ -8,7 +8,6 @@
 
 import com.google.common.collect.Iterables;
 
-import io.github.fusionflux.portalcubed.framework.util.Quad;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.AABB;

src/main/java/io/github/fusionflux/portalcubed/framework/util/Plane.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/Plane.java

@@ -1,4 +1,4 @@
-package io.github.fusionflux.portalcubed.framework.util;
+package io.github.fusionflux.portalcubed.framework.shape;
 
 import org.jetbrains.annotations.Nullable;
 import org.joml.Intersectiond;

src/main/java/io/github/fusionflux/portalcubed/framework/util/Quad.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/Quad.java

@@ -1,4 +1,4 @@
-package io.github.fusionflux.portalcubed.framework.util;
+package io.github.fusionflux.portalcubed.framework.shape;
 
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;

src/main/java/io/github/fusionflux/portalcubed/framework/util/Tri.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/Tri.java

@@ -1,4 +1,4 @@
-package io.github.fusionflux.portalcubed.framework.util;
+package io.github.fusionflux.portalcubed.framework.shape;
 
 import java.util.Iterator;
 

src/main/java/io/github/fusionflux/portalcubed/framework/util/VoxelShaper.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/voxel/VoxelShaper.java

@@ -1,4 +1,4 @@
-package io.github.fusionflux.portalcubed.framework.util;
+package io.github.fusionflux.portalcubed.framework.shape.voxel;
 
 
 import java.util.Arrays;

src/main/java/io/github/fusionflux/portalcubed/framework/shape/VoxelShenanigans.java src/main/java/io/github/fusionflux/portalcubed/framework/shape/voxel/VoxelShenanigans.java

@@ -1,7 +1,8 @@
-package io.github.fusionflux.portalcubed.framework.shape;
+package io.github.fusionflux.portalcubed.framework.shape.voxel;
 
 import org.jetbrains.annotations.Unmodifiable;
 
+import io.github.fusionflux.portalcubed.framework.shape.OBB;
 import io.github.fusionflux.portalcubed.mixin.utils.accessors.CubeVoxelShapeAccessor;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;

src/main/java/io/github/fusionflux/portalcubed/framework/util/RenderingUtils.java

@@ -15,6 +15,9 @@
 import com.mojang.blaze3d.vertex.VertexFormat;
 
 import io.github.fusionflux.portalcubed.framework.shape.OBB;
+import io.github.fusionflux.portalcubed.framework.shape.Plane;
+import io.github.fusionflux.portalcubed.framework.shape.Quad;
+import io.github.fusionflux.portalcubed.framework.shape.Tri;
 import net.minecraft.client.renderer.CoreShaders;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;