- minor fixes

Author: Smartin-b

common/src/main/java/smartin/miapi/item/modular/items/ModularToolMaterial.java

@@ -3,7 +3,7 @@
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
 
-public class ModularToolMaterial implements ToolMaterial{
+public class ModularToolMaterial implements ToolMaterial {
     public static ModularToolMaterial toolMaterial = new ModularToolMaterial();
 
     @Override

common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java

@@ -295,17 +295,17 @@ public static void onReloadServer() {
                     .filter(toolMaterial -> toolMaterial.getRepairIngredient() != null && toolMaterial.getRepairIngredient().getMatchingStacks() != null)
                     .filter(toolMaterial -> toolMaterial.getRepairIngredient().getMatchingStacks().length > 0)
                     .filter(toolMaterial -> !toolMaterial.getRepairIngredient().getMatchingStacks()[0].isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG))
-                    .filter(toolMaterial -> Arrays.stream(toolMaterial.getRepairIngredient().getMatchingStacks()).allMatch(itemStack -> MaterialProperty.getMaterialFromIngredient(itemStack) != null && !itemStack.getItem().equals(Items.BARRIER)))
+                    .filter(toolMaterial -> toolMaterial.getRepairIngredient().getMatchingStacks()[0].getItem().equals(Items.BARRIER))
                     .forEach(toolMaterial -> {
                         Material material = MaterialProperty.getMaterialFromIngredient(toolMaterial.getRepairIngredient().getMatchingStacks()[0]);
-                        List<Item> toolMaterials = toolItems.stream()
-                                .filter(toolMat -> toolMaterial.equals(toolMat.getMaterial()))
-                                .filter(tool -> {
-                                    ItemStack toolItem = tool.getDefaultStack();
-                                    return ModularItemStackConverter.getModularVersion(toolItem)==toolItem;
-                                })
-                                .collect(Collectors.toList());
                         if (material != null) {
+                            List<Item> toolMaterials = toolItems.stream()
+                                    .filter(toolMat -> toolMaterial.equals(toolMat.getMaterial()))
+                                    .filter(tool -> {
+                                        ItemStack toolItem = tool.getDefaultStack();
+                                        return ModularItemStackConverter.getModularVersion(toolItem)==toolItem;
+                                    })
+                                    .collect(Collectors.toList());
                             if (material.generateConverters()) {
                                 try {
                                     MiapiEvents.GENERATE_MATERIAL_CONVERTERS.invoker().generated(material, toolMaterials, false);

common/src/main/java/smartin/miapi/wiki/datapack_data_types/converter.wiki.md

@@ -2,6 +2,7 @@
 @path /datapack_data_types/converter
 @keywords modular converter, converter
 
-- a seperate JSON found in miapi/modular_converter
+- a separate JSON found in miapi/modular_converter
+- requires a unique file name/path for each converter file
 - used to convert other items into modular Items
 - Examples of Modular Converters can be found [here](https://github.com/Truly-Modular/Arsenal/tree/master/arsenal-common/src/main/resources/data/miapi/modular_converter).

common/src/main/java/smartin/miapi/wiki/datapack_data_types/create_options.wiki.md

@@ -2,6 +2,7 @@
 @path /datapack_data_types/create
 @keywords create options, create option
 
-- a seperate JSON found in miapi/create_options
+- a separate JSON found in miapi/create_options
+- - requires a unique file name/path for each converter file
 - Gives create options on the Plus button in the GUI
 - Examples of Create Options can be found [here](https://github.com/Truly-Modular/Arsenal/tree/master/arsenal-common/src/main/resources/data/miapi/create_options).

common/src/main/java/smartin/miapi/wiki/datapack_data_types/materials.wiki.md

@@ -2,7 +2,8 @@
 @path /datapack_data_types/modules
 @keywords material, materials
 
-- a seperate JSON found in miapi/materials
+- a separate JSON found in miapi/materials
+- requires a unique file name/path for each converter file
 - The API offers a diverse range of materials.
 - Materials are loosely defined JSON files that serve as references for module statistics.
 - Materials need to be added to data/miapi/materials/anyPathOrNameFromHere.json

common/src/main/java/smartin/miapi/wiki/datapack_data_types/modules.wiki.md

@@ -2,7 +2,8 @@
 @path /datapack_data_types/modules
 @keywords module, modules, module instance
 
-- a seperate JSON found in miapi/modules
+- a separate JSON found in miapi/modules
+- requires a unique file name/path for each converter file
 - The API does not include any pre-built modules.
 - Modules are not included within the API itself, but instead are outsourced to the addons to add.
 - Modules need to be added to data/miapi/modules/anyPathOrNameFromHere.json

common/src/main/java/smartin/miapi/wiki/datapack_data_types/synergies.wiki.md

@@ -3,6 +3,7 @@
 @keywords synergy, synergies
 
 - a separate JSON found in miapi/synergies
+- requires a unique file name/path for each converter file
 - used to augment modules under certain conditions
 - Examples of synergies can be found [here](https://github.com/Truly-Modular/Arsenal/tree/master/arsenal-common/src/main/resources/data/miapi/synergies).
 

forge/src/main/java/smartin/miapi/forge/TrulyModularForge.java

@@ -6,7 +6,6 @@
 import dev.architectury.registry.ReloadListenerRegistry;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
@@ -64,7 +63,6 @@ public TrulyModularForge() {
                 Miapi.LOGGER.info("couldnt load quark compat",e);
             }
         }
-        EnchantmentHelper helper;
         bus.register(new ModEvents());
         MinecraftForge.EVENT_BUS.register(new ServerEvents());
         Miapi.init();