dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide the RS API behind a singleton instance

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-09-10 14:29:21 +02:00
parent dfb94f0580
commit 408c818d04
8 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/refinedstorage/api/IAPI.java Executable file
View File

@@ -0,0 +1,10 @@
package refinedstorage.api;
import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
import refinedstorage.api.solderer.ISoldererRegistry;
public interface IAPI {
ISoldererRegistry getSoldererRegistry();
ICraftingTaskRegistry getCraftingTaskRegistry();
}

29
src/main/java/refinedstorage/api/RefinedStorageAPI.java
View File

@@ -1,16 +1,25 @@
package refinedstorage.api; package refinedstorage.api;
import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; import java.lang.reflect.Field;
import refinedstorage.api.solderer.ISoldererRegistry;
public final class RefinedStorageAPI { public final class RefinedStorageAPI {
/** private static final String API_IMPL_CLASS = "refinedstorage.apiimpl.API";
* The solderer registry, set in pre-initialization private static final String API_IMPL_FIELD = "INSTANCE";
*/
public static ISoldererRegistry SOLDERER_REGISTRY;
/** private static final IAPI API;
* The crafting task registry, set in pre-initialization
*/ static {
public static ICraftingTaskRegistry CRAFTING_TASK_REGISTRY; try {
Class<?> apiClass = Class.forName(API_IMPL_CLASS);
Field apiField = apiClass.getField(API_IMPL_FIELD);
API = (IAPI) apiField.get(apiClass);
} catch (Exception e) {
throw new Error("The Refined Storage API implementation is unavailable, make sure Refined Storage is installed");
}
}
public static IAPI instance() {
return API;
}
} }

2
src/main/java/refinedstorage/api/network/NetworkUtils.java
View File

