BREAKING: Rename FieldProjectionSize enum to MiniaturizationFieldSize

robotgryphon · robotgryphon · commit d291ab0065ad · 2021-09-09T20:19:49.000-04:00
diff --git a/src/api/java/dev/compactmods/crafting/api/field/IMiniaturizationField.java b/src/api/java/dev/compactmods/crafting/api/field/IMiniaturizationField.java
@@ -15,13 +15,13 @@ public interface IMiniaturizationField {
 
     AxisAlignedBB getBounds();
 
-    FieldProjectionSize getFieldSize();
+    MiniaturizationFieldSize getFieldSize();
 
     BlockPos getCenter();
 
     void setCenter(BlockPos center);
 
-    void setSize(FieldProjectionSize size);
+    void setSize(MiniaturizationFieldSize size);
 
     int getProgress();
 
@@ -79,7 +79,7 @@ default CompoundNBT clientData() {
 
     default void loadClientData(CompoundNBT nbt) {
         this.setCenter(BlockPos.of(nbt.getLong("center")));
-        this.setSize(FieldProjectionSize.valueOf(nbt.getString("size")));
+        this.setSize(MiniaturizationFieldSize.valueOf(nbt.getString("size")));
         this.setCraftingState(EnumCraftingState.valueOf(nbt.getString("state")));
 
         if (nbt.contains("recipe")) {
diff --git a/src/api/java/dev/compactmods/crafting/api/field/MiniaturizationFieldSize.java b/src/api/java/dev/compactmods/crafting/api/field/MiniaturizationFieldSize.java
@@ -10,7 +10,7 @@
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 
-public enum FieldProjectionSize implements IStringSerializable {
+public enum MiniaturizationFieldSize implements IStringSerializable {
     /**
      * Inactive field. Does not have dimensions.
      */
@@ -45,21 +45,21 @@ public enum FieldProjectionSize implements IStringSerializable {
 
     private final String name;
 
-    public static final Codec<FieldProjectionSize> CODEC =
-            Codec.STRING.xmap(FieldProjectionSize::valueOf, FieldProjectionSize::name);
+    public static final Codec<MiniaturizationFieldSize> CODEC =
+            Codec.STRING.xmap(MiniaturizationFieldSize::valueOf, MiniaturizationFieldSize::name);
 
-    public static final FieldProjectionSize[] VALID_SIZES = new FieldProjectionSize[] {
+    public static final MiniaturizationFieldSize[] VALID_SIZES = new MiniaturizationFieldSize[] {
             SMALL, MEDIUM, LARGE, ABSURD
     };
 
-    FieldProjectionSize(String name, int size, int distance) {
+    MiniaturizationFieldSize(String name, int size, int distance) {
         this.size = size;
         this.projectorDistance = distance;
         this.name = name;
     }
 
     @Nonnull
-    public static Optional<FieldProjectionSize> fromDimensions(double size) {
+    public static Optional<MiniaturizationFieldSize> fromDimensions(double size) {
         // smaller than small, larger than max size, or not an odd size
         if(size < SMALL.getDimensions() || size > maximum().getDimensions() || size % 2 == 0)
             return Optional.empty();
@@ -94,7 +94,7 @@ public String getName() {
         return this.name;
     }
 
-    public static FieldProjectionSize maximum() {
+    public static MiniaturizationFieldSize maximum() {
         return ABSURD;
     }
 
@@ -126,6 +126,11 @@ public BlockPos getOppositeProjectorPosition(BlockPos projectorPos, Direction pr
         return getProjectorLocationForDirection(center, projectorFacing);
     }
 
+    public AxisAlignedBB getBoundsAtOrigin() {
+        int offset = this.size;
+        return getBoundsAtPosition(BlockPos.ZERO.offset(offset, offset, offset));
+    }
+
     public AxisAlignedBB getBoundsAtPosition(BlockPos center) {
         return new AxisAlignedBB(center).inflate(this.size);
     }
diff --git a/src/api/java/dev/compactmods/crafting/api/recipe/layers/dim/IDynamicSizedRecipeLayer.java b/src/api/java/dev/compactmods/crafting/api/recipe/layers/dim/IDynamicSizedRecipeLayer.java
@@ -1,5 +1,6 @@
 package dev.compactmods.crafting.api.recipe.layers.dim;
 
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public interface IDynamicSizedRecipeLayer {
@@ -9,6 +10,12 @@ public interface IDynamicSizedRecipeLayer {
      */
     void setRecipeDimensions(AxisAlignedBB dimensions);
 
+    default void setRecipeDimensions(MiniaturizationFieldSize fieldSize) {
+        int dim = fieldSize.getDimensions();
+        AxisAlignedBB aabb = new AxisAlignedBB(0, 0, 0, dim, 1, dim);
+        setRecipeDimensions(aabb);
+    }
+
     /**
      * Used to recalculate dynamic-sized recipe layers. Expected to be called
      * any time components or base recipe dimensions change.
diff --git a/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java b/src/main/java/dev/compactmods/crafting/client/ClientPacketHandler.java
@@ -4,7 +4,7 @@
 import dev.compactmods.crafting.field.MiniaturizationField;
 import dev.compactmods.crafting.field.capability.CapabilityActiveWorldFields;
 import dev.compactmods.crafting.projector.block.FieldProjectorBlock;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.nbt.CompoundNBT;
@@ -13,7 +13,7 @@
 
 public abstract class ClientPacketHandler {
 
-    public static void handleFieldActivation(BlockPos[] projectorLocations, FieldProjectionSize fieldSize) {
+    public static void handleFieldActivation(BlockPos[] projectorLocations, MiniaturizationFieldSize fieldSize) {
         Minecraft mc = Minecraft.getInstance();
         mc.submitAsync(() -> {
             ClientWorld cw = mc.level;
diff --git a/src/main/java/dev/compactmods/crafting/field/FieldHelper.java b/src/main/java/dev/compactmods/crafting/field/FieldHelper.java
@@ -2,7 +2,7 @@
 
 import dev.compactmods.crafting.CompactCrafting;
 import dev.compactmods.crafting.field.capability.CapabilityActiveWorldFields;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import dev.compactmods.crafting.projector.block.FieldProjectorBlock;
 import dev.compactmods.crafting.server.ServerConfig;
@@ -20,7 +20,7 @@ public static void checkBlockPlacement(World level, BlockPos pos) {
         if (level.isClientSide())
             return;
 
-        int maxDimensions = FieldProjectionSize.maximum().getDimensions();
+        int maxDimensions = MiniaturizationFieldSize.maximum().getDimensions();
         AxisAlignedBB searchArea = new AxisAlignedBB(pos, pos).inflate(maxDimensions);
 
         BlockPos[] nearbyProjectors = BlockPos.betweenClosedStream(searchArea)
diff --git a/src/main/java/dev/compactmods/crafting/field/MiniaturizationField.java b/src/main/java/dev/compactmods/crafting/field/MiniaturizationField.java
@@ -14,7 +14,7 @@
 import dev.compactmods.crafting.server.ServerConfig;
 import dev.compactmods.crafting.util.BlockSpaceUtil;
 import dev.compactmods.crafting.api.EnumCraftingState;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.api.field.IFieldListener;
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import dev.compactmods.crafting.api.recipe.IMiniaturizationRecipe;
@@ -38,7 +38,7 @@
 
 public class MiniaturizationField implements IMiniaturizationField {
 
-    private FieldProjectionSize size;
+    private MiniaturizationFieldSize size;
     private BlockPos center;
     private boolean loaded;
 
@@ -59,17 +59,17 @@ public class MiniaturizationField implements IMiniaturizationField {
     public MiniaturizationField() {
     }
 
-    private MiniaturizationField(FieldProjectionSize size, BlockPos center) {
+    private MiniaturizationField(MiniaturizationFieldSize size, BlockPos center) {
         this.center = center;
         this.size = size;
         this.craftingState = EnumCraftingState.NOT_MATCHED;
     }
 
-    public static MiniaturizationField fromSizeAndCenter(FieldProjectionSize fieldSize, BlockPos center) {
+    public static MiniaturizationField fromSizeAndCenter(MiniaturizationFieldSize fieldSize, BlockPos center) {
         return new MiniaturizationField(fieldSize, center);
     }
 
-    public FieldProjectionSize getFieldSize() {
+    public MiniaturizationFieldSize getFieldSize() {
         return this.size;
     }
 
@@ -83,7 +83,7 @@ public void setCenter(BlockPos center) {
     }
 
     @Override
-    public void setSize(FieldProjectionSize size) {
+    public void setSize(MiniaturizationFieldSize size) {
         this.size = size;
     }
 
diff --git a/src/main/java/dev/compactmods/crafting/field/capability/CapabilityActiveWorldFields.java b/src/main/java/dev/compactmods/crafting/field/capability/CapabilityActiveWorldFields.java
@@ -4,7 +4,7 @@
 import dev.compactmods.crafting.data.NbtListCollector;
 import dev.compactmods.crafting.field.ActiveWorldFields;
 import dev.compactmods.crafting.field.MiniaturizationField;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.api.field.IActiveWorldFields;
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import net.minecraft.nbt.CompoundNBT;
@@ -49,7 +49,7 @@ public void readNBT(Capability<IActiveWorldFields> capability, IActiveWorldField
                                 return;
 
                             CompoundNBT f = (CompoundNBT) item;
-                            FieldProjectionSize size = FieldProjectionSize.valueOf(f.getString("size"));
+                            MiniaturizationFieldSize size = MiniaturizationFieldSize.valueOf(f.getString("size"));
                             BlockPos center = NBTUtil.readBlockPos(f.getCompound("center"));
 
                             MiniaturizationField field = MiniaturizationField.fromSizeAndCenter(size, center);
diff --git a/src/main/java/dev/compactmods/crafting/field/capability/CapabilityMiniaturizationField.java b/src/main/java/dev/compactmods/crafting/field/capability/CapabilityMiniaturizationField.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nullable;
 import dev.compactmods.crafting.field.MiniaturizationField;
 import dev.compactmods.crafting.api.EnumCraftingState;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.api.field.IMiniaturizationField;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.INBT;
@@ -53,7 +53,7 @@ public void readNBT(Capability<IMiniaturizationField> capability, IMiniaturizati
                             CompoundNBT fieldInfo = (CompoundNBT) nbt;
 
                             BlockPos center = NBTUtil.readBlockPos(fieldInfo.getCompound("center"));
-                            FieldProjectionSize size = FieldProjectionSize.valueOf(fieldInfo.getString("size"));
+                            MiniaturizationFieldSize size = MiniaturizationFieldSize.valueOf(fieldInfo.getString("size"));
 
                             if (fieldInfo.contains("craftingState")) {
                                 EnumCraftingState state = EnumCraftingState.valueOf(fieldInfo.getString("craftingState"));
diff --git a/src/main/java/dev/compactmods/crafting/network/FieldActivatedPacket.java b/src/main/java/dev/compactmods/crafting/network/FieldActivatedPacket.java
@@ -2,7 +2,7 @@
 
 import dev.compactmods.crafting.CompactCrafting;
 import dev.compactmods.crafting.client.ClientPacketHandler;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.api.distmarker.Dist;
@@ -15,7 +15,7 @@
 
 public class FieldActivatedPacket extends FieldChangedPacket {
 
-    public FieldActivatedPacket(FieldProjectionSize fieldSize, BlockPos fieldCenter) {
+    public FieldActivatedPacket(MiniaturizationFieldSize fieldSize, BlockPos fieldCenter) {
         super(fieldSize, fieldCenter);
     }
 
diff --git a/src/main/java/dev/compactmods/crafting/network/FieldChangedPacket.java b/src/main/java/dev/compactmods/crafting/network/FieldChangedPacket.java
@@ -2,24 +2,24 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.util.math.BlockPos;
 
 public class FieldChangedPacket {
 
-    protected FieldProjectionSize fieldSize;
+    protected MiniaturizationFieldSize fieldSize;
     protected BlockPos fieldCenter;
     protected BlockPos[] projectorLocations;
 
     protected static final Codec<FieldChangedPacket> CODEC = RecordCodecBuilder.create(i -> i.group(
-            Codec.STRING.xmap(FieldProjectionSize::valueOf, Enum::name)
+            Codec.STRING.xmap(MiniaturizationFieldSize::valueOf, Enum::name)
                     .fieldOf("size").forGetter(x -> x.fieldSize),
 
             BlockPos.CODEC.fieldOf("center").forGetter(x -> x.fieldCenter)
 
     ).apply(i, FieldChangedPacket::new));
 
-    protected FieldChangedPacket(FieldProjectionSize fieldSize, BlockPos center) {
+    protected FieldChangedPacket(MiniaturizationFieldSize fieldSize, BlockPos center) {
         this.fieldSize = fieldSize;
         this.fieldCenter = center;
         this.projectorLocations = fieldSize.getProjectorLocations(center).toArray(BlockPos[]::new);
diff --git a/src/main/java/dev/compactmods/crafting/network/FieldDeactivatedPacket.java b/src/main/java/dev/compactmods/crafting/network/FieldDeactivatedPacket.java
@@ -2,7 +2,7 @@
 
 import dev.compactmods.crafting.CompactCrafting;
 import dev.compactmods.crafting.client.ClientPacketHandler;
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.api.distmarker.Dist;
@@ -15,7 +15,7 @@
 
 public class FieldDeactivatedPacket extends FieldChangedPacket {
 
-    public FieldDeactivatedPacket(FieldProjectionSize fieldSize, BlockPos fieldCenter) {
+    public FieldDeactivatedPacket(MiniaturizationFieldSize fieldSize, BlockPos fieldCenter) {
         super(fieldSize, fieldCenter);
     }
 
diff --git a/src/main/java/dev/compactmods/crafting/projector/ProjectorHelper.java b/src/main/java/dev/compactmods/crafting/projector/ProjectorHelper.java
@@ -1,6 +1,6 @@
 package dev.compactmods.crafting.projector;
 
-import dev.compactmods.crafting.api.field.FieldProjectionSize;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.projector.block.FieldProjectorBlock;
 import dev.compactmods.crafting.util.DirectionUtil;
 import net.minecraft.block.BlockState;
@@ -15,7 +15,7 @@
  * Contains utility methods for working with a set of projectors in a given space.
  */
 public abstract class ProjectorHelper {
-    public static Optional<BlockPos> getOppositePositionForSize(IWorldReader world, BlockPos initial, FieldProjectionSize size) {
+    public static Optional<BlockPos> getOppositePositionForSize(IWorldReader world, BlockPos initial, MiniaturizationFieldSize size) {
         Optional<Direction> facing = FieldProjectorBlock.getDirection(world, initial);
 
         // Initial wasn't a valid field projector, can't get direction to look in
@@ -26,8 +26,8 @@ public static Optional<BlockPos> getOppositePositionForSize(IWorldReader world,
         return Optional.of(size.getOppositeProjectorPosition(initial, fieldDirection));
     }
 
-    public static Optional<FieldProjectionSize> getClosestOppositeSize(IWorldReader level, BlockPos initial, Direction facing) {
-        return Stream.of(FieldProjectionSize.VALID_SIZES)
+    public static Optional<MiniaturizationFieldSize> getClosestOppositeSize(IWorldReader level, BlockPos initial, Direction facing) {
+        return Stream.of(MiniaturizationFieldSize.VALID_SIZES)
                 .filter(size -> {
                     BlockPos oppPos = size.getOppositeProjectorPosition(initial, facing);
                     BlockState oppState = level.getBlockState(oppPos);
@@ -41,8 +41,8 @@ public static Optional<FieldProjectionSize> getClosestOppositeSize(IWorldReader
                 .findFirst();
     }
 
-    public static Optional<FieldProjectionSize> getClosestOppositeSize(IWorldReader world, BlockPos initial) {
-        for (FieldProjectionSize size : FieldProjectionSize.VALID_SIZES) {
+    public static Optional<MiniaturizationFieldSize> getClosestOppositeSize(IWorldReader world, BlockPos initial) {
+        for (MiniaturizationFieldSize size : MiniaturizationFieldSize.VALID_SIZES) {
             if (hasProjectorOpposite(world, initial, size)) {
                 return Optional.of(size);
             }
@@ -62,7 +62,7 @@ public static Optional<FieldProjectionSize> getClosestOppositeSize(IWorldReader
      *
      * @return True if there is an opposing projector facing the same center as the initial position.
      */
-    public static boolean hasProjectorOpposite(IWorldReader world, BlockPos initial, FieldProjectionSize size) {
+    public static boolean hasProjectorOpposite(IWorldReader world, BlockPos initial, MiniaturizationFieldSize size) {
         Optional<Direction> initialFacing = FieldProjectorBlock.getDirection(world, initial);
 
         // Initial wasn't a valid field projector, can't get direction to look in
@@ -84,11 +84,11 @@ public static boolean hasProjectorOpposite(IWorldReader world, BlockPos initial,
     }
 
     public static Stream<BlockPos> getValidOppositePositions(BlockPos initial, Direction facing) {
-        return Stream.of(FieldProjectionSize.VALID_SIZES)
+        return Stream.of(MiniaturizationFieldSize.VALID_SIZES)
                 .map(s -> s.getOppositeProjectorPosition(initial, facing));
     }
 
-    public static boolean hasValidCrossProjector(IWorldReader world, BlockPos initialProjector, Direction projectorFacing, FieldProjectionSize size) {
+    public static boolean hasValidCrossProjector(IWorldReader world, BlockPos initialProjector, Direction projectorFacing, MiniaturizationFieldSize size) {
         Direction.Axis crossAxis = DirectionUtil.getCrossDirectionAxis(projectorFacing.getAxis());
 
         // Filter by at least one valid cross-axis projector
@@ -113,12 +113,12 @@ public static boolean hasValidCrossProjector(IWorldReader world, BlockPos initia
     }
 
     public static Stream<BlockPos> getMissingProjectors(IWorldReader level, BlockPos initialProjector, Direction projectorFacing) {
-        Optional<FieldProjectionSize> fieldSize = ProjectorHelper.getClosestOppositeSize(level, initialProjector);
+        Optional<MiniaturizationFieldSize> fieldSize = ProjectorHelper.getClosestOppositeSize(level, initialProjector);
 
         // If we have a field size, an opposing projector was found
         // Just show particles where to place the two projectors on the cross axis
         if (fieldSize.isPresent()) {
-            FieldProjectionSize size = fieldSize.get();
+            MiniaturizationFieldSize size = fieldSize.get();
             BlockPos center = size.getCenterFromProjector(initialProjector, projectorFacing);
 
             return size.getProjectorLocations(center)
@@ -127,13 +127,13 @@ public static Stream<BlockPos> getMissingProjectors(IWorldReader level, BlockPos
         } else {
             // No opposing projector to limit field size.
             // Scan for a cross-axis projector to try to limit.
-            Optional<FieldProjectionSize> firstMatchedSize = Stream.of(FieldProjectionSize.VALID_SIZES)
+            Optional<MiniaturizationFieldSize> firstMatchedSize = Stream.of(MiniaturizationFieldSize.VALID_SIZES)
                     .filter(size -> hasValidCrossProjector(level, initialProjector, projectorFacing, size))
                     .findFirst();
 
             if (firstMatchedSize.isPresent()) {
                 // One of the projectors on the cross axis were valid
-                FieldProjectionSize matchedSize = firstMatchedSize.get();
+                MiniaturizationFieldSize matchedSize = firstMatchedSize.get();
 
                 BlockPos matchedCenter = matchedSize.getCenterFromProjector(initialProjector, projectorFacing);
                 return matchedSize.getProjectorLocations(matchedCenter)
@@ -145,7 +145,7 @@ public static Stream<BlockPos> getMissingProjectors(IWorldReader level, BlockPos
         }
     }
 
-    public static boolean projectorFacesCenter(IWorldReader world, BlockPos proj, BlockPos actualCenter, FieldProjectionSize size) {
+    public static boolean projectorFacesCenter(IWorldReader world, BlockPos proj, BlockPos actualCenter, MiniaturizationFieldSize size) {
         return FieldProjectorBlock.getDirection(world, proj)
                 .map(projFacing -> size.getCenterFromProjector(proj, projFacing).equals(actualCenter))
                 .orElse(false);
diff --git a/src/main/java/dev/compactmods/crafting/projector/block/FieldProjectorBlock.java b/src/main/java/dev/compactmods/crafting/projector/block/FieldProjectorBlock.java
diff --git a/src/main/java/dev/compactmods/crafting/projector/tile/FieldProjectorTile.java b/src/main/java/dev/compactmods/crafting/projector/tile/FieldProjectorTile.java
diff --git a/src/main/java/dev/compactmods/crafting/recipes/MiniaturizationRecipe.java b/src/main/java/dev/compactmods/crafting/recipes/MiniaturizationRecipe.java
diff --git a/src/main/java/dev/compactmods/crafting/recipes/MiniaturizationRecipeCodec.java b/src/main/java/dev/compactmods/crafting/recipes/MiniaturizationRecipeCodec.java
diff --git a/src/test/java/dev/compactmods/crafting/tests/util/BlockSpaceUtilTests.java b/src/test/java/dev/compactmods/crafting/tests/util/BlockSpaceUtilTests.java
