diff --git a/build.gradle b/build.gradle index 25aea1cc8..df70078ca 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,9 @@ sourceSets { main { compileClasspath += sourceSets.api.output runtimeClasspath += sourceSets.api.output + resources { + srcDir 'src/generated/resources' + } } unported { compileClasspath += sourceSets.api.output diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java index b753fb929..ba58ae08a 100644 --- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java +++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java @@ -13,9 +13,7 @@ import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.item.Item; -import net.minecraft.tag.ItemTags; -import net.minecraft.tag.Tag; +import net.minecraft.item.BlockItem; import net.minecraft.util.math.Quaternion; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.block.entity.BlockEntityRenderer; @@ -189,8 +187,6 @@ public final class InscriberTESR extends BlockEntityRenderer storageBlockTag = ItemTags.getContainer().get(TAG_STORAGE_BLOCKS); - if (storageBlockTag == null || !stack.getItem().isIn(storageBlockTag)) { + boolean renderAsCube = (stack.getItem() instanceof BlockItem); + if (!renderAsCube) { ms.scale(0.5f, 0.5f, 0.5f); } diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index 8fe2c6b18..4b5d293b1 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -61,11 +61,11 @@ import appeng.util.Platform; public class RestrictedInputSlot extends AppEngSlot { private static final List METAL_INGOT_TAGS = ImmutableList.of( - new Identifier("forge:ingots/copper"), new Identifier("forge:ingots/tin"), - new Identifier("forge:ingots/iron"), new Identifier("forge:ingots/gold"), - new Identifier("forge:ingots/lead"), new Identifier("forge:ingots/bronze"), - new Identifier("forge:ingots/brass"), new Identifier("forge:ingots/nickel"), - new Identifier("forge:ingots/aluminium")); + new Identifier("c:copper_ingots"), new Identifier("c:tin_ingots"), + new Identifier("c:iron_ingots"), new Identifier("c:gold_ingots"), + new Identifier("c:lead_ingots"), new Identifier("c:bronze_ingots"), + new Identifier("c:brass_ingots"), new Identifier("c:nickel_ingots"), + new Identifier("c:aluminium_ingots")); private final PlacableItemType which; private final PlayerInventory p; diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index d3d0115d7..633522d84 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -41,7 +41,7 @@ public final class Api implements IAppEngApi { private final ApiDefinitions definitions; private final IClientHelper client; - Api() { + public Api() { this.storageHelper = new ApiStorage(); this.networkHelper = new ApiGrid(); this.registryContainer = new RegistryContainer(); diff --git a/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java index 3e847fec8..e705042a3 100644 --- a/src/main/java/appeng/core/AppEngBase.java +++ b/src/main/java/appeng/core/AppEngBase.java @@ -28,6 +28,7 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.TargetPoint; import appeng.fluids.container.*; import appeng.fluids.registries.BasicFluidCellGuiHandler; +import appeng.forge.data.AE2DataGenerators; import appeng.hooks.ToolItemHook; import appeng.items.tools.NetworkToolItem; import appeng.me.cache.*; @@ -99,6 +100,11 @@ public abstract class AppEngBase implements AppEng { setupInternalRegistries(); + if (System.getProperty("appeng2.generatedataendexit", "false").equals("true")) { + AE2DataGenerators.dump(); + System.exit(0); + } + } public static void setupInternalRegistries() { diff --git a/src/main/java/appeng/core/config/ConfigFileManager.java b/src/main/java/appeng/core/config/ConfigFileManager.java index fe8aed574..1a61e0357 100644 --- a/src/main/java/appeng/core/config/ConfigFileManager.java +++ b/src/main/java/appeng/core/config/ConfigFileManager.java @@ -10,7 +10,7 @@ import java.nio.file.Files; public class ConfigFileManager { - private static Gson GSON = new GsonBuilder() + private static final Gson GSON = new GsonBuilder() .setPrettyPrinting() .setLenient() .create(); diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index b2e8e8856..21c800282 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -40,77 +40,77 @@ public class MatterCannonAmmoRegistry implements IMatterCannonAmmoRegistry { private final Map itemDamageModifiers = new IdentityHashMap<>(); public MatterCannonAmmoRegistry() { - this.addTagWeight("forge:nuggets/meatraw", 32); - this.addTagWeight("forge:nuggets/meatcooked", 32); - this.addTagWeight("forge:nuggets/meat", 32); - this.addTagWeight("forge:nuggets/chicken", 32); - this.addTagWeight("forge:nuggets/beef", 32); - this.addTagWeight("forge:nuggets/sheep", 32); - this.addTagWeight("forge:nuggets/fish", 32); + this.addTagWeight("c:raw_meat_nuggets", 32); + this.addTagWeight("c:cooked_meat_nuggets", 32); + this.addTagWeight("c:meat_nuggets", 32); + this.addTagWeight("c:chicken_nuggets", 32); + this.addTagWeight("c:beef_nuggets", 32); + this.addTagWeight("c:sheep_nuggets", 32); + this.addTagWeight("c:fish_nuggets", 32); // real world... - this.addTagWeight("forge:nuggets/lithium", 6.941); - this.addTagWeight("forge:nuggets/beryllium", 9.0122); - this.addTagWeight("forge:nuggets/boron", 10.811); - this.addTagWeight("forge:nuggets/carbon", 12.0107); - this.addTagWeight("forge:nuggets/coal", 12.0107); - this.addTagWeight("forge:nuggets/charcoal", 12.0107); - this.addTagWeight("forge:nuggets/sodium", 22.9897); - this.addTagWeight("forge:nuggets/magnesium", 24.305); - this.addTagWeight("forge:nuggets/aluminum", 26.9815); - this.addTagWeight("forge:nuggets/silicon", 28.0855); - this.addTagWeight("forge:nuggets/phosphorus", 30.9738); - this.addTagWeight("forge:nuggets/sulfur", 32.065); - this.addTagWeight("forge:nuggets/potassium", 39.0983); - this.addTagWeight("forge:nuggets/calcium", 40.078); - this.addTagWeight("forge:nuggets/scandium", 44.9559); - this.addTagWeight("forge:nuggets/titanium", 47.867); - this.addTagWeight("forge:nuggets/vanadium", 50.9415); - this.addTagWeight("forge:nuggets/manganese", 54.938); - this.addTagWeight("forge:nuggets/iron", 55.845); - this.addTagWeight("forge:nuggets/gold", 196.96655); - this.addTagWeight("forge:nuggets/nickel", 58.6934); - this.addTagWeight("forge:nuggets/cobalt", 58.9332); - this.addTagWeight("forge:nuggets/copper", 63.546); - this.addTagWeight("forge:nuggets/zinc", 65.39); - this.addTagWeight("forge:nuggets/gallium", 69.723); - this.addTagWeight("forge:nuggets/germanium", 72.64); - this.addTagWeight("forge:nuggets/bromine", 79.904); - this.addTagWeight("forge:nuggets/krypton", 83.8); - this.addTagWeight("forge:nuggets/rubidium", 85.4678); - this.addTagWeight("forge:nuggets/strontium", 87.62); - this.addTagWeight("forge:nuggets/yttrium", 88.9059); - this.addTagWeight("forge:nuggets/zirconium", 91.224); - this.addTagWeight("forge:nuggets/niobium", 92.9064); - this.addTagWeight("forge:nuggets/technetium", 98); - this.addTagWeight("forge:nuggets/ruthenium", 101.07); - this.addTagWeight("forge:nuggets/rhodium", 102.9055); - this.addTagWeight("forge:nuggets/palladium", 106.42); - this.addTagWeight("forge:nuggets/silver", 107.8682); - this.addTagWeight("forge:nuggets/cadmium", 112.411); - this.addTagWeight("forge:nuggets/indium", 114.818); - this.addTagWeight("forge:nuggets/tin", 118.71); - this.addTagWeight("forge:nuggets/antimony", 121.76); - this.addTagWeight("forge:nuggets/iodine", 126.9045); - this.addTagWeight("forge:nuggets/tellurium", 127.6); - this.addTagWeight("forge:nuggets/xenon", 131.293); - this.addTagWeight("forge:nuggets/cesium", 132.9055); - this.addTagWeight("forge:nuggets/barium", 137.327); - this.addTagWeight("forge:nuggets/lanthanum", 138.9055); - this.addTagWeight("forge:nuggets/cerium", 140.116); - this.addTagWeight("forge:nuggets/tantalum", 180.9479); - this.addTagWeight("forge:nuggets/tungsten", 183.84); - this.addTagWeight("forge:nuggets/osmium", 190.23); - this.addTagWeight("forge:nuggets/iridium", 192.217); - this.addTagWeight("forge:nuggets/platinum", 195.078); - this.addTagWeight("forge:nuggets/lead", 207.2); - this.addTagWeight("forge:nuggets/bismuth", 208.9804); - this.addTagWeight("forge:nuggets/uranium", 238.0289); - this.addTagWeight("forge:nuggets/plutonium", 244); + this.addTagWeight("c:lithium_nuggets", 6.941); + this.addTagWeight("c:beryllium_nuggets", 9.0122); + this.addTagWeight("c:boron_nuggets", 10.811); + this.addTagWeight("c:carbon_nuggets", 12.0107); + this.addTagWeight("c:coal_nuggets", 12.0107); + this.addTagWeight("c:charcoal_nuggets", 12.0107); + this.addTagWeight("c:sodium_nuggets", 22.9897); + this.addTagWeight("c:magnesium_nuggets", 24.305); + this.addTagWeight("c:aluminum_nuggets", 26.9815); + this.addTagWeight("c:silicon_nuggets", 28.0855); + this.addTagWeight("c:phosphorus_nuggets", 30.9738); + this.addTagWeight("c:sulfur_nuggets", 32.065); + this.addTagWeight("c:potassium_nuggets", 39.0983); + this.addTagWeight("c:calcium_nuggets", 40.078); + this.addTagWeight("c:scandium_nuggets", 44.9559); + this.addTagWeight("c:titanium_nuggets", 47.867); + this.addTagWeight("c:vanadium_nuggets", 50.9415); + this.addTagWeight("c:manganese_nuggets", 54.938); + this.addTagWeight("c:iron_nuggets", 55.845); + this.addTagWeight("c:gold_nuggets", 196.96655); + this.addTagWeight("c:nickel_nuggets", 58.6934); + this.addTagWeight("c:cobalt_nuggets", 58.9332); + this.addTagWeight("c:copper_nuggets", 63.546); + this.addTagWeight("c:zinc_nuggets", 65.39); + this.addTagWeight("c:gallium_nuggets", 69.723); + this.addTagWeight("c:germanium_nuggets", 72.64); + this.addTagWeight("c:bromine_nuggets", 79.904); + this.addTagWeight("c:krypton_nuggets", 83.8); + this.addTagWeight("c:rubidium_nuggets", 85.4678); + this.addTagWeight("c:strontium_nuggets", 87.62); + this.addTagWeight("c:yttrium_nuggets", 88.9059); + this.addTagWeight("c:zirconium_nuggets", 91.224); + this.addTagWeight("c:niobium_nuggets", 92.9064); + this.addTagWeight("c:technetium_nuggets", 98); + this.addTagWeight("c:ruthenium_nuggets", 101.07); + this.addTagWeight("c:rhodium_nuggets", 102.9055); + this.addTagWeight("c:palladium_nuggets", 106.42); + this.addTagWeight("c:silver_nuggets", 107.8682); + this.addTagWeight("c:cadmium_nuggets", 112.411); + this.addTagWeight("c:indium_nuggets", 114.818); + this.addTagWeight("c:tin_nuggets", 118.71); + this.addTagWeight("c:antimony_nuggets", 121.76); + this.addTagWeight("c:iodine_nuggets", 126.9045); + this.addTagWeight("c:tellurium_nuggets", 127.6); + this.addTagWeight("c:xenon_nuggets", 131.293); + this.addTagWeight("c:cesium_nuggets", 132.9055); + this.addTagWeight("c:barium_nuggets", 137.327); + this.addTagWeight("c:lanthanum_nuggets", 138.9055); + this.addTagWeight("c:cerium_nuggets", 140.116); + this.addTagWeight("c:tantalum_nuggets", 180.9479); + this.addTagWeight("c:tungsten_nuggets", 183.84); + this.addTagWeight("c:osmium_nuggets", 190.23); + this.addTagWeight("c:iridium_nuggets", 192.217); + this.addTagWeight("c:platinum_nuggets", 195.078); + this.addTagWeight("c:lead_nuggets", 207.2); + this.addTagWeight("c:bismuth_nuggets", 208.9804); + this.addTagWeight("c:uranium_nuggets", 238.0289); + this.addTagWeight("c:plutonium_nuggets", 244); // TE stuff... - this.addTagWeight("forge:nuggets/invar", (58.6934 + 55.845 + 55.845) / 3.0); - this.addTagWeight("forge:nuggets/electrum", (107.8682 + 196.96655) / 2.0); + this.addTagWeight("c:invar_nuggets", (58.6934 + 55.845 + 55.845) / 3.0); + this.addTagWeight("c:electrum_nuggets", (107.8682 + 196.96655) / 2.0); } @Override diff --git a/src/main/java/appeng/forge/data/AE2DataGenerators.java b/src/main/java/appeng/forge/data/AE2DataGenerators.java new file mode 100644 index 000000000..4dd8ce844 --- /dev/null +++ b/src/main/java/appeng/forge/data/AE2DataGenerators.java @@ -0,0 +1,29 @@ +package appeng.forge.data; + +import appeng.forge.data.providers.loot.BlockDropProvider; +import appeng.forge.data.providers.recipes.SlabStairRecipes; +import appeng.forge.data.providers.tags.ConventionTagProvider; +import net.minecraft.data.DataGenerator; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; + +public class AE2DataGenerators { + + public static void dump() { + Path output = Paths.get("../src/generated/resources"); + + DataGenerator generator = new DataGenerator(output, Collections.emptyList()); + generator.install(new BlockDropProvider(output)); + generator.install(new SlabStairRecipes(output)); + generator.install(new ConventionTagProvider(output)); + try { + generator.run(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/src/unported/java/appeng/forge/data/providers/IAE2DataProvider.java b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java similarity index 79% rename from src/unported/java/appeng/forge/data/providers/IAE2DataProvider.java rename to src/main/java/appeng/forge/data/providers/IAE2DataProvider.java index 3548de4b6..1be2c7878 100644 --- a/src/unported/java/appeng/forge/data/providers/IAE2DataProvider.java +++ b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java @@ -1,13 +1,13 @@ package appeng.forge.data.providers; -import net.minecraft.data.IDataProvider; +import net.minecraft.data.DataProvider; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; import appeng.api.definitions.IMaterials; -public interface IAE2DataProvider extends IDataProvider { +public interface IAE2DataProvider extends DataProvider { IBlocks BLOCKS = AEApi.instance().definitions().blocks(); IItems ITEMS = AEApi.instance().definitions().items(); IMaterials MATERIALS = AEApi.instance().definitions().materials(); diff --git a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java new file mode 100644 index 000000000..e8c4d5123 --- /dev/null +++ b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java @@ -0,0 +1,100 @@ +package appeng.forge.data.providers.loot; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Map; +import java.util.function.Function; + +import javax.annotation.Nonnull; + +import com.google.common.collect.ImmutableMap; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; + +import net.minecraft.block.Block; +import net.minecraft.data.DataCache; +import net.minecraft.data.DataProvider; +import net.minecraft.data.server.BlockLootTableGenerator; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.loot.*; +import net.minecraft.loot.condition.SurvivesExplosionLootCondition; +import net.minecraft.loot.context.LootContextTypes; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.entry.LeafEntry; +import net.minecraft.loot.function.ApplyBonusLootFunction; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.util.Identifier; + +import appeng.core.AppEng; +import appeng.forge.data.providers.IAE2DataProvider; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; + +public class BlockDropProvider extends BlockLootTableGenerator implements IAE2DataProvider { + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + + private final Path outputFolder; + + private Map> overrides = ImmutableMap.>builder() + .put(BLOCKS.matrixFrame().block(), $ -> LootTable.builder()) + .put(BLOCKS.quartzOre().block(), + b -> dropsWithSilkTouch(BLOCKS.quartzOre().block(), + applyExplosionDecay(BLOCKS.quartzOre().block(), + ItemEntry.builder(MATERIALS.certusQuartzCrystal().item()) + .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) + .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) + .put(BLOCKS.quartzOreCharged().block(), + b -> dropsWithSilkTouch(BLOCKS.quartzOreCharged().block(), + applyExplosionDecay(BLOCKS.quartzOreCharged().block(), + ItemEntry.builder(MATERIALS.certusQuartzCrystalCharged().item()) + .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) + .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) + .build(); + + public BlockDropProvider(Path outputFolder) { + this.outputFolder = outputFolder; + } + + @Override + public void run(DataCache cache) throws IOException { + for (Map.Entry, Block> entry : Registry.BLOCK.getEntries()) { + LootTable.Builder builder; + Identifier id = entry.getKey().getValue(); + if (id.getNamespace().equals(AppEng.MOD_ID)) { + builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue()); + + DataProvider.writeToPath(GSON, cache, toJson(builder), getPath(outputFolder, id)); + } + } + } + + private LootTable.Builder defaultBuilder(Block block) { + LeafEntry.Builder entry = ItemEntry.builder(block); + LootPool.Builder pool = LootPool.builder().rolls(ConstantLootTableRange.create(1)).with(entry) + .conditionally(SurvivesExplosionLootCondition.builder()); + + return LootTable.builder().pool(pool); + } + + private Path getPath(Path root, Identifier id) { + return root.resolve("data/" + id.getNamespace() + "/loot_tables/blocks/" + id.getPath() + ".json"); + } + + public JsonElement toJson(LootTable.Builder builder) { + return LootManager.toJson(finishBuilding(builder)); + } + + @Nonnull + public LootTable finishBuilding(LootTable.Builder builder) { + return builder.type(LootContextTypes.BLOCK).build(); + } + + @Nonnull + @Override + public String getName() { + return AppEng.MOD_NAME + " Block Drops"; + } + +} diff --git a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java new file mode 100644 index 000000000..b9491bc77 --- /dev/null +++ b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java @@ -0,0 +1,96 @@ +package appeng.forge.data.providers.recipes; + +import appeng.api.definitions.IBlockDefinition; +import appeng.core.AppEng; +import appeng.forge.data.providers.IAE2DataProvider; +import com.google.gson.JsonObject; +import net.minecraft.block.Block; +import net.minecraft.data.DataCache; +import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.ShapedRecipeJsonFactory; +import net.minecraft.data.server.recipe.SingleItemRecipeJsonFactory; +import net.minecraft.recipe.Ingredient; +import net.minecraft.util.Identifier; + +import java.nio.file.Path; +import java.util.function.Consumer; + +import static net.minecraft.data.server.RecipesProvider.conditionsFromItem; +import static net.minecraft.data.server.RecipesProvider.saveRecipe; +import static net.minecraft.data.server.RecipesProvider.saveRecipeAdvancement; + +public class SlabStairRecipes implements IAE2DataProvider { + + IBlockDefinition[][] blocks = {{BLOCKS.skyStoneBlock(), BLOCKS.skyStoneSlab(), BLOCKS.skyStoneStairs()}, + {BLOCKS.smoothSkyStoneBlock(), BLOCKS.smoothSkyStoneSlab(), BLOCKS.smoothSkyStoneStairs()}, + {BLOCKS.skyStoneBrick(), BLOCKS.skyStoneBrickSlab(), BLOCKS.skyStoneBrickStairs()}, + {BLOCKS.skyStoneSmallBrick(), BLOCKS.skyStoneSmallBrickSlab(), BLOCKS.skyStoneSmallBrickStairs()}, + {BLOCKS.fluixBlock(), BLOCKS.fluixSlab(), BLOCKS.fluixStairs()}, + {BLOCKS.quartzBlock(), BLOCKS.quartzSlab(), BLOCKS.quartzStairs()}, + {BLOCKS.chiseledQuartzBlock(), BLOCKS.chiseledQuartzSlab(), BLOCKS.chiseledQuartzStairs()}, + {BLOCKS.quartzPillar(), BLOCKS.quartzPillarSlab(), BLOCKS.quartzPillarStairs()},}; + + private final Path outputPath; + + private final Consumer consumer; + + private DataCache cache; + + public SlabStairRecipes(Path outputPath) { + this.outputPath = outputPath; + this.consumer = this::provideRecipe; + } + + public void run(DataCache cache) { + this.cache = cache; + for (IBlockDefinition[] block : blocks) { + slabRecipe(block[0], block[1]); + stairRecipe(block[0], block[2]); + } + } + + private void slabRecipe(IBlockDefinition block, IBlockDefinition slabs) { + Block inputBlock = block.block(); + Block outputBlock = slabs.block(); + + ShapedRecipeJsonFactory.create(slabs.block(), 6).pattern("###").input('#', inputBlock) + .criterion(criterionName(block), conditionsFromItem(inputBlock)) + .offerTo(consumer, new Identifier(AppEng.MOD_ID, "shaped/slabs/" + block.identifier())); + + SingleItemRecipeJsonFactory.create(Ingredient.ofItems(inputBlock), outputBlock, 2) + .create(criterionName(block), conditionsFromItem(inputBlock)) + .offerTo(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier())); + } + + private void stairRecipe(IBlockDefinition block, IBlockDefinition stairs) { + Block inputBlock = block.block(); + Block outputBlock = stairs.block(); + + ShapedRecipeJsonFactory.create(outputBlock, 4).pattern("# ").pattern("## ").pattern("###") + .input('#', inputBlock).criterion(criterionName(block), conditionsFromItem(inputBlock)) + .offerTo(consumer, new Identifier(AppEng.MOD_ID, "shaped/stairs/" + block.identifier())); + + SingleItemRecipeJsonFactory.create(Ingredient.ofItems(inputBlock), outputBlock) + .create(criterionName(block), conditionsFromItem(inputBlock)) + .offerTo(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier())); + + } + + private void provideRecipe(RecipeJsonProvider recipeJsonProvider) { + saveRecipe(cache, recipeJsonProvider.toJson(), outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/recipes/" + recipeJsonProvider.getRecipeId().getPath() + ".json")); + JsonObject jsonObject = recipeJsonProvider.toAdvancementJson(); + if (jsonObject != null) { + saveRecipeAdvancement(cache, jsonObject, outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/advancements/" + recipeJsonProvider.getAdvancementId().getPath() + ".json")); + } + } + + private String criterionName(IBlockDefinition block) { + return String.format("has_%s", block.identifier()); + } + + @Override + public String getName() { + return AppEng.MOD_NAME + " Slabs and Stairs"; + } + +} diff --git a/src/main/java/appeng/forge/data/providers/tags/ConventionTagProvider.java b/src/main/java/appeng/forge/data/providers/tags/ConventionTagProvider.java new file mode 100644 index 000000000..d09e17a58 --- /dev/null +++ b/src/main/java/appeng/forge/data/providers/tags/ConventionTagProvider.java @@ -0,0 +1,112 @@ +package appeng.forge.data.providers.tags; + +import appeng.core.AppEng; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; + +import java.io.IOException; +import java.nio.file.Path; + +public class ConventionTagProvider extends TagProvider { + + public ConventionTagProvider(Path outputPath) { + super(outputPath); + } + + @Override + protected void generate() throws IOException { + // Dyes + addItemTag("white_dyes", Items.WHITE_DYE); + addItemTag("orange_dyes", Items.ORANGE_DYE); + addItemTag("magenta_dyes", Items.MAGENTA_DYE); + addItemTag("light_blue_dyes", Items.LIGHT_BLUE_DYE); + addItemTag("yellow_dyes", Items.YELLOW_DYE); + addItemTag("lime_dyes", Items.LIME_DYE); + addItemTag("pink_dyes", Items.PINK_DYE); + addItemTag("gray_dyes", Items.GRAY_DYE); + addItemTag("light_gray_dyes", Items.LIGHT_GRAY_DYE); + addItemTag("cyan_dyes", Items.CYAN_DYE); + addItemTag("purple_dyes", Items.PURPLE_DYE); + addItemTag("blue_dyes", Items.BLUE_DYE); + addItemTag("brown_dyes", Items.BROWN_DYE); + addItemTag("green_dyes", Items.GREEN_DYE); + addItemTag("red_dyes", Items.RED_DYE); + addItemTag("black_dyes", Items.BLACK_DYE); + + addItemTag("iron_ingots", Items.IRON_INGOT); + addItemTag("iron_ores", Items.IRON_ORE); + addItemTag("gold_ingots", Items.GOLD_INGOT); + addItemTag("gold_ores", Items.GOLD_ORE); + addItemTag("glowstone_dusts", Items.GLOWSTONE_DUST); + addItemTag("wooden_rods", Items.STICK); + addItemTag("nether_quartz_ores", Items.NETHER_QUARTZ_ORE); + addItemTag("nether_quartz_crystals", Items.QUARTZ); + addItemTag("sand_blocks", Items.SAND, Items.RED_SAND); + addItemTag("diamonds", Items.DIAMOND); + addItemTag("wooden_chests", Items.CHEST, Items.TRAPPED_CHEST); + addItemTag("wheat_crops", Items.WHEAT); + addItemTag("redstone_dusts", Items.REDSTONE); + addItemTag("ender_pearls", Items.ENDER_PEARL); + addItemTag("terracotta_blocks", Items.TERRACOTTA, + Items.WHITE_TERRACOTTA, + Items.ORANGE_TERRACOTTA, + Items.MAGENTA_TERRACOTTA, + Items.LIGHT_BLUE_TERRACOTTA, + Items.YELLOW_TERRACOTTA, + Items.LIME_TERRACOTTA, + Items.PINK_TERRACOTTA, + Items.GRAY_TERRACOTTA, + Items.LIGHT_GRAY_TERRACOTTA, + Items.CYAN_TERRACOTTA, + Items.PURPLE_TERRACOTTA, + Items.BLUE_TERRACOTTA, + Items.BROWN_TERRACOTTA, + Items.GREEN_TERRACOTTA, + Items.RED_TERRACOTTA, + Items.BLACK_TERRACOTTA + ); + addItemTag("glass_blocks", Items.GLASS, + Items.WHITE_STAINED_GLASS, + Items.ORANGE_STAINED_GLASS, + Items.MAGENTA_STAINED_GLASS, + Items.LIGHT_BLUE_STAINED_GLASS, + Items.YELLOW_STAINED_GLASS, + Items.LIME_STAINED_GLASS, + Items.PINK_STAINED_GLASS, + Items.GRAY_STAINED_GLASS, + Items.LIGHT_GRAY_STAINED_GLASS, + Items.CYAN_STAINED_GLASS, + Items.PURPLE_STAINED_GLASS, + Items.BLUE_STAINED_GLASS, + Items.BROWN_STAINED_GLASS, + Items.GREEN_STAINED_GLASS, + Items.RED_STAINED_GLASS, + Items.BLACK_STAINED_GLASS + ); + + addBlockTag("glass_blocks", Blocks.GLASS, + Blocks.WHITE_STAINED_GLASS, + Blocks.ORANGE_STAINED_GLASS, + Blocks.MAGENTA_STAINED_GLASS, + Blocks.LIGHT_BLUE_STAINED_GLASS, + Blocks.YELLOW_STAINED_GLASS, + Blocks.LIME_STAINED_GLASS, + Blocks.PINK_STAINED_GLASS, + Blocks.GRAY_STAINED_GLASS, + Blocks.LIGHT_GRAY_STAINED_GLASS, + Blocks.CYAN_STAINED_GLASS, + Blocks.PURPLE_STAINED_GLASS, + Blocks.BLUE_STAINED_GLASS, + Blocks.BROWN_STAINED_GLASS, + Blocks.GREEN_STAINED_GLASS, + Blocks.RED_STAINED_GLASS, + Blocks.BLACK_STAINED_GLASS + ); + } + + @Override + public String getName() { + return AppEng.MOD_NAME + " Convention Tags"; + } + +} diff --git a/src/main/java/appeng/forge/data/providers/tags/TagProvider.java b/src/main/java/appeng/forge/data/providers/tags/TagProvider.java new file mode 100644 index 000000000..f93e92305 --- /dev/null +++ b/src/main/java/appeng/forge/data/providers/tags/TagProvider.java @@ -0,0 +1,84 @@ +package appeng.forge.data.providers.tags; + +import appeng.core.AppEng; +import appeng.forge.data.providers.IAE2DataProvider; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import net.minecraft.block.Block; +import net.minecraft.data.DataCache; +import net.minecraft.data.DataProvider; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public abstract class TagProvider implements IAE2DataProvider { + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + protected static final String CONVENTION_NAMESPACE = "c"; + protected static final String TYPE_ITEMS = "items"; + protected static final String TYPE_BLOCKS = "blocks"; + + private final Path outputPath; + + private DataCache cache; + + protected TagProvider(Path outputPath) { + this.outputPath = outputPath; + } + + @Override + public void run(DataCache cache) throws IOException { + this.cache = cache; + try { + generate(); + } finally { + this.cache = null; + } + } + + protected abstract void generate() throws IOException; + + protected void addItemTag(String name, ItemConvertible... items) throws IOException { + List itemIds = Arrays.stream(items) + .map(ItemConvertible::asItem) + .map(Registry.ITEM::getId) + .map(Identifier::toString) + .collect(Collectors.toList()); + writeTagFile(CONVENTION_NAMESPACE, TYPE_ITEMS, name, itemIds); + } + + protected void addBlockTag(String name, Block... blocks) throws IOException { + List itemIds = Arrays.stream(blocks) + .map(Registry.BLOCK::getId) + .map(Identifier::toString) + .collect(Collectors.toList()); + writeTagFile(CONVENTION_NAMESPACE, TYPE_BLOCKS, name, itemIds); + } + + protected void writeTagFile(String namespace, String tagType, String tagName, List entries) throws IOException { + JsonObject rootObj = new JsonObject(); + JsonArray valuesArr = new JsonArray(); + for (String entry : entries) { + valuesArr.add(entry); + } + rootObj.add("values", valuesArr); + + Path path = outputPath.resolve("data/" + namespace + "/tags/" + tagType + "/" + tagName + ".json"); + DataProvider.writeToPath(GSON, this.cache, rootObj, path); + } + + @Override + public String getName() { + return AppEng.MOD_NAME + " Convention Tags"; + } + +} diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 9b2e3efd8..992e8efc2 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -81,22 +81,22 @@ public class ColorApplicatorItem extends AEBasePoweredItem implements IStorageCell, IBlockTool, IMouseWheelItem { private static final Map TAG_TO_COLOR = ImmutableMap.builder() - .put(new Identifier("forge:dyes/black"), AEColor.BLACK) - .put(new Identifier("forge:dyes/blue"), AEColor.BLUE) - .put(new Identifier("forge:dyes/brown"), AEColor.BROWN) - .put(new Identifier("forge:dyes/cyan"), AEColor.CYAN) - .put(new Identifier("forge:dyes/gray"), AEColor.GRAY) - .put(new Identifier("forge:dyes/green"), AEColor.GREEN) - .put(new Identifier("forge:dyes/light_blue"), AEColor.LIGHT_BLUE) - .put(new Identifier("forge:dyes/light_gray"), AEColor.LIGHT_GRAY) - .put(new Identifier("forge:dyes/lime"), AEColor.LIME) - .put(new Identifier("forge:dyes/magenta"), AEColor.MAGENTA) - .put(new Identifier("forge:dyes/orange"), AEColor.ORANGE) - .put(new Identifier("forge:dyes/pink"), AEColor.PINK) - .put(new Identifier("forge:dyes/purple"), AEColor.PURPLE) - .put(new Identifier("forge:dyes/red"), AEColor.RED) - .put(new Identifier("forge:dyes/white"), AEColor.WHITE) - .put(new Identifier("forge:dyes/yellow"), AEColor.YELLOW).build(); + .put(new Identifier("c:black_dyes"), AEColor.BLACK) + .put(new Identifier("c:blue_dyes"), AEColor.BLUE) + .put(new Identifier("c:brown_dyes"), AEColor.BROWN) + .put(new Identifier("c:cyan_dyes"), AEColor.CYAN) + .put(new Identifier("c:gray_dyes"), AEColor.GRAY) + .put(new Identifier("c:green_dyes"), AEColor.GREEN) + .put(new Identifier("c:light_blue_dyes"), AEColor.LIGHT_BLUE) + .put(new Identifier("c:light_gray_dyes"), AEColor.LIGHT_GRAY) + .put(new Identifier("c:lime_dyes"), AEColor.LIME) + .put(new Identifier("c:magenta_dyes"), AEColor.MAGENTA) + .put(new Identifier("c:orange_dyes"), AEColor.ORANGE) + .put(new Identifier("c:pink_dyes"), AEColor.PINK) + .put(new Identifier("c:purple_dyes"), AEColor.PURPLE) + .put(new Identifier("c:red_dyes"), AEColor.RED) + .put(new Identifier("c:white_dyes"), AEColor.WHITE) + .put(new Identifier("c:yellow_dyes"), AEColor.YELLOW).build(); private static final String TAG_COLOR = "color"; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index 10663b50e..b670e7fbd 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -28,7 +28,7 @@ public class MeteoriteStructureStart extends StructureStart sandTag = BlockTags.getContainer().getOrCreate(new Identifier("minecraft:sand")); private final Tag terracottaTag = BlockTags.getContainer() - .getOrCreate(new Identifier("forge:terracotta")); + .getOrCreate(new Identifier("c:terracotta_blocks")); public MeteoriteStructureStart(StructureFeature feature, int chunkX, int chunkZ, BlockBox box, int references, long seed) { super(feature, chunkX, chunkZ, box, references, seed); diff --git a/src/main/resources/appliedenergistics2.accesswidener b/src/main/resources/appliedenergistics2.accesswidener index 733d028b9..64272da32 100644 --- a/src/main/resources/appliedenergistics2.accesswidener +++ b/src/main/resources/appliedenergistics2.accesswidener @@ -8,3 +8,11 @@ extendable method net/minecraft/client/gui/screen/ingame/HandledScreen drawSlot # Show selection highlight only on focus extendable method net/minecraft/client/gui/widget/TextFieldWidget drawSelectionHighlight (IIII)V + +# Allow data-gen of recipes & loot tables +accessible method net/minecraft/data/server/RecipesProvider conditionsFromItem (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions; +accessible method net/minecraft/data/server/RecipesProvider saveRecipe (Lnet/minecraft/data/DataCache;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V +accessible method net/minecraft/data/server/RecipesProvider saveRecipeAdvancement (Lnet/minecraft/data/DataCache;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V + +accessible method net/minecraft/data/server/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; +accessible method net/minecraft/data/server/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Ljava/lang/Object; diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json index 72eda82cb..619f6a67f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json @@ -7,7 +7,7 @@ "pattern": ["aba", "bab", "aba"], "key": { "b": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "a": { "tag": "appliedenergistics2:dusts/quartz" diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json index 9e6448094..c8c783ada 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:gems/certus_quartz" + "tag": "c:certus_quartz_crystals" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json index a47482c86..9b65f3746 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ores/certus_quartz" + "tag": "c:certus_quartz_ores" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json index 1bf6bc360..5ea3d6768 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ender_pearls" + "tag": "c:ender_pearls" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json index 7eacb45c4..74d3efe4d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:crops/wheat" + "tag": "c:wheat_crops" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json index 57ff905d8..cf52cb238 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ingots/gold" + "tag": "c:gold_ingots" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json index 0623dcbb0..fd45a3d05 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ores/gold" + "tag": "c:gold_ores" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json index 272a731e3..0a5bc4a87 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json index 21887a0d5..d8efe7779 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ores/iron" + "tag": "c:iron_ores" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json index 752893d23..7df36a118 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json index 2a94dafb4..e3fb1bc18 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json @@ -1,7 +1,7 @@ { "type": "appliedenergistics2:grinder", "input": { - "tag": "forge:ores/quartz" + "tag": "c:nether_quartz_ores" }, "result": { "primary": { diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json index 57948108a..874595483 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:printed_engineering_processor" }, "middle": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "bottom": { "item": "appliedenergistics2:printed_silicon" diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json index 868466996..9aac7662a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:calculation_processor_press" }, "middle": { - "tag": "forge:storage_blocks/iron" + "item": "minecraft:iron_block" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json index ef8ac8193..c04beb748 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:printed_calculation_processor" }, "middle": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "bottom": { "item": "appliedenergistics2:printed_silicon" diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json index a819407d4..58ec4d09c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor_press" }, "middle": { - "tag": "forge:storage_blocks/iron" + "item": "minecraft:iron_block" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json index 0457a09b8..4cf3b44a6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor_press" }, "middle": { - "tag": "forge:gems/diamond" + "tag": "c:diamonds" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json index ca18e96a8..514c94c14 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:printed_logic_processor" }, "middle": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "bottom": { "item": "appliedenergistics2:printed_silicon" diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json index 0c37907cb..19c72dde4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:logic_processor_press" }, "middle": { - "tag": "forge:storage_blocks/iron" + "item": "minecraft:iron_block" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json index 7f891cb38..13910971f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:logic_processor_press" }, "middle": { - "tag": "forge:ingots/gold" + "tag": "c:gold_ingots" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json index c3714f4e0..b39cd3bf3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:silicon_press" }, "middle": { - "tag": "forge:storage_blocks/iron" + "item": "minecraft:iron_block" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json index 172562e0f..678f1de01 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json @@ -7,13 +7,13 @@ "pattern": ["ab ", "cdb", "ab "], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "a": { - "tag": "forge:gems/diamond" + "tag": "c:diamonds" }, "d": { "item": "appliedenergistics2:calculation_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json index 3993e010d..c47a71ad3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json @@ -7,13 +7,13 @@ "pattern": ["ab ", "cdb", "ab "], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "a": { - "tag": "forge:ingots/gold" + "tag": "c:gold_ingots" }, "d": { "item": "appliedenergistics2:calculation_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json index 0e710a846..684c2f6bc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json @@ -9,10 +9,10 @@ "tag": "appliedenergistics2:crystals/quartz" }, "a": { - "tag": "forge:stone" + "item": "minecraft:stone" }, "d": { - "tag": "forge:cobblestone" + "item": "minecraft:cobblestone" }, "b": { "tag": "appliedenergistics2:gears/wooden" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json index 8d01495a6..1e4db6d80 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json @@ -6,7 +6,7 @@ "pattern": ["aaa", " a", " a"], "key": { "a": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json index df85875f5..71d7a4c61 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json @@ -6,7 +6,7 @@ "pattern": [" a ", "a a", " a "], "key": { "a": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json index 5559a8808..110da2c01 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json @@ -6,7 +6,7 @@ "pattern": [" a ", "aba", " a "], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "item": "appliedenergistics2:charged_certus_quartz_crystal" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json index 7bde98b53..f1ac2fd1e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json @@ -6,7 +6,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:sand" + "tag": "c:sand_blocks" }, { "tag": "appliedenergistics2:dusts/certus_quartz" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json index bf043715f..823f8f81d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json @@ -6,7 +6,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:sand" + "tag": "c:sand_blocks" }, { "tag": "appliedenergistics2:dusts/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json index 537fad5f4..1fded6737 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json @@ -6,7 +6,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:sand" + "tag": "c:sand_blocks" }, { "tag": "appliedenergistics2:dusts/nether_quartz" diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json index 664556012..acf761b18 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json @@ -12,7 +12,7 @@ "item": "minecraft:redstone_torch" }, "c": { - "tag": "forge:stone" + "item": "minecraft:stone" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json index e565d406e..8a04d4ad6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json @@ -6,7 +6,7 @@ "pattern": ["aaa", "bbb", "ccc"], "key": { "a": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "b": { "tag": "appliedenergistics2:crystals/nether" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json index bfa474e9a..7a6170d9b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json @@ -6,13 +6,13 @@ "pattern": ["aba", "cdc", "ccc"], "key": { "c": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "tag": "appliedenergistics2:wool" }, "d": { - "tag": "forge:chests/wooden" + "tag": "c:wooden_chests" }, "b": { "item": "appliedenergistics2:calculation_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json index 8fe23d97a..ac41bf1f0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json @@ -6,7 +6,7 @@ "pattern": ["aba", "a ", "aba"], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json index 618ea68b1..6962fe27d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:quartz_glass" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json index 8b71ae411..a51b40ceb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:quartz_glass" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json index 63b6e5822..ed3d23de9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json @@ -6,7 +6,7 @@ "pattern": ["aaa", "aba", "aca"], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:energy_acceptor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json index ce6d8d9a1..e68511036 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:formation_core" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:annihilation_core" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json index d54227a63..6e5f231ac 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json @@ -9,7 +9,7 @@ "item": "minecraft:sticky_piston" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json index 1a97b54a3..bd1571097 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:formation_core" }, "b": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:annihilation_core" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json index 034ee7d7d..f270cb21b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json @@ -6,10 +6,10 @@ "pattern": ["aba", "bcb", "aba"], "key": { "b": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:dusts/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json index fb685ec1f..d29a724ba 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json @@ -6,10 +6,10 @@ "pattern": ["aaa", "bcb", "ded"], "key": { "a": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "item": "appliedenergistics2:drive" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json index 82cb847b2..a4bf2bf9f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json @@ -12,7 +12,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "d": { "item": "appliedenergistics2:energy_cell" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json index ff5b5084d..778913384 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json @@ -15,7 +15,7 @@ "item": "appliedenergistics2:chest" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json index 8f9d815ac..ece421929 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json @@ -6,13 +6,13 @@ "pattern": ["aaa", "bcb", "ded"], "key": { "a": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "e": { "item": "appliedenergistics2:engineering_processor" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:io_port" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json index 1294f2794..d23377eb2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json @@ -6,13 +6,13 @@ "pattern": ["aba", "c c", "ded"], "key": { "a": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "b": { "item": "appliedenergistics2:terminal" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json index de0f1886b..ade761bf2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json index 3947aeb1d..0ac42dcf4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json index 4178a90f6..15e03df8a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json index 621d47eda..ccad9c11e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json index 23d4f4a32..6c49b701b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json index c0d9db7f4..ff9b1585d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json index fe5702b6a..bafe6209a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json index 65a4f1747..ff782d422 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json index ac1533f9c..7c51551db 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json index b7c709f8b..c789e7131 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json index 337d8b0ac..77c4294ef 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json index 52c7cac4a..5f933ab95 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json index 9b84dd258..0cdeee129 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json index d398510cc..f91c6bec0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json index 045c80ba7..1ccac3f55 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json index 16d2f67ef..ea19b1a71 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_cable" }, "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json index 9441cb0f1..f32068481 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json index e9e6a5eef..7cbf735b6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json index 14b4ba8df..dc2fba6b4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json index 14ec16d66..6be71a309 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json index 5350a25c5..35bb1c45e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json index c6d1a5889..a0cdd7576 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json index aee399fa2..afb40c4a2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json index ea78f6751..7dc8f8776 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json index 21e77e2fd..1a6128313 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json index b6b3fe4d2..89a2cd8bf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json index 19419ac79..d19a266bb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json index 0e1a8566d..cf78ec0bc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json index 3094faba6..4d391f5ce 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json index 2fa029363..247b675c8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json index afea4ce7c..780cc11c6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json index 2a75e5f0f..f02503271 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json index 1222327ef..9a06a3389 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" }, "a": { "item": "appliedenergistics2:fluix_covered_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json index 17726d719..1c4c618a7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json index c99bf657c..e4f245f2e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json index 250321479..ff513332d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json index a013c4945..2f19ea0bb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json index a352d3f2b..5c015e47e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json @@ -8,10 +8,10 @@ "item": "appliedenergistics2:fluix_covered_dense_cable" }, { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } ] } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json index ebeed17a3..41c4bddd3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json index 28ef47baf..34abda259 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json index bf2d7c6d3..35dd6ad45 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json index c66974b11..603edf5cb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json index b43d62981..8df6958fe 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json index 45964e4f5..1aa84cde3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json index e5fcc6519..31d545639 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json index 1f270fee7..f8bad71f1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json index c192df3c3..7d4241fa7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json index de75cacdb..d608cb1ff 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json index 3c37cb89a..eb1c7ef1b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_dense_cable" }, "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json index 8293bfd7c..7a29e25b9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_dense_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json index 02c6a307c..46d33a633 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json index 93ae9ebef..00bd5815c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json index 0f30fa2cf..9f718c8ad 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json index d9b206ad2..b126e3830 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json index b52da35b6..56aa8d415 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json index d0d3cdadb..5e9809617 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json index fdb768fc9..472be43aa 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json index f512acda7..674b72f01 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json index 0deede1b2..8ddfd649e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json index 69b7ee4fd..45b3c4053 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json index b11f3e5e9..9504ae6f9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json index c94ba82e3..777d9e3de 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json index 034447db2..0021eea53 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json index 0a9e24cb1..fce678ac6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json index fe3797c94..9a705e9e6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json index 4302c9cec..a4642bc2e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_glass_cable" }, "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json index dd60e17e5..22fe8d5db 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json index 0772d5118..0fff028a9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_cable" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json index 435186fed..6e6787001 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json index 40e341787..9d603c55a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json index ca563c5a7..25937ee33 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json @@ -8,10 +8,10 @@ "item": "appliedenergistics2:fluix_covered_cable" }, { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } ] } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json index 30b9bdbea..f817aaedd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json index eabdc382d..463a0c7e0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json index 5ca17df44..94665c43b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json index c4ba80dad..30ec3c58c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json index 6e4b58126..c6388ef7f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_cable" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json index dd2e65ff0..0dc609e80 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json index b8a81c005..675718243 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json index 9e34926a9..14e0c9e02 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json index ba51a45d9..661db7d07 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json index 3eb6dcdff..16a61f052 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:fluix_smart_cable" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json index 38783300e..5642a82f4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json index 3a1d1ec43..366d254df 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" }, "a": { "item": "appliedenergistics2:fluix_smart_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json index 685c8bea6..30375a802 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "c": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json index 2e8723cdb..95df5b05e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:16k_fluid_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json index 03b08574f..eaa940149 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:1k_fluid_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json index 022cbab0e..792f1438f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:4k_fluid_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json index a7456a237..5b0bbf407 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:64k_fluid_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json index eb620d943..1b725373b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" }, "b": { "item": "appliedenergistics2:fluix_pearl" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json index 2025cdb60..d9e7594c1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json @@ -12,7 +12,7 @@ "item": "appliedenergistics2:2_cubed_spatial_cell_component" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json index cc79e1a1b..0b636649c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json @@ -12,7 +12,7 @@ "item": "appliedenergistics2:16_cubed_spatial_cell_component" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json index 89e7d4a9d..2534e9201 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:128_cubed_spatial_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json index 7407dfc23..fbdf0deb3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json @@ -9,13 +9,13 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:16_cubed_spatial_cell_component" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json index d1aaa1b31..22e202963 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:2_cubed_spatial_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json index 7ede54282..dfc38149c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json @@ -12,10 +12,10 @@ "item": "appliedenergistics2:16k_cell_component" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json index 394a0c8c1..bb803a28f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:1k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json index d4fed6bf4..5bf2b70cb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:4k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json index 2bef37720..608691cbc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:64k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json index 1a841a6b7..c14af9b60 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json @@ -15,7 +15,7 @@ "item": "appliedenergistics2:4k_cell_component" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json index f94ddf111..9af9bc6af 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json @@ -6,7 +6,7 @@ "pattern": ["aba", "bcb", "aba"], "key": { "a": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "b": { "tag": "appliedenergistics2:crystals/certus" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json index a54ce6aff..f453f292c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:quartz_glass" }, "a": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "item": "appliedenergistics2:1k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json index f94dc4936..a0a206f85 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json @@ -15,7 +15,7 @@ "item": "appliedenergistics2:quartz_glass" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json index 1ad6f3728..5e9a16168 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json @@ -9,10 +9,10 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { "tag": "appliedenergistics2:crystals/certus" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json index abe5ba7b3..32d9acd95 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json @@ -6,7 +6,7 @@ "pattern": ["aba", "cdc", "aba"], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "d": { "item": "appliedenergistics2:logic_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json index 9eed81f56..28cc4cff2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json @@ -15,7 +15,7 @@ "tag": "appliedenergistics2:workbench" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:annihilation_core" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json index eadeb3cff..7668dba29 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json @@ -9,13 +9,13 @@ "item": "appliedenergistics2:quartz_glass" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:crystals/certus" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json index 6ca89df11..52c0eb5a3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "minecraft:piston" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json index e75658b3c..1350c3277 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "minecraft:piston" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json index 3d9b15d16..cce65f410 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json @@ -8,7 +8,7 @@ "item": "minecraft:redstone_torch" }, { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" }, { "item": "appliedenergistics2:calculation_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json index 03f8868bf..7028f4dcb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json @@ -9,7 +9,7 @@ "item": "minecraft:sticky_piston" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "item": "appliedenergistics2:annihilation_core" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json index f2bb4b61c..8271c6025 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json @@ -9,7 +9,7 @@ "item": "minecraft:sticky_piston" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "item": "appliedenergistics2:annihilation_core" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json index d77102a0e..904dfedf4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json @@ -10,13 +10,13 @@ "item": "appliedenergistics2:quartz_glass" }, "c": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "d": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "a": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json index 945ee261a..645af1461 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json @@ -6,7 +6,7 @@ "pattern": ["aaa", "bcb"], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json index 5dee66904..5a9a58bde 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json @@ -6,7 +6,7 @@ "pattern": ["ab", "cb", "ab"], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json index 851620a60..b0bb298bc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json @@ -6,7 +6,7 @@ "pattern": ["aaa", "ddd", "bcb"], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "tag": "appliedenergistics2:crystals/fluix" @@ -15,7 +15,7 @@ "item": "appliedenergistics2:annihilation_core" }, "d": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json index 9ba1fbd60..eab635284 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json @@ -6,7 +6,7 @@ "pattern": ["adb", "cdb", "adb"], "key": { "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/fluix" @@ -15,7 +15,7 @@ "item": "appliedenergistics2:annihilation_core" }, "d": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json index 7c5c10fc0..ab2b65fc0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json index ea0a51b97..008ed8afe 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json index 17fdad5b5..ba2e508aa 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json @@ -9,13 +9,13 @@ "item": "appliedenergistics2:formation_core" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/fluix" }, "d": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json index 3ac3ef09e..54830d7f1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json @@ -9,13 +9,13 @@ "item": "appliedenergistics2:formation_core" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "tag": "appliedenergistics2:crystals/fluix" }, "d": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json index 544c9ce1a..1dc07fb95 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "bbb", "aaa"], "key": { "a": { - "tag": "appliedenergistics2:glass" + "tag": "c:glass_blocks" }, "b": { "tag": "appliedenergistics2:dusts/quartz" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json index 35ad2f5de..d914ced56 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json @@ -9,7 +9,7 @@ "item": "minecraft:lever" }, "a": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "b": { "item": "appliedenergistics2:fluix_glass_cable" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json index 1a4d817d6..c3ba8cd11 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:crystals/fluix" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json index 0864339a8..07daa04e1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json @@ -7,7 +7,7 @@ "pattern": ["abc", "ddd"], "key": { "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "tag": "appliedenergistics2:crystals/certus" diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json index d907608db..501577c86 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json @@ -6,7 +6,7 @@ "pattern": [" a ", "bcb", " b "], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:quartz_fiber" diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json index a19d9585e..da2d64fd3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json @@ -1,8 +1,6 @@ { "type": "minecraft:smelting", - "result": { - "item": "minecraft:bread" - }, + "result": "minecraft:bread", "ingredient": { "item": "appliedenergistics2:flour" }, diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json index cc7ecf42a..0f7e47d2f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json @@ -1,10 +1,8 @@ { "type": "minecraft:smelting", - "result": { - "item": "minecraft:gold_ingot" - }, + "result": "minecraft:gold_ingot", "ingredient": { - "tag": "forge:dusts/gold" + "tag": "c:gold_dusts" }, "experience": 0.0 } diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json index 756188cfb..54c57b41f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json @@ -1,10 +1,8 @@ { "type": "minecraft:smelting", - "result": { - "item": "minecraft:iron_ingot" - }, + "result": "minecraft:iron_ingot", "ingredient": { - "tag": "forge:dusts/iron" + "tag": "c:iron_dusts" }, "experience": 0.0 } diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json index 4c9f6e3be..618f2a8cf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json @@ -1,8 +1,6 @@ { "type": "minecraft:smelting", - "result": { - "item": "appliedenergistics2:silicon" - }, + "result": "appliedenergistics2:silicon", "ingredient": [ { "tag": "appliedenergistics2:dusts/nether_quartz" diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json index d8c9098c4..cc371f8cd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json @@ -1,8 +1,6 @@ { "type": "minecraft:smelting", - "result": { - "item": "appliedenergistics2:smooth_sky_stone_block" - }, + "result": "appliedenergistics2:smooth_sky_stone_block", "ingredient": { "item": "appliedenergistics2:sky_stone_block" }, diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json index a82124b8f..f7fe05a21 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json @@ -9,7 +9,7 @@ "tag": "appliedenergistics2:crystals/certus_quartz" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json index 69babca7c..4dbf2a237 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json @@ -6,13 +6,13 @@ "pattern": [" a", "ba ", "cc "], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "tag": "appliedenergistics2:crystals/certus_quartz" }, "a": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json index 433cfc3c8..dc86e1ba9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json @@ -9,7 +9,7 @@ "tag": "appliedenergistics2:crystals/certus_quartz" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json index e7bd191a8..3251ce148 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json @@ -9,7 +9,7 @@ "tag": "appliedenergistics2:crystals/certus_quartz" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json index c8c325479..e7b9158db 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json @@ -9,7 +9,7 @@ "tag": "appliedenergistics2:crystals/certus_quartz" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json index a691588f9..a9d0bb01f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json @@ -9,7 +9,7 @@ "tag": "appliedenergistics2:crystals/certus_quartz" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json index 26e053d7c..4f767ac94 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "a": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:4k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json index 06e24dd30..23692243e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json @@ -6,7 +6,7 @@ "pattern": ["a ", " b ", " b"], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "a": { "item": "appliedenergistics2:charged_certus_quartz_crystal" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json index 9b4be79b7..056bca4ab 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:engineering_processor" }, "d": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "b": { "item": "appliedenergistics2:energy_cell" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json index f1cfec619..95bdc829d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json @@ -6,10 +6,10 @@ "pattern": ["aa", "ab", " b"], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json index f73c8caeb..ebfdbb34f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json @@ -6,13 +6,13 @@ "pattern": [" a", "ba ", "cc "], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "a": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json index 5c3e88dac..735fab818 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json @@ -6,10 +6,10 @@ "pattern": ["aa", " b", " b"], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json index 6e3bab149..82f2397a4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json @@ -6,10 +6,10 @@ "pattern": ["aaa", " b ", " b "], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json index 481e674c6..b5875a655 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json @@ -6,10 +6,10 @@ "pattern": ["a", "b", "b"], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json index bb5970afd..9f9b06ccb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json @@ -6,10 +6,10 @@ "pattern": ["a", "a", "b"], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" }, "b": { - "tag": "forge:rods/wooden" + "tag": "c:wooden_rods" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json index 21c7cf1e3..f4d64809f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json @@ -6,7 +6,7 @@ "pattern": ["a a", " a ", "a a"], "key": { "a": { - "tag": "forge:gems/quartz" + "tag": "c:nether_quartz_crystals" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json index 9075fc659..412c8573a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json @@ -9,13 +9,13 @@ "item": "appliedenergistics2:engineering_processor" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "d": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { - "tag": "forge:ingots/gold" + "tag": "c:gold_ingots" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json index c5c7b4390..3fc151515 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json @@ -9,7 +9,7 @@ "item": "appliedenergistics2:formation_core" }, "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "c": { "item": "appliedenergistics2:4k_cell_component" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json index 58650982c..090ff2b6c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json @@ -6,13 +6,13 @@ "pattern": ["abb", "cdc"], "key": { "b": { - "tag": "forge:ingots/iron" + "tag": "c:iron_ingots" }, "d": { - "tag": "forge:dusts/redstone" + "tag": "c:redstone_dusts" }, "c": { - "tag": "forge:ingots/gold" + "tag": "c:gold_ingots" }, "a": { "item": "appliedenergistics2:calculation_processor" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json index 364393565..9af1b5db7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json @@ -8,7 +8,7 @@ "tag": "appliedenergistics2:illuminated_panel" }, { - "tag": "forge:chests/wooden" + "tag": "c:wooden_chests" }, { "tag": "appliedenergistics2:quartz_wrench" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json index 0746435ff..65fbf7b81 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/black" + "tag": "c:black_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json index 819be064a..a4716a032 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:matter_ball" }, "b": { - "tag": "forge:dyes/blue" + "tag": "c:blue_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json index 9eb6ad8d2..c5e9aa475 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/brown" + "tag": "c:brown_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json index ee60ec588..ef70a639e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/cyan" + "tag": "c:cyan_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json index 6d8444b4e..ec8700871 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/gray" + "tag": "c:gray_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json index 47e625fd6..befb25e26 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/green" + "tag": "c:green_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json index 2ec6370a3..121e13fb2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/light_blue" + "tag": "c:light_blue_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json index 6cc52e4ac..361902df7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/light_gray" + "tag": "c:light_gray_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json index 8f32df391..500d43b45 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:matter_ball" }, "b": { - "tag": "forge:dyes/lime" + "tag": "c:lime_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json index 4ad5d2987..d5caf1896 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:black_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json index 758915f79..9b6302748 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:blue_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json index 8ad4fdb8f..c42423173 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:brown_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json index 1bb7aa7a3..c10425349 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:cyan_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json index 46036a2ea..d82c7082b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:gray_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json index 285075f9e..3cb7e91c6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:green_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json index 6b606df2c..1c93746a3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:light_blue_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json index 3d2dfef69..80bc1584b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:light_gray_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json index c54c0061a..074986f16 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:lime_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json index 7b3971cb5..97513d9f2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:magenta_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json index cf7b38e1a..0214dbcea 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" }, "a": { "item": "appliedenergistics2:orange_paint_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json index 64d3f3de1..21e5293a7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:pink_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json index 15b3273e1..63164fffd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:purple_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json index ec0fa0dfe..be1ff142c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:red_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json index 403bf926b..8b722c719 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:white_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json index f11a61051..10108da89 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:yellow_paint_ball" }, "b": { - "tag": "forge:dusts/glowstone" + "tag": "c:glowstone_dusts" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json index c5f3302c6..e12d0c898 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/magenta" + "tag": "c:magenta_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json index 6075a57c6..77d910b7d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/orange" + "tag": "c:orange_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json index 52433d2da..53d9db30c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/pink" + "tag": "c:pink_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json index 78c098b69..8006f87e4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/purple" + "tag": "c:purple_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json index 7f5ea0ead..ee54efb49 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json @@ -10,7 +10,7 @@ "item": "appliedenergistics2:matter_ball" }, "b": { - "tag": "forge:dyes/red" + "tag": "c:red_dyes" } } } diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json index 65c010343..8f6cadf3f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/white" + "tag": "c:white_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json index 83c890057..38a8ef767 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json @@ -7,7 +7,7 @@ "pattern": ["aaa", "aba", "aaa"], "key": { "b": { - "tag": "forge:dyes/yellow" + "tag": "c:yellow_dyes" }, "a": { "item": "appliedenergistics2:matter_ball" diff --git a/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json b/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json index 3ce0609a4..766e9dd2f 100644 --- a/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json +++ b/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json @@ -1,7 +1,6 @@ { "values": [ - "minecraft:glass", - "#forge:stained_glass", + "#c:glass_blocks", "appliedenergistics2:quartz_glass", "appliedenergistics2:quartz_vibrant_glass" ] diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json index dfeaf33a2..36fc68120 100644 --- a/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json @@ -1,6 +1,6 @@ { "values": [ - "#forge:gems/quartz", + "#c:nether_quartz_crystals", "appliedenergistics2:purified_nether_quartz_crystal" ] } diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json index 88ec4bab7..89fdb9cc9 100644 --- a/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json @@ -1,6 +1,6 @@ { "values": [ - "#forge:gems/quartz", + "#c:nether_quartz_crystals", "#appliedenergistics2:crystals/certus_quartz", "appliedenergistics2:charged_certus_quartz_crystal" ] diff --git a/src/main/resources/data/appliedenergistics2/tags/items/glass.json b/src/main/resources/data/appliedenergistics2/tags/items/glass.json deleted file mode 100644 index 5309f6f80..000000000 --- a/src/main/resources/data/appliedenergistics2/tags/items/glass.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": ["minecraft:glass", "#forge:glass"] -} diff --git a/src/main/resources/data/forge/tags/blocks/terracotta.json b/src/main/resources/data/c/tags/blocks/terracotta.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/terracotta.json rename to src/main/resources/data/c/tags/blocks/terracotta.json diff --git a/src/main/resources/data/forge/tags/items/gems/certus_quartz.json b/src/main/resources/data/c/tags/items/certus_quartz_crystals.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/certus_quartz.json rename to src/main/resources/data/c/tags/items/certus_quartz_crystals.json diff --git a/src/main/resources/data/forge/tags/items/ores/certus_quartz.json b/src/main/resources/data/c/tags/items/certus_quartz_ores.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/certus_quartz.json rename to src/main/resources/data/c/tags/items/certus_quartz_ores.json diff --git a/src/main/resources/data/forge/tags/items/dusts/gold.json b/src/main/resources/data/c/tags/items/gold_dusts.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/gold.json rename to src/main/resources/data/c/tags/items/gold_dusts.json diff --git a/src/main/resources/data/forge/tags/items/dusts/iron.json b/src/main/resources/data/c/tags/items/iron_dusts.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/iron.json rename to src/main/resources/data/c/tags/items/iron_dusts.json diff --git a/src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java index b32982f32..200ea5593 100644 --- a/src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -22,8 +22,6 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.texture.Sprite; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraftforge.client.model.data.IDynamicBakedModel; - import appeng.api.AEApi; import appeng.client.render.cablebus.CubeBuilder; diff --git a/src/unported/java/appeng/forge/data/AE2DataGenerators.java b/src/unported/java/appeng/forge/data/AE2DataGenerators.java deleted file mode 100644 index f5ebd256d..000000000 --- a/src/unported/java/appeng/forge/data/AE2DataGenerators.java +++ /dev/null @@ -1,24 +0,0 @@ -package appeng.forge.data; - -import net.minecraft.data.DataGenerator; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; - -import appeng.core.AppEng; -import appeng.forge.data.providers.loot.BlockDropProvider; -import appeng.forge.data.providers.recipes.SlabStairRecipes; - -@Mod.EventBusSubscriber(modid = AppEng.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class AE2DataGenerators { - - @SubscribeEvent - public static void onGatherData(GatherDataEvent dataEvent) { - DataGenerator generator = dataEvent.getGenerator(); - if (dataEvent.includeServer()) { - generator.addProvider(new BlockDropProvider(dataEvent)); - generator.addProvider(new SlabStairRecipes(generator)); - } - } - -} diff --git a/src/unported/java/appeng/forge/data/providers/loot/BlockDropProvider.java b/src/unported/java/appeng/forge/data/providers/loot/BlockDropProvider.java deleted file mode 100644 index 27331bdda..000000000 --- a/src/unported/java/appeng/forge/data/providers/loot/BlockDropProvider.java +++ /dev/null @@ -1,102 +0,0 @@ -package appeng.forge.data.providers.loot; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.Map; -import java.util.function.Function; - -import javax.annotation.Nonnull; - -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; - -import net.minecraft.block.Block; -import net.minecraft.data.DirectoryCache; -import net.minecraft.data.IDataProvider; -import net.minecraft.data.loot.BlockLootTables; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.util.Identifier; -import net.minecraft.world.storage.loot.ConstantRange; -import net.minecraft.world.storage.loot.ItemLootEntry; -import net.minecraft.world.storage.loot.LootEntry; -import net.minecraft.world.storage.loot.LootParameterSets; -import net.minecraft.world.storage.loot.LootPool; -import net.minecraft.world.storage.loot.LootTable; -import net.minecraft.world.storage.loot.LootTableManager; -import net.minecraft.world.storage.loot.RandomValueRange; -import net.minecraft.world.storage.loot.conditions.SurvivesExplosion; -import net.minecraft.world.storage.loot.functions.ApplyBonus; -import net.minecraft.world.storage.loot.functions.SetCount; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import net.minecraftforge.registries.ForgeRegistries; - -import appeng.core.AppEng; -import appeng.forge.data.providers.IAE2DataProvider; - -public class BlockDropProvider extends BlockLootTables implements IAE2DataProvider { - private Map> overrides = ImmutableMap.>builder() - .put(BLOCKS.matrixFrame().block(), $ -> LootTable.builder()) - .put(BLOCKS.quartzOre().block(), - b -> droppingWithSilkTouch(BLOCKS.quartzOre().block(), - withExplosionDecay(BLOCKS.quartzOre().block(), - ItemLootEntry.builder(MATERIALS.certusQuartzCrystal().item()) - .acceptFunction(SetCount.builder(RandomValueRange.of(1.0F, 2.0F))) - .acceptFunction(ApplyBonus.uniformBonusCount(Enchantments.FORTUNE))))) - .put(BLOCKS.quartzOreCharged().block(), - b -> droppingWithSilkTouch(BLOCKS.quartzOreCharged().block(), - withExplosionDecay(BLOCKS.quartzOreCharged().block(), - ItemLootEntry.builder(MATERIALS.certusQuartzCrystalCharged().item()) - .acceptFunction(SetCount.builder(RandomValueRange.of(1.0F, 2.0F))) - .acceptFunction(ApplyBonus.uniformBonusCount(Enchantments.FORTUNE))))) - .build(); - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - - private final Path outputFolder; - - public BlockDropProvider(GatherDataEvent dataEvent) { - outputFolder = dataEvent.getGenerator().getOutputFolder(); - } - - @Override - public void act(@Nonnull DirectoryCache cache) throws IOException { - for (Map.Entry entry : ForgeRegistries.BLOCKS.getEntries()) { - LootTable.Builder builder; - if (entry.getKey().getNamespace().equals(AppEng.MOD_ID)) { - builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue()); - - IDataProvider.save(GSON, cache, toJson(builder), getPath(outputFolder, entry.getKey())); - } - } - } - - private LootTable.Builder defaultBuilder(Block block) { - LootEntry.Builder entry = ItemLootEntry.builder(block); - LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) - .acceptCondition(SurvivesExplosion.builder()); - - return LootTable.builder().addLootPool(pool); - } - - private Path getPath(Path root, Identifier id) { - return root.resolve("data/" + id.getNamespace() + "/loot_tables/blocks/" + id.getPath() + ".json"); - } - - public JsonElement toJson(LootTable.Builder builder) { - return LootTableManager.toJson(finishBuilding(builder)); - } - - @Nonnull - public LootTable finishBuilding(LootTable.Builder builder) { - return builder.setParameterSet(LootParameterSets.BLOCK).build(); - } - - @Nonnull - @Override - public String getName() { - return AppEng.MOD_NAME + " Block Drops"; - } - -} diff --git a/src/unported/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/unported/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java deleted file mode 100644 index a855925f0..000000000 --- a/src/unported/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java +++ /dev/null @@ -1,80 +0,0 @@ -package appeng.forge.data.providers.recipes; - -import java.util.function.Consumer; - -import javax.annotation.Nonnull; - -import net.minecraft.block.Block; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.RecipeProvider; -import net.minecraft.data.ShapedRecipeBuilder; -import net.minecraft.data.SingleItemRecipeBuilder; -import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; -import net.minecraftforge.common.crafting.ConditionalRecipe; - -import appeng.api.definitions.IBlockDefinition; -import appeng.core.AppEng; -import appeng.forge.data.providers.IAE2DataProvider; - -public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider { - - IBlockDefinition[][] blocks = { { BLOCKS.skyStoneBlock(), BLOCKS.skyStoneSlab(), BLOCKS.skyStoneStairs() }, - { BLOCKS.smoothSkyStoneBlock(), BLOCKS.smoothSkyStoneSlab(), BLOCKS.smoothSkyStoneStairs() }, - { BLOCKS.skyStoneBrick(), BLOCKS.skyStoneBrickSlab(), BLOCKS.skyStoneBrickStairs() }, - { BLOCKS.skyStoneSmallBrick(), BLOCKS.skyStoneSmallBrickSlab(), BLOCKS.skyStoneSmallBrickStairs() }, - { BLOCKS.fluixBlock(), BLOCKS.fluixSlab(), BLOCKS.fluixStairs() }, - { BLOCKS.quartzBlock(), BLOCKS.quartzSlab(), BLOCKS.quartzStairs() }, - { BLOCKS.chiseledQuartzBlock(), BLOCKS.chiseledQuartzSlab(), BLOCKS.chiseledQuartzStairs() }, - { BLOCKS.quartzPillar(), BLOCKS.quartzPillarSlab(), BLOCKS.quartzPillarStairs() }, }; - - public SlabStairRecipes(DataGenerator generatorIn) { - super(generatorIn); - } - - @Override - public void registerRecipes(@Nonnull Consumer consumer) { - for (IBlockDefinition[] block : blocks) { - slabRecipe(consumer, block[0], block[1]); - stairRecipe(consumer, block[0], block[2]); - } - } - - private void slabRecipe(Consumer consumer, IBlockDefinition block, IBlockDefinition slabs) { - Block inputBlock = block.block(); - Block outputBlock = slabs.block(); - - ShapedRecipeBuilder.shapedRecipe(slabs.block(), 6).patternLine("###").key('#', inputBlock) - .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new Identifier(AppEng.MOD_ID, "shaped/slabs/" + block.identifier())); - - SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock, 2) - .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier())); - } - - private void stairRecipe(Consumer consumer, IBlockDefinition block, IBlockDefinition stairs) { - Block inputBlock = block.block(); - Block outputBlock = stairs.block(); - - ShapedRecipeBuilder.shapedRecipe(outputBlock, 4).patternLine("# ").patternLine("## ").patternLine("###") - .key('#', inputBlock).addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new Identifier(AppEng.MOD_ID, "shaped/stairs/" + block.identifier())); - - SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock) - .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier())); - - } - - private String criterionName(IBlockDefinition block) { - return String.format("has_%s", block.identifier()); - } - - @Override - public String getName() { - return AppEng.MOD_NAME + " Slabs and Stairs"; - } - -}