diff --git a/build.gradle b/build.gradle index 797f1e4..1d900e8 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ dependencies { modImplementation "appeng:appliedenergistics2-forge:${ae2_version}" modImplementation "org.appliedenergistics:guideme:${guideme_version}" modImplementation "curse.maven:applied-energistics-2-wireless-terminals-459929:${wireless_terminals_version}" - modImplementation "curse.maven:applied-flux-965012:6755986" + modCompileOnly "curse.maven:applied-flux-965012:6755986" modImplementation "curse.maven:mega-cells-622112:${mega_cells_version}" //mae2 diff --git a/src/generated/resources/data/extendedae_plus/advancements/recipes/misc/virtual_crafting_card.json b/src/generated/resources/data/extendedae_plus/advancements/recipes/misc/virtual_crafting_card.json new file mode 100644 index 0000000..596731b --- /dev/null +++ b/src/generated/resources/data/extendedae_plus/advancements/recipes/misc/virtual_crafting_card.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "extendedae_plus:virtual_crafting_card" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_virtual_crafting_card_ingredients": { + "conditions": { + "items": [ + { + "items": [ + "ae2:advanced_card" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_virtual_crafting_card_ingredients", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "extendedae_plus:virtual_crafting_card" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/extendedae_plus/recipes/virtual_crafting_card.json b/src/generated/resources/data/extendedae_plus/recipes/virtual_crafting_card.json new file mode 100644 index 0000000..adab4a6 --- /dev/null +++ b/src/generated/resources/data/extendedae_plus/recipes/virtual_crafting_card.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "ae2:advanced_card" + }, + { + "item": "minecraft:crafting_table" + }, + { + "item": "minecraft:lever" + } + ], + "result": { + "item": "extendedae_plus:virtual_crafting_card" + } +} \ No newline at end of file diff --git a/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java b/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java index 1d85ecd..5d54441 100644 --- a/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java +++ b/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java @@ -136,6 +136,13 @@ public class CraftingRecipes extends RecipeProvider { .unlockedBy("has_advanced_card", has(AEItems.ADVANCED_CARD)) .save(consumer); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.VIRTUAL_CRAFTING_CARD.get()) + .requires(AEItems.ADVANCED_CARD) + .requires(Items.CRAFTING_TABLE) + .requires(Items.LEVER) + .unlockedBy("has_virtual_crafting_card_ingredients", has(AEItems.ADVANCED_CARD)) + .save(consumer); + // 2x Entity Speed Card NBTShapedRecipeBuilder.shaped(RecipeCategory.MISC, EntitySpeedCardItem.withMultiplier(2)) .pattern("SBS") diff --git a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java index a42c0ba..ba6defa 100644 --- a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java +++ b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java @@ -34,6 +34,7 @@ public final class ModCreativeTabs { output.accept(ModItems.createEntitySpeedCardStack(16)); // 频道卡 output.accept(ModItems.CHANNEL_CARD.get()); + output.accept(ModItems.VIRTUAL_CRAFTING_CARD.get()); output.accept(ModItems.OBLIVION_SINGULARITY.get()); output.accept(ModItems.BASIC_CORE.get()); diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java index f7d3f62..bb0a853 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java @@ -177,7 +177,7 @@ public abstract class PatternProviderLogicCompatMixin implements IUpgradeableObj // 只有在升级槽功能启用时才创建升级槽 this.eap$compatUpgrades = UpgradeInventories.forMachine( host.getTerminalIcon().getItem(), - 1, + 2, this::eap$compatOnUpgradesChanged ); } else if (channelCard) { diff --git a/src/main/resources/assets/extendedae_plus/models/item/virtual_crafting_card.json b/src/main/resources/assets/extendedae_plus/models/item/virtual_crafting_card.json new file mode 100644 index 0000000..5bc0e7f --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/virtual_crafting_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extendedae_plus:item/virtual_crafting_card" + } +} diff --git a/src/main/resources/assets/extendedae_plus/textures/item/virtual_crafting_card.png b/src/main/resources/assets/extendedae_plus/textures/item/virtual_crafting_card.png new file mode 100644 index 0000000..c2be613 Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/virtual_crafting_card.png differ