diff --git a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java deleted file mode 100644 index baf77354e..000000000 --- a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 - 2015 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import javax.annotation.Nullable; - -import appeng.api.recipes.ICraftHandler; -import appeng.api.recipes.IRecipeHandler; -import appeng.api.recipes.ISubItemResolver; - - -/** - * @author AlgorithmX2 - * @author thatsIch - * @version rv3 - 10.08.2015 - * @since rv0 - */ -public interface IRecipeHandlerRegistry -{ - /** - * Add a new resolver to the parser. - * - * MUST BE CALLED IN PRE-INIT - * - * @param sir sub item resolver - */ - void addNewSubItemResolver( ISubItemResolver sir ); - - /** - * resolve sub items by name. - * - * @param nameSpace namespace of item - * @param itemName full name of item - * - * @return ResolverResult or ResolverResultSet or null if could not resolve - */ - @Nullable - Object resolveItem( String nameSpace, String itemName ); -} diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java index a0f8671f7..7b3f97f2f 100644 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ b/src/api/java/appeng/api/features/IRegistryContainer.java @@ -97,11 +97,6 @@ public interface IRegistryContainer */ IPlayerRegistry players(); - /** - * get access to the ae2 recipe api - */ - IRecipeHandlerRegistry recipes(); - /** * get access to the world-gen api. */ diff --git a/src/api/java/appeng/api/recipes/ISubItemResolver.java b/src/api/java/appeng/api/recipes/ISubItemResolver.java deleted file mode 100644 index 1013986db..000000000 --- a/src/api/java/appeng/api/recipes/ISubItemResolver.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -public interface ISubItemResolver -{ - /** - * @param namespace namespace of sub item - * @param fullName name of sub item - * - * @return either a ResolveResult, or a ResolverResultSet - */ - Object resolveItemByName( String namespace, String fullName ); -} diff --git a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java deleted file mode 100644 index 7f867b4f3..000000000 --- a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.core.features.registries; - - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import javax.annotation.Nullable; - -import appeng.api.features.IRecipeHandlerRegistry; -import appeng.api.recipes.ICraftHandler; -import appeng.api.recipes.IRecipeHandler; -import appeng.api.recipes.ISubItemResolver; -import appeng.core.AELog; - - -/** - * @author AlgorithmX2 - * @author thatsIch - * @version rv3 - 10.08.2015 - * @since rv0 - */ -public class RecipeHandlerRegistry implements IRecipeHandlerRegistry -{ - private final Collection resolvers = new ArrayList<>(); - - @Override - public void addNewSubItemResolver( final ISubItemResolver sir ) - { - this.resolvers.add( sir ); - } - - @Nullable - @Override - public Object resolveItem( final String nameSpace, final String itemName ) - { - for( final ISubItemResolver sir : this.resolvers ) - { - Object rr = null; - - try - { - rr = sir.resolveItemByName( nameSpace, itemName ); - } - catch( final Throwable t ) - { - AELog.debug( t ); - } - - if( rr != null ) - { - return rr; - } - } - - return null; - } -} diff --git a/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java index 5ad03e833..efc731413 100644 --- a/src/main/java/appeng/core/features/registries/RegistryContainer.java +++ b/src/main/java/appeng/core/features/registries/RegistryContainer.java @@ -25,7 +25,6 @@ import appeng.api.features.ILocatableRegistry; import appeng.api.features.IMatterCannonAmmoRegistry; import appeng.api.features.IP2PTunnelRegistry; import appeng.api.features.IPlayerRegistry; -import appeng.api.features.IRecipeHandlerRegistry; import appeng.api.features.IRegistryContainer; import appeng.api.features.ISpecialComparisonRegistry; import appeng.api.features.IWirelessTermRegistry; @@ -61,7 +60,6 @@ public class RegistryContainer implements IRegistryContainer private final IMovableRegistry movable = new MovableTileRegistry(); private final IMatterCannonAmmoRegistry matterCannonReg = new MatterCannonAmmoRegistry(); private final IPlayerRegistry playerRegistry = new PlayerRegistry(); - private final IRecipeHandlerRegistry recipeReg = new RecipeHandlerRegistry(); private final IPartModels partModels = new PartModels(); @Override @@ -130,12 +128,6 @@ public class RegistryContainer implements IRegistryContainer return this.playerRegistry; } - @Override - public IRecipeHandlerRegistry recipes() - { - return this.recipeReg; - } - @Override public IWorldGen worldgen() {