Contribute to porting TechGuns to 1.20.1

src/datagen/java/techguns2/datagen/BlockMetadata.java

@@ -62,25 +62,25 @@ public BlockMetadata(TBlock block, ResourceLocation id)
                         .setRolls(ConstantValue.exactly(1f))
                         .add(LootItem.lootTableItem(this.block))
                         .when(ExplosionCondition.survivesExplosion()));
-        this.recipeMetadatas = new ArrayList<RecipeMetadata<?>>();
-        this.tags = new ArrayList<TagKey<Block>>();
-        this.itemTags = new ArrayList<TagKey<Item>>();
+        this.recipeMetadatas = new ArrayList<>();
+        this.tags = new ArrayList<>();
+        this.itemTags = new ArrayList<>();
     }
 
     @Override
-    public final CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
+    public CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
     {
         return CompletableFuture.completedFuture(ImmutableList.of(new LanguageMetadata(this.langId, this.langName)));
     }
 
     @Override
-    public final CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
+    public CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.recipeMetadatas));
     }
 
     @Override
-    public final CompletableFuture<List<LootTableMetadata>> fetchLootTables()
+    public CompletableFuture<List<LootTableMetadata>> fetchLootTables()
     {
         return CompletableFuture.completedFuture(
                 ImmutableList.of(
@@ -91,7 +91,7 @@ public final CompletableFuture<List<LootTableMetadata>> fetchLootTables()
     }
 
     @Override
-    public final CompletableFuture<List<TagKey<?>>> fetchTags()
+    public CompletableFuture<List<TagKey<?>>> fetchTags()
     {
         ImmutableList.Builder<TagKey<?>> tags = ImmutableList.builder();
         for (TagKey<Block> blockTag : this.tags)
@@ -109,7 +109,7 @@ public final CompletableFuture<List<TagKey<?>>> fetchTags()
 
     public static <TBlock extends Block> BlockMetadata<TBlock> of(RegistryObject<TBlock> block)
     {
-        return new BlockMetadata<TBlock>(block);
+        return new BlockMetadata<>(block);
     }
 
 

src/datagen/java/techguns2/datagen/DataGenerators.java

@@ -12,6 +12,7 @@
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import org.jetbrains.annotations.NotNull;
 import techguns2.Techguns;
 import techguns2.datagen.providers.IItemModelProvider;
 import techguns2.datagen.providers.IRecipeMetadataProvider;
@@ -21,18 +22,14 @@
 public class DataGenerators
 {
     @SubscribeEvent
-    public static void gatherData(GatherDataEvent event) throws IOException
+    public static void gatherData(@NotNull GatherDataEvent event) throws IOException
     {
         DataGenerator generator = event.getGenerator();
         PackOutput packOutput = generator.getPackOutput();
         ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
         CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
-
-        List<Object> possibleProviders = new ArrayList<>();
-        for (var itemMetadata : ItemMetadatas.getAll())
-        {
-            possibleProviders.add(itemMetadata);
-        }
+
+        List<Object> possibleProviders = new ArrayList<>(ItemMetadatas.getAll());
 
         generator.addProvider(false, new ModRecipeProvider(packOutput, 
                 possibleProviders

src/datagen/java/techguns2/datagen/ItemMetadata.java

@@ -6,7 +6,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.ImmutableList;
 
@@ -16,6 +15,8 @@
 import net.minecraft.world.item.Item;
 import net.minecraftforge.client.model.generators.ItemModelBuilder;
 import net.minecraftforge.registries.RegistryObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import techguns2.Techguns;
 import techguns2.datagen.providers.IItemModelProvider;
 import techguns2.datagen.providers.ILangMetadataProvider;
@@ -34,7 +35,7 @@ public final class ItemMetadata<TItem extends Item> implements ILangMetadataProv
     public final List<RecipeMetadata<?>> recipeMetadatas;
     public final List<TagKey<Item>> tags;
 
-    public ItemMetadata(RegistryObject<TItem> registeredItem)
+    public ItemMetadata(@NotNull RegistryObject<TItem> registeredItem)
     {
         this(registeredItem.get(), registeredItem.getId());
     }
@@ -45,49 +46,49 @@ public ItemMetadata(TItem item, ResourceLocation id)
         this.id = id;
         this.langId = Util.makeDescriptionId("item", id);
         this.langName = this.langId;
-        this.recipeMetadatas = new ArrayList<RecipeMetadata<?>>();
-        this.tags = new ArrayList<TagKey<Item>>();
+        this.recipeMetadatas = new ArrayList<>();
+        this.tags = new ArrayList<>();
         this.itemModelGenerator = null;
     }
 
-    public final ItemMetadata<TItem> withLangName(String langName)
+    public ItemMetadata<TItem> withLangName(String langName)
     {
         this.langName = langName;
         return this;
     }
 
-    public final ItemMetadata<TItem> addRecipe(RecipeMetadata<?> recipeMetadata)
+    public ItemMetadata<TItem> addRecipe(RecipeMetadata<?> recipeMetadata)
     {
         this.recipeMetadatas.add(recipeMetadata);
         return this;
     }
 
-    public final ItemMetadata<TItem> addTag(TagKey<Item> tag)
+    public ItemMetadata<TItem> addTag(TagKey<Item> tag)
     {
         this.tags.add(tag);
         return this;
     }
 
     @Override
-    public final CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
+    public CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
     {
         return CompletableFuture.completedFuture(ImmutableList.of(new LanguageMetadata(this.langId, this.langName)));
     }
 
     @Override
-    public final CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
+    public CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.recipeMetadatas));
     }
 
     @Override
-    public final CompletableFuture<List<TagKey<?>>> fetchTags()
+    public CompletableFuture<List<TagKey<?>>> fetchTags()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.tags));
     }
 
     @Override
