Refactor a bunch of packages. Again. (No api breaks, this is all internal)

Author: robotgryphon

src/api/java/dev/compactmods/machines/api/machine/MachineNbt.java

@@ -0,0 +1,6 @@
+package dev.compactmods.machines.api.machine;
+
+public abstract class MachineNbt {
+    public static final String OWNER = "owner";
+    public final static String ID = "machine_id";
+}

src/datagen/java/dev/compactmods/machines/datagen/BlockLootGenerator.java

@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
 import dev.compactmods.machines.core.Registration;
-import dev.compactmods.machines.data.NbtConstants;
+import dev.compactmods.machines.api.machine.MachineNbt;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.loot.BlockLoot;
 import net.minecraft.data.loot.LootTableProvider;
@@ -66,8 +66,8 @@ protected void addTables() {
         }
 
         private final LootItemFunction.Builder CopyOwnerAndReferenceFunction = CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-                .copy(NbtConstants.ROOM_OWNER, NbtConstants.ROOM_OWNER)
-                .copy(NbtConstants.MACHINE_ID, NbtConstants.MACHINE_ID);
+                .copy(MachineNbt.OWNER, MachineNbt.OWNER)
+                .copy(MachineNbt.ID, MachineNbt.ID);
 
         private void registerCompactMachineBlockDrops(RegistryObject<Block> block, RegistryObject<Item> item) {
             LootPool.Builder builder = LootPool.lootPool()

src/datagen/java/dev/compactmods/machines/datagen/DataGeneration.java

@@ -22,7 +22,7 @@ public static void gatherData(GatherDataEvent event) throws IOException {
 
     private static void registerServerProviders(DataGenerator generator, GatherDataEvent event) throws IOException {
         ExistingFileHelper helper = event.getExistingFileHelper();
-        generator.addProvider(new LevelBiomeGenerator(generator, helper));
+        generator.addProvider(new LevelBiomeGenerator(generator));
 
         generator.addProvider(new BlockLootGenerator(generator));
         generator.addProvider(new RecipeGenerator(generator));

src/datagen/java/dev/compactmods/machines/datagen/DimensionTypeBuilder.java

@@ -9,6 +9,7 @@
  * Used for building dimension types, since Mojang hasn't provided one.
  * By default, this pulls all the overworld values. See {@link DimensionType#DEFAULT_OVERWORLD} for more info,
  */
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class DimensionTypeBuilder {
     private OptionalLong fixedTime = OptionalLong.empty();
     private boolean hasSkylight = true;

src/datagen/java/dev/compactmods/machines/datagen/ItemModelGenerator.java

@@ -1,7 +1,7 @@
 package dev.compactmods.machines.datagen;
 
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.rooms.RoomSize;
+import dev.compactmods.machines.room.RoomSize;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;

src/datagen/java/dev/compactmods/machines/datagen/LevelBiomeGenerator.java

@@ -30,7 +30,6 @@
 import net.minecraft.world.level.levelgen.StructureSettings;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import net.minecraftforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
 
 public class LevelBiomeGenerator implements DataProvider {
@@ -40,11 +39,8 @@ public class LevelBiomeGenerator implements DataProvider {
     private final ResourceLocation COMPACT_BIOME = new ResourceLocation(CompactMachines.MOD_ID, "machine");
     private final ResourceLocation COMPACT_LEVEL = new ResourceLocation(CompactMachines.MOD_ID, "compact_world");
 
-    private final ExistingFileHelper existing;
-
-    LevelBiomeGenerator(DataGenerator generator, ExistingFileHelper files) {
+    LevelBiomeGenerator(DataGenerator generator) {
         this.generator = generator;
-        this.existing = files;
     }
 
     @Override

src/datagen/java/dev/compactmods/machines/datagen/StateGenerator.java

@@ -3,7 +3,7 @@
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.machine.CompactMachineBlock;
 import dev.compactmods.machines.core.Registration;
-import dev.compactmods.machines.rooms.RoomSize;
+import dev.compactmods.machines.room.RoomSize;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.client.model.generators.ConfiguredModel;

src/main/java/dev/compactmods/machines/advancement/AdvancementTriggers.java

@@ -4,7 +4,7 @@
 import dev.compactmods.machines.advancement.trigger.ClaimedMachineTrigger;
 import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
 import dev.compactmods.machines.api.core.Advancements;
-import dev.compactmods.machines.rooms.RoomSize;
+import dev.compactmods.machines.room.RoomSize;
 import net.minecraft.advancements.CriteriaTriggers;
 
 public class AdvancementTriggers {

src/main/java/dev/compactmods/machines/data/codec/CodecExtensions.java renamed to src/main/java/dev/compactmods/machines/codec/CodecExtensions.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.data.codec;
+package dev.compactmods.machines.codec;
 
 import java.util.UUID;
 import java.util.stream.DoubleStream;

src/main/java/dev/compactmods/machines/data/codec/DoubleStreamExtensions.java renamed to src/main/java/dev/compactmods/machines/codec/DoubleStreamExtensions.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.data.codec;
+package dev.compactmods.machines.codec;
 
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;