Cleaning up a bunch of annotations and saveddata

Author: robotgryphon

.github/workflows/ci-tests-nightly.yml

@@ -17,7 +17,6 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       release_type: ${{steps.cf_release_type.outputs.value }}
-      mod_version: ${{steps.mod_version.outputs.value }}
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -29,13 +28,6 @@ jobs:
           path: './gradle.properties'
           property: 'cf_release_type'
 
-      - name: Mod Version
-        id: mod_version
-        uses: christian-draeger/[email protected]
-        with:
-          path: './gradle.properties'
-          property: 'mod_version'
-
   tests:
     name: Gradle Tests
     runs-on: ubuntu-20.04

build.gradle

@@ -53,12 +53,12 @@ def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true"
 
 task getBuildInfo() {
     println("Mod ID: ${mod_id}")
-    println("Version: ${isRelease ? mod_version : nightlyVersion}")
+    println("Version: ${isRelease ? semver : nightlyVersion}")
     println("Semver Version: ${semver}")
     println("Nightly Build: ${nightlyVersion}")
 }
 
-version = isRelease ? mod_version : nightlyVersion
+version = isRelease ? semver : nightlyVersion
 group = "dev.compactmods"
 archivesBaseName = mod_id
 

gradle.properties

@@ -7,7 +7,6 @@ minecraft_version=1.18.1
 forge_version=39.0.88
 
 mod_id=compactmachines
-mod_version=4.0.0-beta.7
 
 # Dependencies and Libs
 jei_mc_version=1.18.1

src/api/java/dev/compactmods/machines/api/core/CMCommands.java

@@ -0,0 +1,20 @@
+package dev.compactmods.machines.api.core;
+
+import net.minecraft.resources.ResourceLocation;
+
+import static dev.compactmods.machines.api.core.Constants.MOD_ID;
+
+public class CMCommands {
+    public static final ResourceLocation CMD_DIM_REGISTERED = new ResourceLocation(MOD_ID, "level_registered");
+    public static final ResourceLocation CMD_DIM_NOT_FOUND = new ResourceLocation(MOD_ID, "level_not_found");
+
+    /**
+     * Used for displaying the number of registered machines via summary commands.
+     */
+    public static final ResourceLocation MACHINE_REG_COUNT = new ResourceLocation(MOD_ID, "machine_reg_count");
+
+    /**
+     * Used for displaying the number of registered rooms via summary commands.
+     */
+    public static final ResourceLocation ROOM_REG_COUNT = new ResourceLocation(MOD_ID, "room_reg_count");
+}

src/api/java/dev/compactmods/machines/api/room/MachineRoomConnections.java

@@ -1,14 +1,16 @@
 package dev.compactmods.machines.api.room;
 