-    public final ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuilder> modelBuilderFactory)
+    public ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuilder> modelBuilderFactory)
     {
         String path = this.id.getPath();
         ItemModelBuilder model = modelBuilderFactory.create(path);
@@ -106,11 +107,11 @@ public final ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuild
 
     public static <TItem extends Item> ItemMetadata<TItem> of(RegistryObject<TItem> registeredItem)
     {
-        return new ItemMetadata<TItem>(registeredItem);
+        return new ItemMetadata<>(registeredItem);
     }
 
     public static <TItem extends Item> ItemMetadata<TItem> of(TItem item, ResourceLocation id)
     {
-        return new ItemMetadata<TItem>(item, id);
+        return new ItemMetadata<>(item, id);
     }
 }

src/datagen/java/techguns2/datagen/ItemMetadatas.java

@@ -380,7 +380,7 @@ public final class ItemMetadatas
 
     private static final Map<ResourceLocation, ItemMetadata<?>> METADATA_MAP;
 
-    public static final Collection<ItemMetadata<?>> getAll()
+    public static Collection<ItemMetadata<?>> getAll()
     {
         return METADATA_MAP.values();
     }

src/datagen/java/techguns2/datagen/LanguageMetadata.java

@@ -1,13 +1,4 @@
 package techguns2.datagen;
 
-public final class LanguageMetadata
-{
-    public final String id;
-    public final String value;
-
-    public LanguageMetadata(String id, String value)
-    {
-        this.id = id;
-        this.value = value;
-    }
+public record LanguageMetadata(String id, String value) {
 }

src/datagen/java/techguns2/datagen/LootTableMetadata.java

@@ -4,16 +4,5 @@
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
 
-public final class LootTableMetadata
-{
-    public final ResourceLocation id;
-    public final LootTable.Builder table;
-    public final LootContextParamSet context;
-
-    public LootTableMetadata(ResourceLocation id, LootTable.Builder table, LootContextParamSet context)
-    {
-        this.id = id;
-        this.table = table;
-        this.context = context;
-    }
+public record LootTableMetadata(ResourceLocation id, LootTable.Builder table, LootContextParamSet context) {
 }