Skip to content

Commit

Permalink
Added missing recipe for the stock exporter
Browse files Browse the repository at this point in the history
  • Loading branch information
pedroksl committed Sep 29, 2024
1 parent 172f942 commit 5744932
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ loader_version_range=[4,)
mod_id=advanced_ae
mod_name=Advanced AE
mod_license=LGPL-3.0
mod_version=0.5.3-1.21.1
mod_version=0.5.4-1.21.1
mod_group_id=net.pedroksl.advanced_ae
mod_authors=Pedroksl
mod_description=This mod aims to expand on the added capabilities of Extended AE.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-09-28T22:02:19.793515 Language
51ffe0566d8ed348184d1de5471b329c91ed6e91 assets/advanced_ae/lang/en_us.json
// 1.21.1 2024-09-29T02:57:22.5476988 Language
57374ae59aee4a0da1f41789309ea7e62320b518 assets/advanced_ae/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-27T15:31:01.8667011 Recipes
// 1.21.1 2024-09-29T02:57:22.5487041 Recipes
2cc379f3eeb84b4d9eeb014db2854841c785f472 data/advanced_ae/advancement/recipes/misc/advpartenc.json
828b1236efbaa89691afb2969beabb8ba02286c5 data/advanced_ae/advancement/recipes/misc/advpatpro2.json
183306c693387e207e828284e1b68df9f2472ce4 data/advanced_ae/advancement/recipes/misc/advpatpropart.json
Expand All @@ -21,6 +21,7 @@ c0a14cdefd30e0680d517cd9083b6c21ab38d7a6 data/advanced_ae/advancement/recipes/mi
f5b69a588049e082b7ae4148cd85f179875639b4 data/advanced_ae/advancement/recipes/misc/smalladvpatpro2.json
74b23b08046d0b4a810ed022ddd21b26ff8cb0b4 data/advanced_ae/advancement/recipes/misc/smalladvpatpropart.json
a43dbea0dfb743372deee07f3883301cee626ce8 data/advanced_ae/advancement/recipes/misc/smallappupgrade.json
639127e0f281e0ae9f5e2c487e9552b9235379e4 data/advanced_ae/advancement/recipes/misc/stock_export_bus.json
d094766f49f8c9cb85ed4125e167da047536790b data/advanced_ae/recipe/advpartenc.json
3b8443500641b89cad92b21f4622c44d5a6811d4 data/advanced_ae/recipe/advpatpro2.json
3c8685e5f15887a2960b835bc5df061a25a90824 data/advanced_ae/recipe/advpatpropart.json
Expand Down Expand Up @@ -60,3 +61,4 @@ dde9d704e98ccadee759bbb804fac6c0790cfdaa data/advanced_ae/recipe/singularity.jso
419c8b2201d4f75a74cae5f8e9d85f6f06eae78e data/advanced_ae/recipe/smalladvpatpro2.json
8f4c9addbbeb7b52120c47fdacff057d4cc7f1ca data/advanced_ae/recipe/smalladvpatpropart.json
fdcbd6ceaee517b8f1e6e68d3f915e47c8024f2b data/advanced_ae/recipe/smallappupgrade.json
914885ddca72b365298cbdb5b77bd0b63dd42df1 data/advanced_ae/recipe/stock_export_bus.json
4 changes: 2 additions & 2 deletions src/generated/resources/assets/advanced_ae/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"gui.advanced_ae.QuantumCrafter": "Quantum Crafter",
"gui.advanced_ae.QuantumCrafterPatternConfig": "Pattern Configuration",
"gui.advanced_ae.ReactionChamber": "Reaction Chamber",
"gui.advanced_ae.SetAmount": "Middle click to set the amount to keep in stock",
"gui.advanced_ae.SetAmountButtonHint": "Set Stock Amount",
"gui.advanced_ae.SetAmount": "Set Stock Amount",
"gui.advanced_ae.SetAmountButtonHint": "Middle click to set the amount to keep in stock",
"gui.advanced_ae.StockExportBus": "Stock Export Bus",
"gui.tooltips.advanced_ae.AcceleratorThreads": "Provides %d co-processing threads per block.",
"gui.tooltips.advanced_ae.AnyButton": "Target the face adjacent to the adv. pattern provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"hasItem": {
"conditions": {
"items": [
{
"items": "ae2:export_bus"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "advanced_ae:stock_export_bus"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"hasItem"
]
],
"rewards": {
"recipes": [
"advanced_ae:stock_export_bus"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"C": {
"item": "ae2:calculation_processor"
},
"E": {
"item": "ae2:export_bus"
},
"L": {
"item": "ae2:logic_processor"
}
},
"pattern": [
" ",
"CEL",
" "
],
"result": {
"count": 1,
"id": "advanced_ae:stock_export_bus_part"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;
import java.util.concurrent.CompletableFuture;

import appeng.core.definitions.AEParts;
import com.glodblock.github.appflux.common.AFSingletons;
import com.glodblock.github.extendedae.common.EAESingletons;
import com.glodblock.github.extendedae.recipe.CrystalAssemblerRecipeBuilder;
Expand Down Expand Up @@ -96,6 +97,15 @@ protected void buildRecipes(@NotNull RecipeOutput c) {
.save(c, AdvancedAE.makeId("quantumcrafter"));

// Items
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, AAEItems.STOCK_EXPORT_BUS)
.pattern(" ")
.pattern("CEL")
.pattern(" ")
.define('E', AEParts.EXPORT_BUS)
.define('C', AEItems.CALCULATION_PROCESSOR)
.define('L', AEItems.LOGIC_PROCESSOR)
.unlockedBy("hasItem", has(AEParts.EXPORT_BUS))
.save(c, AdvancedAE.makeId("stock_export_bus"));
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, AAEItems.ADV_PATTERN_ENCODER)
.pattern("QRQ")
.pattern("RER")
Expand Down

0 comments on commit 5744932

Please sign in to comment.