From ea91d852af7c03484ab52596ee716c5e439ec77c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 4 Aug 2019 19:07:10 +0300 Subject: [PATCH] Fix industrial grinder from crashing --- .../IndustrialGrinderBlockEntity.java | 2 +- src/main/java/techreborn/rei/ReiPlugin.java | 33 ++++++++++--------- .../recipes/industrial_grinder/iron_ore.json | 25 ++++++++++++++ 3 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index c60f80333..1dceaf073 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -65,7 +65,7 @@ public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity impl super(TRBlockEntities.INDUSTRIAL_GRINDER, "IndustrialGrinder", maxInput, maxEnergy, TRContent.Machine.INDUSTRIAL_GRINDER.block, 7); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] {2, 3, 4, 5}; - this.inventory = new RebornInventory<>(8, "IndustrialGrinderBlockEntity", 64, this, getInventoryAccess()); + this.inventory = new RebornInventory<>(8, "IndustrialGrinderBlockEntity", 64, this).withConfiguredAccess(); this.crafter = new RecipeCrafter(ModRecipes.INDUSTRIAL_GRINDER, this, 1, 4, this.inventory, inputs, outputs); this.tank = new Tank("IndustrialGrinderBlockEntity", IndustrialGrinderBlockEntity.TANK_CAPACITY, this); this.ticksSinceLastChange = 0; diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 05f229e56..5e01d6f06 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -34,6 +34,9 @@ import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RecipeManager; import techreborn.TechReborn; +import techreborn.api.recipe.recipes.BlastFurnaceRecipe; +import techreborn.api.recipe.recipes.IndustrialGrinderRecipe; +import techreborn.api.recipe.recipes.IndustrialSawmillRecipe; import techreborn.init.ModRecipes; import techreborn.init.TRContent; import techreborn.init.TRContent.Machine; @@ -74,21 +77,21 @@ public class ReiPlugin implements REIPluginEntry { @Override public void registerPluginCategories(RecipeHelper recipeHelper) { - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.ALLOY_SMELTER)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.ASSEMBLING_MACHINE)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.BLAST_FURNACE)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.CENTRIFUGE, 4)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.CHEMICAL_REACTOR)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.COMPRESSOR, 1)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.DISTILLATION_TOWER, 3)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.EXTRACTOR, 1)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.GRINDER, 1)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.IMPLOSION_COMPRESSOR)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_ELECTROLYZER, 4)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_GRINDER)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_SAWMILL, 3)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.SCRAPBOX)); - recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.VACUUM_FREEZER, 1)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.ALLOY_SMELTER)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.ASSEMBLING_MACHINE)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.BLAST_FURNACE)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.CENTRIFUGE, 4)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.CHEMICAL_REACTOR)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.COMPRESSOR, 1)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.DISTILLATION_TOWER, 3)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.EXTRACTOR, 1)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.GRINDER, 1)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.IMPLOSION_COMPRESSOR)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_ELECTROLYZER, 4)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_GRINDER, 3)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_SAWMILL, 3)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.SCRAPBOX)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.VACUUM_FREEZER, 1)); } @Override diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json new file mode 100644 index 000000000..48bd8d797 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/iron_ore.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 64, + "time": 100, + "ingredients": [ + { + "item": "minecraft:iron_ore" + }, + { + "fluid": "minecraft:water" + } + ], + "results": [ + { + "item": "techreborn:iron_dust", + "count": 2 + }, + { + "item": "techreborn:tin_small_dust" + }, + { + "item": "techreborn:nickel_small_dust" + } + ] +} \ No newline at end of file