Tool registry (#10190)

Change tooltypes from hardcoded to a registry. This allows addon makers to define their own tool types to use in custom recipes + jobs. As part of this, some of the tool level generation + checks for tool type have been unified + updated.

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/farmer/carved_pumpkin.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:carved_pumpkin",
-  "tool": "shears"
+  "tool": "minecolonies:shears"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/lumberjack/strip_bamboo_block.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:stripped_bamboo_block",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_exposed_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:copper_block",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_exposed_cut_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:cut_copper",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_oxidized_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:weathered_copper",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_oxidized_cut_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:weathered_cut_copper",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_weathered_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:exposed_copper",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/mechanic/deoxidize_weathered_cut_copper.json

@@ -8,5 +8,5 @@
   ],
   "intermediate": "minecraft:air",
   "result": "minecraft:exposed_cut_copper",
-  "tool": "axe"
+  "tool": "minecolonies:axe"
 }

src/main/java/com/minecolonies/api/IMinecoloniesAPI.java

@@ -21,6 +21,7 @@
 import com.minecolonies.api.entity.mobs.registry.IMobAIRegistry;
 import com.minecolonies.api.entity.citizen.happiness.HappinessRegistry;
 import com.minecolonies.api.entity.pathfinding.registry.IPathNavigateRegistry;
+import com.minecolonies.api.equipment.registry.EquipmentTypeEntry;
 import com.minecolonies.api.quests.registries.QuestRegistries;
 import com.minecolonies.api.research.IGlobalResearchTree;
 import com.minecolonies.api.research.ModResearchCostTypes.ResearchCostType;
@@ -98,4 +99,6 @@ static IMinecoloniesAPI getInstance()
     IForgeRegistry<HappinessRegistry.HappinessFunctionEntry> getHappinessFunctionRegistry();
 
     void onRegistryNewRegistry(NewRegistryEvent event);
+
+    IForgeRegistry<EquipmentTypeEntry> getEquipmentTypeRegistry();
 }

src/main/java/com/minecolonies/api/MinecoloniesAPIProxy.java

@@ -21,6 +21,7 @@
 import com.minecolonies.api.entity.mobs.registry.IMobAIRegistry;
 import com.minecolonies.api.entity.citizen.happiness.HappinessRegistry;
 import com.minecolonies.api.entity.pathfinding.registry.IPathNavigateRegistry;
+import com.minecolonies.api.equipment.registry.EquipmentTypeEntry;
 import com.minecolonies.api.quests.registries.QuestRegistries;
 import com.minecolonies.api.research.IGlobalResearchTree;
 import com.minecolonies.api.research.ModResearchCostTypes.ResearchCostType;
@@ -228,4 +229,10 @@ public void onRegistryNewRegistry(final NewRegistryEvent event)
     {
         apiInstance.onRegistryNewRegistry(event);
     }
+
+    @Override
+    public IForgeRegistry<EquipmentTypeEntry> getEquipmentTypeRegistry()
+    {
+        return apiInstance.getEquipmentTypeRegistry();
+    }
 }

src/main/java/com/minecolonies/api/colony/buildings/IBuilding.java

@@ -34,8 +34,8 @@
 import java.util.function.Predicate;
 
 import static com.minecolonies.api.util.constant.Suppression.GENERIC_WILDCARD;
-import static com.minecolonies.api.util.constant.ToolLevelConstants.BASIC_TOOL_LEVEL;
-import static com.minecolonies.api.util.constant.ToolLevelConstants.TOOL_LEVEL_MAXIMUM;
+import static com.minecolonies.api.util.constant.EquipmentLevelConstants.BASIC_TOOL_LEVEL;
+import static com.minecolonies.api.util.constant.EquipmentLevelConstants.TOOL_LEVEL_MAXIMUM;
 
 public interface IBuilding extends IBuildingContainer, IModuleContainer<IBuildingModule>, IRequestResolverProvider, IRequester, ISchematicProvider
 {
@@ -440,11 +440,11 @@ <R> ImmutableList<IRequest<? extends R>> getOpenRequestsOfTypeFiltered(
     boolean isItemStackInRequest(@Nullable ItemStack stack);
 
     /**
-     * Get the max tool level useable by the worker.
+     * Get the max equipment level useable by the worker.
      *
      * @return the integer.
      */
-    default int getMaxToolLevel()
+    default int getMaxEquipmentLevel()
     {
         if (getBuildingLevel() >= getMaxBuildingLevel())
         {

src/main/java/com/minecolonies/api/colony/buildings/IBuildingWorker.java

@@ -70,7 +70,7 @@ public interface IBuildingWorker extends IBuilding
      *
      * @return the integer.
      */
-    int getMaxToolLevel();
+    int getMaxEquipmentLevel();
 
     /**
      * Method which defines if a worker should be allowed to work during the rain.

src/main/java/com/minecolonies/api/colony/fields/plantation/IPlantationModule.java

@@ -2,7 +2,7 @@
 
 import com.minecolonies.api.colony.fields.modules.IFieldModule;
 import com.minecolonies.api.entity.citizen.AbstractEntityCitizen;
-import com.minecolonies.api.util.constant.ToolType;
+import com.minecolonies.api.equipment.registry.EquipmentTypeEntry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
@@ -137,7 +137,7 @@ public interface IPlantationModule extends IFieldModule
      *
      * @return the tool to work on this module.
      */
-    ToolType getRequiredTool();
+    EquipmentTypeEntry getRequiredTool();
 
     /**
      * Hashcode implementation for this field.