@@ -28,7 +28,7 @@ public final class NetworkUtils {
} }
public static ICraftingTask createCraftingTask(INetworkMaster network, ICraftingPattern pattern) { public static ICraftingTask createCraftingTask(INetworkMaster network, ICraftingPattern pattern) {
return RefinedStorageAPI.CRAFTING_TASK_REGISTRY.getFactory(pattern.getId()).create(network.getNetworkWorld(), null, pattern); return RefinedStorageAPI.instance().getCraftingTaskRegistry().getFactory(pattern.getId()).create(network.getNetworkWorld(), null, pattern);
} }
public static boolean hasPattern(INetworkMaster network, ItemStack stack) { public static boolean hasPattern(INetworkMaster network, ItemStack stack) {

24
src/main/java/refinedstorage/apiimpl/API.java Executable file
View File

@@ -0,0 +1,24 @@
package refinedstorage.apiimpl;
import refinedstorage.api.IAPI;
import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
import refinedstorage.api.solderer.ISoldererRegistry;
import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry;
import refinedstorage.apiimpl.solderer.SoldererRegistry;
public class API implements IAPI {
public static final IAPI INSTANCE = new API();
private ISoldererRegistry soldererRegistry = new SoldererRegistry();
private ICraftingTaskRegistry craftingTaskRegistry = new CraftingTaskRegistry();
@Override
public ISoldererRegistry getSoldererRegistry() {
return soldererRegistry;
}
@Override
public ICraftingTaskRegistry getCraftingTaskRegistry() {
return craftingTaskRegistry;
}
}

2
src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java
View File

@@ -11,7 +11,7 @@ public final class RecipeMakerSolderer {
public static List<RecipeWrapperSolderer> getRecipes() { public static List<RecipeWrapperSolderer> getRecipes() {
List<RecipeWrapperSolderer> recipes = new ArrayList<>(); List<RecipeWrapperSolderer> recipes = new ArrayList<>();
for (ISoldererRecipe recipe : RefinedStorageAPI.SOLDERER_REGISTRY.getRecipes()) { for (ISoldererRecipe recipe : RefinedStorageAPI.instance().getSoldererRegistry().getRecipes()) {
List<ItemStack> inputs = new ArrayList<>(); List<ItemStack> inputs = new ArrayList<>();
inputs.add(recipe.getRow(0)); inputs.add(recipe.getRow(0));

58
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -20,7 +20,6 @@ import refinedstorage.RefinedStorageItems;
import refinedstorage.api.RefinedStorageAPI; import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactoryNormal; import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactoryNormal;
import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactoryProcessing; import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactoryProcessing;
import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry;
import refinedstorage.apiimpl.solderer.*; import refinedstorage.apiimpl.solderer.*;
import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
@@ -46,11 +45,8 @@ public class CommonProxy {
IntegrationCraftingTweaks.register(); IntegrationCraftingTweaks.register();
} }
RefinedStorageAPI.SOLDERER_REGISTRY = new SoldererRegistry(); RefinedStorageAPI.instance().getCraftingTaskRegistry().addFactory(CraftingTaskFactoryNormal.ID, new CraftingTaskFactoryNormal());
RefinedStorageAPI.instance().getCraftingTaskRegistry().addFactory(CraftingTaskFactoryProcessing.ID, new CraftingTaskFactoryProcessing());
RefinedStorageAPI.CRAFTING_TASK_REGISTRY = new CraftingTaskRegistry();
RefinedStorageAPI.CRAFTING_TASK_REGISTRY.addFactory(CraftingTaskFactoryNormal.ID, new CraftingTaskFactoryNormal());
RefinedStorageAPI.CRAFTING_TASK_REGISTRY.addFactory(CraftingTaskFactoryProcessing.ID, new CraftingTaskFactoryProcessing());
int id = 0; int id = 0;
@@ -142,14 +138,14 @@ public class CommonProxy {
OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON); OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON);
// Processors // Processors
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED));
// Silicon // Silicon
GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RefinedStorageItems.SILICON), 0.5f); GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RefinedStorageItems.SILICON), 0.5f);
@@ -210,7 +206,7 @@ public class CommonProxy {
); );
// Disk Drive // Disk Drive
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.DISK_DRIVE), new ItemStack(RefinedStorageBlocks.DISK_DRIVE),
500, 500,
new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
@@ -252,7 +248,7 @@ public class CommonProxy {
); );
// Crafting Grid // Crafting Grid
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()), new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
500, 500,
new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
@@ -261,7 +257,7 @@ public class CommonProxy {
)); ));
// Pattern Grid // Pattern Grid
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.PATTERN.getId()), new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
500, 500,
new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
@@ -270,7 +266,7 @@ public class CommonProxy {
)); ));
// Fluid Grid // Fluid Grid
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.FLUID.getId()), new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.FLUID.getId()),
500, 500,
new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
@@ -527,10 +523,10 @@ public class CommonProxy {
'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
)); ));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_CRAFTING)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_CRAFTING));
GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK), GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
"USU", "USU",
@@ -541,16 +537,16 @@ public class CommonProxy {
); );
// Storage Blocks // Storage Blocks
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K));
// Fluid Storage Blocks // Fluid Storage Blocks
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K));
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K)); RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K));
// Crafting Monitor // Crafting Monitor
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageBlocks.CRAFTING_MONITOR), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageBlocks.CRAFTING_MONITOR),
@@ -564,7 +560,7 @@ public class CommonProxy {
)); ));
// Interface // Interface
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.INTERFACE), new ItemStack(RefinedStorageBlocks.INTERFACE),
200, 200,
new ItemStack(RefinedStorageBlocks.IMPORTER), new ItemStack(RefinedStorageBlocks.IMPORTER),
@@ -573,7 +569,7 @@ public class CommonProxy {
)); ));
// Fluid Interface // Fluid Interface
RefinedStorageAPI.SOLDERER_REGISTRY.addRecipe(new SoldererRecipeBasic( RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeBasic(
new ItemStack(RefinedStorageBlocks.FLUID_INTERFACE), new ItemStack(RefinedStorageBlocks.FLUID_INTERFACE),
200, 200,
new ItemStack(Items.BUCKET), new ItemStack(Items.BUCKET),

2
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -729,7 +729,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
if (container instanceof ICraftingPatternContainer) { if (container instanceof ICraftingPatternContainer) {
ICraftingPattern pattern = ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) container); ICraftingPattern pattern = ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) container);
ICraftingTaskFactory factory = RefinedStorageAPI.CRAFTING_TASK_REGISTRY.getFactory(tag.getString(NBT_CRAFTING_TASK_TYPE)); ICraftingTaskFactory factory = RefinedStorageAPI.instance().getCraftingTaskRegistry().getFactory(tag.getString(NBT_CRAFTING_TASK_TYPE));
if (factory != null) { if (factory != null) {
return factory.create(world, tag, pattern); return factory.create(world, tag, pattern);

4
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -63,7 +63,7 @@ public class TileSolderer extends TileNode {
if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && items.getStackInSlot(3) == null) { if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && items.getStackInSlot(3) == null) {
stop(); stop();
} else { } else {
ISoldererRecipe newRecipe = RefinedStorageAPI.SOLDERER_REGISTRY.getRecipe(items); ISoldererRecipe newRecipe = RefinedStorageAPI.instance().getSoldererRegistry().getRecipe(items);
if (newRecipe == null) { if (newRecipe == null) {
stop(); stop();
@@ -131,7 +131,7 @@ public class TileSolderer extends TileNode {
readItems(items, 0, tag); readItems(items, 0, tag);
readItems(upgrades, 1, tag); readItems(upgrades, 1, tag);
recipe = RefinedStorageAPI.SOLDERER_REGISTRY.getRecipe(items); recipe = RefinedStorageAPI.instance().getSoldererRegistry().getRecipe(items);
if (tag.hasKey(NBT_WORKING)) { if (tag.hasKey(NBT_WORKING)) {
working = tag.getBoolean(NBT_WORKING); working = tag.getBoolean(NBT_WORKING);