+import net.minecraft.world.level.ChunkPos;
+
+import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Optional;
-import net.minecraft.world.level.ChunkPos;
-import org.jetbrains.annotations.NotNull;
 
 public interface MachineRoomConnections {
-    @NotNull Optional<ChunkPos> getConnectedRoom(int machineId);
+    @Nonnull
+    Optional<ChunkPos> getConnectedRoom(int machineId);
 
-    @NotNull Collection<Integer> getMachinesFor(ChunkPos chunkPos);
+    @Nonnull Collection<Integer> getMachinesFor(ChunkPos chunkPos);
 
     void registerMachine(int machine);
 

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

@@ -1,10 +1,5 @@
 package dev.compactmods.machines.datagen;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 import com.google.common.collect.Sets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -13,17 +8,25 @@
 import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
 import dev.compactmods.machines.api.core.Advancements;
 import dev.compactmods.machines.core.Registration;
-import dev.compactmods.machines.util.TranslationUtil;
-import net.minecraft.advancements.*;
+import dev.compactmods.machines.i18n.TranslationUtil;
+import net.minecraft.advancements.Advancement;
+import net.minecraft.advancements.DisplayInfo;
+import net.minecraft.advancements.FrameType;
 import net.minecraft.advancements.critereon.ImpossibleTrigger;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.data.HashCache;
 import net.minecraft.data.DataProvider;
+import net.minecraft.data.HashCache;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public class AdvancementGenerator implements DataProvider {
 
@@ -35,7 +38,7 @@ public AdvancementGenerator(DataGenerator gen) {
     }
 
     @Override
-    public void run(@NotNull HashCache cache) {
+    public void run(@Nonnull HashCache cache) {
         Path path = this.generator.getOutputFolder();
         Set<ResourceLocation> set = Sets.newHashSet();
         Consumer<Advancement> consumer = (adv) -> {

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

@@ -1,14 +1,9 @@
 package dev.compactmods.machines.datagen;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
-import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.api.machine.MachineNbt;
+import dev.compactmods.machines.core.Registration;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.loot.BlockLoot;
 import net.minecraft.data.loot.LootTableProvider;
@@ -28,7 +23,13 @@
 import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraftforge.registries.RegistryObject;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public class BlockLootGenerator extends LootTableProvider {
 
@@ -42,7 +43,7 @@ protected List<Pair<Supplier<Consumer<BiConsumer<ResourceLocation, LootTable.Bui
     }
 
     @Override
-    protected void validate(Map<ResourceLocation, LootTable> map, @NotNull ValidationContext val) {
+    protected void validate(Map<ResourceLocation, LootTable> map, @Nonnull ValidationContext val) {
         map.forEach((name, table) -> LootTables.validate(val, name, table));
     }
 

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

@@ -1,10 +1,5 @@
 package dev.compactmods.machines.datagen;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -14,10 +9,16 @@
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.HashCache;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
 
 class DataGenUtil {
-    static <T> BiConsumer<T, ResourceLocation> makeWriter(Gson gson, @NotNull HashCache cache, Path dataDir, ImmutableSet<String> pathParts, Codec<T> codec, HashMap<ResourceLocation, T> set) {
+    static <T> BiConsumer<T, ResourceLocation> makeWriter(Gson gson, @Nonnull HashCache cache, Path dataDir, ImmutableSet<String> pathParts, Codec<T> codec, HashMap<ResourceLocation, T> set) {
         return (T resource, ResourceLocation regName) -> {
             if (set.containsKey(regName)) {
                 throw new IllegalStateException("Duplicate resource " + regName);
@@ -43,7 +44,7 @@ static <T> BiConsumer<T, ResourceLocation> makeWriter(Gson gson, @NotNull HashCa
         };
     }
 
-    static <T> BiConsumer<T, ResourceLocation> makeCustomWriter(Gson gson, @NotNull HashCache cache, Path dataDir, ImmutableSet<String> pathParts, Function<T, JsonElement> writer, HashMap<ResourceLocation, T> set) {
+    static <T> BiConsumer<T, ResourceLocation> makeCustomWriter(Gson gson, @Nonnull HashCache cache, Path dataDir, ImmutableSet<String> pathParts, Function<T, JsonElement> writer, HashMap<ResourceLocation, T> set) {
         return (T resource, ResourceLocation regName) -> {
             if (set.containsKey(regName)) {
                 throw new IllegalStateException("Duplicate resource " + regName);

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

@@ -1,8 +1,5 @@
 package dev.compactmods.machines.datagen;
 
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.function.BiConsumer;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -30,7 +27,11 @@
 import net.minecraft.world.level.levelgen.StructureSettings;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.function.BiConsumer;
 
 public class LevelBiomeGenerator implements DataProvider {
     private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
@@ -44,7 +45,7 @@ public class LevelBiomeGenerator implements DataProvider {
     }
 
     @Override
-    public void run(@NotNull HashCache cache) {
+    public void run(@Nonnull HashCache cache) {
         Path data = this.generator.getOutputFolder();
 
         HashMap<ResourceLocation, Biome> biomes = Maps.newHashMap();

src/main/java/dev/compactmods/machines/CompactMachines.java

@@ -14,7 +14,8 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
 
 @Mod(CompactMachines.MOD_ID)
 public class CompactMachines {
@@ -24,7 +25,8 @@ public class CompactMachines {
 
     public static final CreativeModeTab COMPACT_MACHINES_ITEMS = new CreativeModeTab(MOD_ID) {
         @Override
-        public @NotNull ItemStack makeIcon() {
+        public @Nonnull
+        ItemStack makeIcon() {
             return new ItemStack(Registration.MACHINE_BLOCK_ITEM_NORMAL.get());
         }
     };