diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c10ec6429..a6b03a63e 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -279,7 +279,7 @@ public class Mekanism */ public void addRecipes() { - if(true) + if(false) // Generate JSON files from code, disabled. { MekanismRecipes.generate(); MekanismToolsRecipes.generate(); diff --git a/src/main/java/mekanism/common/recipe/MekanismIngredient.java b/src/main/java/mekanism/common/recipe/MekanismIngredient.java new file mode 100644 index 000000000..cdf45255f --- /dev/null +++ b/src/main/java/mekanism/common/recipe/MekanismIngredient.java @@ -0,0 +1,58 @@ +package mekanism.common.recipe; + +import com.google.gson.JsonObject; +import mekanism.common.util.RecipeUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.IIngredientFactory; +import net.minecraftforge.common.crafting.JsonContext; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class MekanismIngredient extends Ingredient +{ + private final ItemStack stack; + protected MekanismIngredient(ItemStack stack) + { + super(stack); + this.stack = stack; + } + + @Override + public boolean apply(@Nullable ItemStack input) + { + if (input == null) + return false; + return RecipeUtils.areItemsEqualForCrafting(this.stack, input); + } + + public static Ingredient fromStacks(ItemStack... stacks) + { + if (stacks.length > 0) + { + for (ItemStack itemstack : stacks) + { + if (!itemstack.isEmpty()) + { + return new MekanismIngredient(itemstack); + } + } + } + + return EMPTY; + } + + // Used in _factories.json + public static class IngredientFactory implements IIngredientFactory + { + @Nonnull + @Override + public Ingredient parse(JsonContext context, JsonObject json) { + final ItemStack stack = CraftingHelper.getItemStack(json, context); + + return MekanismIngredient.fromStacks(stack); + } + } +} diff --git a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java index 11437579a..dffe828ff 100644 --- a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java +++ b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java @@ -178,7 +178,7 @@ public class RecipeGenerator { throw new IllegalArgumentException("Missing NBT mapping for Key: " + key); } } - ret.put("type", "minecraft:item_nbt"); + ret.put("type", "mekanism:item_nbt"); ret.put("nbt", tag); } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index ddc89bb53..5aab6f258 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -1,9 +1,6 @@ package mekanism.common.util; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import mekanism.api.energy.IEnergizedItem; diff --git a/src/main/resources/assets/mekanism/recipes/_factories.json b/src/main/resources/assets/mekanism/recipes/_factories.json index 1c8f653fb..148cfa9db 100644 --- a/src/main/resources/assets/mekanism/recipes/_factories.json +++ b/src/main/resources/assets/mekanism/recipes/_factories.json @@ -2,5 +2,8 @@ "recipes": { "ore_shaped": "mekanism.common.recipe.ShapedMekanismRecipe$RecipeFactory", "ore_shapeless": "mekanism.common.recipe.ShapelessMekanismRecipe$RecipeFactory" + }, + "ingredients": { + "item_nbt": "mekanism.common.recipe.MekanismIngredient$IngredientFactory" } } diff --git a/src/main/resources/assets/mekanism/recipes/armoredjetpack.json b/src/main/resources/assets/mekanism/recipes/armoredjetpack.json index 4daa60b1c..873e0ab1b 100644 --- a/src/main/resources/assets/mekanism/recipes/armoredjetpack.json +++ b/src/main/resources/assets/mekanism/recipes/armoredjetpack.json @@ -2,7 +2,7 @@ "result": { "nbt": {}, "item": "mekanism:armoredjetpack", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "D D", @@ -26,7 +26,7 @@ "J": { "nbt": {}, "item": "mekanism:jetpack", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_3.json b/src/main/resources/assets/mekanism/recipes/basicblock2_3.json index 890028e6d..3666bcd47 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_3.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_3.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "LTL", @@ -23,7 +23,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "L": { "ore": "dustLithium", diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt.json index cb0eedda5..fe5aa3e39 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TCT", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "T": { "item": "mekanism:energytablet" @@ -31,7 +31,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt.json index 276df521a..5c1b72d94 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TCT", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "T": { "item": "mekanism:energytablet" @@ -31,7 +31,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt_alt.json index 4b7d8d1b0..a47873ba7 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_3_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TCT", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "T": { "item": "mekanism:energytablet" @@ -31,7 +31,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_4.json b/src/main/resources/assets/mekanism/recipes/basicblock2_4.json index 68e50b1d9..b79db4c47 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_4.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_4.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "LCL", @@ -24,7 +24,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "L": { "ore": "dustLithium", diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt.json index 4e2a9fdb4..1f2262ecd 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "CPC", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "C": { "ore": "circuitAdvanced", @@ -32,7 +32,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt.json index b783c60a8..20dff5dd4 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "CPC", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "C": { "ore": "circuitElite", @@ -32,7 +32,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt_alt.json index 079217c6a..c9c689c33 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock2_4_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "CPC", @@ -20,7 +20,7 @@ }, "item": "mekanism:basicblock2", "data": 4, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "C": { "ore": "circuitUltimate", @@ -32,7 +32,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/basicblock_6.json b/src/main/resources/assets/mekanism/recipes/basicblock_6.json index 304b602af..e98d59488 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock_6.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock_6.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS", diff --git a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt.json index 7bb238a56..37c77baea 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS", @@ -24,7 +24,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "S": { "ore": "cobblestone", diff --git a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt.json index 6fddf5f98..6e56738a0 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS", @@ -24,7 +24,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "S": { "ore": "cobblestone", diff --git a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt_alt.json index cb9608175..e3ee23c79 100644 --- a/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/basicblock_6_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS", @@ -24,7 +24,7 @@ }, "item": "mekanism:basicblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "S": { "ore": "cobblestone", diff --git a/src/main/resources/assets/mekanism/recipes/energycube_0.json b/src/main/resources/assets/mekanism/recipes/energycube_0.json index 1a6233f43..b2d28bcfb 100644 --- a/src/main/resources/assets/mekanism/recipes/energycube_0.json +++ b/src/main/resources/assets/mekanism/recipes/energycube_0.json @@ -5,7 +5,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RTR", diff --git a/src/main/resources/assets/mekanism/recipes/energycube_0_alt.json b/src/main/resources/assets/mekanism/recipes/energycube_0_alt.json index b0a7773b8..30fefcf29 100644 --- a/src/main/resources/assets/mekanism/recipes/energycube_0_alt.json +++ b/src/main/resources/assets/mekanism/recipes/energycube_0_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ETE", @@ -20,7 +20,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "T": { "item": "mekanism:energytablet" diff --git a/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt.json b/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt.json index 508e226a2..cd223af2a 100644 --- a/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RTR", @@ -20,7 +20,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt_alt.json index 36c7e6178..1aa26985b 100644 --- a/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/energycube_0_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ATA", @@ -31,7 +31,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/flamethrower.json b/src/main/resources/assets/mekanism/recipes/flamethrower.json index 09c4e92a5..d0ca672d7 100644 --- a/src/main/resources/assets/mekanism/recipes/flamethrower.json +++ b/src/main/resources/assets/mekanism/recipes/flamethrower.json @@ -2,7 +2,7 @@ "result": { "nbt": {}, "item": "mekanism:flamethrower", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -32,7 +32,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/gastank_0.json b/src/main/resources/assets/mekanism/recipes/gastank_0.json index d05a1160a..03c76dcb0 100644 --- a/src/main/resources/assets/mekanism/recipes/gastank_0.json +++ b/src/main/resources/assets/mekanism/recipes/gastank_0.json @@ -5,7 +5,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "APA", diff --git a/src/main/resources/assets/mekanism/recipes/gastank_0_alt.json b/src/main/resources/assets/mekanism/recipes/gastank_0_alt.json index d48b9513f..cf05f2bf9 100644 --- a/src/main/resources/assets/mekanism/recipes/gastank_0_alt.json +++ b/src/main/resources/assets/mekanism/recipes/gastank_0_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "APA", @@ -28,7 +28,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt.json b/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt.json index 928e4cabb..ecc1ee807 100644 --- a/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "APA", @@ -28,7 +28,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt_alt.json index fcdd69854..2ac01875f 100644 --- a/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/gastank_0_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "APA", @@ -28,7 +28,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/gaugedropper.json b/src/main/resources/assets/mekanism/recipes/gaugedropper.json index c22bb8b18..787bdf9f3 100644 --- a/src/main/resources/assets/mekanism/recipes/gaugedropper.json +++ b/src/main/resources/assets/mekanism/recipes/gaugedropper.json @@ -2,7 +2,7 @@ "result": { "nbt": {}, "item": "mekanism:gaugedropper", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ " O ", diff --git a/src/main/resources/assets/mekanism/recipes/jetpack.json b/src/main/resources/assets/mekanism/recipes/jetpack.json index 66a61ab3f..0add4bbb1 100644 --- a/src/main/resources/assets/mekanism/recipes/jetpack.json +++ b/src/main/resources/assets/mekanism/recipes/jetpack.json @@ -2,7 +2,7 @@ "result": { "nbt": {}, "item": "mekanism:jetpack", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS", @@ -29,7 +29,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_0.json b/src/main/resources/assets/mekanism/recipes/machineblock2_0.json index dcee89ffc..bea7e4dd5 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_0.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_0.json @@ -20,7 +20,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "item": "mekanism:energytablet" @@ -35,7 +35,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json index f8217203a..1016100c0 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json @@ -31,7 +31,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_10.json b/src/main/resources/assets/mekanism/recipes/machineblock2_10.json index 7aae4ff9c..df218f2a1 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_10.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_10.json @@ -31,7 +31,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "I": { "item": "mekanism:machineblock", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11.json index 681b599d9..7febf7201 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "AIA", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json index 322cd4349..6e9b40fc0 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "AIA", @@ -24,7 +24,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "I": { "ore": "ingotIron", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json index 500c686f0..282dfb1c7 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "AIA", @@ -24,7 +24,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "I": { "ore": "ingotIron", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json index 514722772..52f62e505 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "AIA", @@ -24,7 +24,7 @@ }, "item": "mekanism:machineblock2", "data": 11, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "I": { "ore": "ingotIron", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_14.json b/src/main/resources/assets/mekanism/recipes/machineblock2_14.json index 9879f1f4e..59153b033 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_14.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_14.json @@ -24,7 +24,7 @@ }, "item": "mekanism:energycube", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_2.json b/src/main/resources/assets/mekanism/recipes/machineblock2_2.json index 356b2c536..0194e82fb 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_2.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_2.json @@ -27,7 +27,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_6.json b/src/main/resources/assets/mekanism/recipes/machineblock2_6.json index 8a9ef7307..e05c20348 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_6.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_6.json @@ -26,7 +26,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_7.json b/src/main/resources/assets/mekanism/recipes/machineblock2_7.json index 764536cba..0a40d0d43 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_7.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_7.json @@ -26,7 +26,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "I": { "item": "mekanism:basicblock", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_8.json b/src/main/resources/assets/mekanism/recipes/machineblock2_8.json index e33b0c368..73eab2c48 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_8.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_8.json @@ -27,7 +27,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_5.json index 561f9365d..3a42bb15f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json index 2676a79a8..d8c137b61 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json index 3d81ed591..0c200d3de 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json index 0a31d94e3..e22ffa796 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json index e84587c97..06836671a 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json index c82a5ba15..480164b69 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json index 4b21f1232..9bd06dd12 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json index 8fb0d3cd3..79fe8fe62 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_6.json index fd0a05aa9..24cdec287 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json index 33b83c198..7f9ceee26 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json index 311ad3141..68caceb3e 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json index c4e571dfc..e7dd2d7f9 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json index 25b1ab581..b3381c587 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json index dfa253425..521fbcff3 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json index ec840ab20..cf74f36c6 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json index 760b8ece1..02f98feca 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "ECE", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 5, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_7.json index b42611611..12949b7d3 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json index 475ea06b7..94310b0bf 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json index d5881b782..81a809417 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json index a7fcde652..86bb32d6e 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json index cbdcd594d..8187a5012 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json index ebaa4cd48..58108f89b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json index 4a8afd663..0d538f264 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json index 0e7136c7e..c98bedd25 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json @@ -5,7 +5,7 @@ }, "item": "mekanism:machineblock", "data": 7, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RCR", @@ -32,7 +32,7 @@ }, "item": "mekanism:machineblock", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/scubatank.json b/src/main/resources/assets/mekanism/recipes/scubatank.json index d180718bb..4d2de83b3 100644 --- a/src/main/resources/assets/mekanism/recipes/scubatank.json +++ b/src/main/resources/assets/mekanism/recipes/scubatank.json @@ -2,7 +2,7 @@ "result": { "nbt": {}, "item": "mekanism:scubatank", - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ " C ", @@ -28,7 +28,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_0.json b/src/main/resources/assets/mekanism/recipes/transmitter_0.json index 11e96c8a2..a1822b497 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_0.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_0.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 0, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SRS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt.json index 690caedaf..5e61fa564 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 0, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -21,7 +21,7 @@ }, "item": "mekanism:transmitter", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt.json index a1c7e739f..0cc1e71bf 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 0, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt_alt.json index d3f695ff4..be5670b8e 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_0_alt_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 0, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_1.json b/src/main/resources/assets/mekanism/recipes/transmitter_1.json index 9374720c0..3e067fdee 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_1.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_1.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 1, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SBS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt.json index aa79de156..17a591332 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 1, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -21,7 +21,7 @@ }, "item": "mekanism:transmitter", "data": 1, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt.json index 48ada319e..8d6fe0328 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 1, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 1, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt_alt.json index e38661aa8..5cddd2e05 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_1_alt_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 1, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 1, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_2.json b/src/main/resources/assets/mekanism/recipes/transmitter_2.json index 3c35da01a..cd61d9b32 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_2.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_2.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 2, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SGS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt.json index 6e14d8c55..f440186c0 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 2, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -21,7 +21,7 @@ }, "item": "mekanism:transmitter", "data": 2, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt.json index cba1b3fdd..65d740407 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 2, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 2, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt_alt.json index d1f9cba4a..3c1c3b72d 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_2_alt_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 2, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 2, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_3.json b/src/main/resources/assets/mekanism/recipes/transmitter_3.json index 0b4699856..474f0c3f7 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_3.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_3.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 3, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt.json index 89f3ca55f..ca16889e7 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 3, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -21,7 +21,7 @@ }, "item": "mekanism:transmitter", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt.json index 1b04c5d81..1bc892453 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 3, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt_alt.json index e378e33ae..5411aa90c 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_3_alt_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 3, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 3, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_4.json b/src/main/resources/assets/mekanism/recipes/transmitter_4.json index 41246027b..c30be85d2 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_4.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_4.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 4, "count": 2, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SBS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_5.json b/src/main/resources/assets/mekanism/recipes/transmitter_5.json index 2620ebab0..e2db6a53e 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_5.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_5.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 5, "count": 2, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "RRR", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_6.json b/src/main/resources/assets/mekanism/recipes/transmitter_6.json index 010885ee5..bc5769c11 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_6.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_6.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 6, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "SCS" diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt.json index ace18dcef..30526177d 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 6, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -21,7 +21,7 @@ }, "item": "mekanism:transmitter", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "E": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt.json index 7be9c2f20..caccc5594 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 6, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt_alt.json index 535a0661a..5978392d4 100644 --- a/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/transmitter_6_alt_alt_alt.json @@ -6,7 +6,7 @@ "item": "mekanism:transmitter", "data": 6, "count": 8, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "pattern": [ "TTT", @@ -25,7 +25,7 @@ }, "item": "mekanism:transmitter", "data": 6, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanismgenerators/recipes/reactor_0.json b/src/main/resources/assets/mekanismgenerators/recipes/reactor_0.json index bec529b8b..820ba7ef1 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/reactor_0.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/reactor_0.json @@ -20,7 +20,7 @@ }, "item": "mekanism:gastank", "data": 0, - "type": "minecraft:item_nbt" + "type": "mekanism:item_nbt" }, "G": { "ore": "paneGlass",