Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework Storage Disassembly system to be based on Custom Recipes / Impl #6934 #8207

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Rework Storage Disassembly system to be based on Custom Recipes / Impl #6934 #8207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e949e74
Impl #6934
Kanzaji Oct 6, 2024
55811a3
Impl CraftingUnitUpgradeRecipe for CraftingBlockItem
Kanzaji Oct 6, 2024
4206331
Fix Upgrading Cells voiding the previous component.
Kanzaji Oct 6, 2024
eee5cb5
Add RecipeProvider for the new CraftingUnitUpgradeRecipe
Kanzaji Oct 6, 2024
6af2c4a
Fix Upgrade Recipes (Wrong item!)
Kanzaji Oct 6, 2024
a62911b
Added Additional checks for CraftingUnitUpgradeRecipe
Kanzaji Oct 7, 2024
8c15831
Portable / Storage Cells now use custom recipes for disassembly + Few…
Kanzaji Oct 7, 2024
dae557e
Presentation woopsie!
Kanzaji Oct 7, 2024
91ca1c0
Run Style task
Kanzaji Oct 7, 2024
65f0a7f
Style!
Kanzaji Oct 7, 2024
9afacf6
Remove Disassembly related Configuration options
Kanzaji Oct 7, 2024
82bba93
Separate Portable Storage Cells recipes from Storage Cell recipes
Kanzaji Oct 7, 2024
e3860f4
Style!
Kanzaji Oct 7, 2024
991d4f1
Update AbstractCraftingUnitBlock.java
Kanzaji Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/generated/resources/assets/ae2/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"achievement.ae2.StorageBus.desc": "Craft a Storage Bus",
"achievement.ae2.StorageCell": "Better Than Chests",
"achievement.ae2.StorageCell.desc": "Craft a Storage Cell",
"ae2.crafting_unit_busy": "This Crafting Unit is busy!",
"ae2.emi_integration.category_charger": "Charger",
"ae2.emi_integration.category_condenser": "Condenser",
"ae2.emi_integration.category_entropy_manipulator": "Entropy Manipulator",
Expand Down
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/16k_crafting_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:16k_crafting_storage",
"disassembly_items": [
{
"count": 1,
"id": "ae2:cell_component_16k"
}
],
"upgrade_items": [
"ae2:cell_component_16k"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/1k_crafting_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:1k_crafting_storage",
"disassembly_items": [
{
"count": 1,
"id": "ae2:cell_component_1k"
}
],
"upgrade_items": [
"ae2:cell_component_1k"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/256k_crafting_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:256k_crafting_storage",
"disassembly_items": [
{
"count": 1,
"id": "ae2:cell_component_256k"
}
],
"upgrade_items": [
"ae2:cell_component_256k"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/4k_crafting_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:4k_crafting_storage",
"disassembly_items": [
{
"count": 1,
"id": "ae2:cell_component_4k"
}
],
"upgrade_items": [
"ae2:cell_component_4k"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/64k_crafting_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:64k_crafting_storage",
"disassembly_items": [
{
"count": 1,
"id": "ae2:cell_component_64k"
}
],
"upgrade_items": [
"ae2:cell_component_64k"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/crafting_accelerator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:crafting_accelerator",
"disassembly_items": [
{
"count": 1,
"id": "ae2:engineering_processor"
}
],
"upgrade_items": [
"ae2:engineering_processor"
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/crafting_monitor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "ae2:crafting_unit_transform",
"block": "ae2:crafting_monitor",
"disassembly_items": [
{
"count": 1,
"id": "ae2:storage_monitor"
}
],
"upgrade_items": [
"ae2:storage_monitor"
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/fluid_storage_cell_16k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:fluid_storage_cell_16k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_16k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/fluid_storage_cell_1k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:fluid_storage_cell_1k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_1k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/fluid_storage_cell_256k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:fluid_storage_cell_256k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_256k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/fluid_storage_cell_4k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:fluid_storage_cell_4k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_4k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/fluid_storage_cell_64k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:fluid_storage_cell_64k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_64k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/item_storage_cell_16k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:item_storage_cell_16k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:item_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_16k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/item_storage_cell_1k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:item_storage_cell_1k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:item_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_1k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/item_storage_cell_256k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:item_storage_cell_256k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:item_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_256k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/item_storage_cell_4k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:item_storage_cell_4k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:item_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_4k"
}
]
}
14 changes: 14 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/item_storage_cell_64k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:item_storage_cell_64k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:item_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_64k"
}
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/portable_fluid_cell_16k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:portable_fluid_cell_16k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:chest"
},
{
"count": 1,
"id": "ae2:energy_cell"
},
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_16k"
}
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/portable_fluid_cell_1k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:portable_fluid_cell_1k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:chest"
},
{
"count": 1,
"id": "ae2:energy_cell"
},
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_1k"
}
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/portable_fluid_cell_256k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:portable_fluid_cell_256k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:chest"
},
{
"count": 1,
"id": "ae2:energy_cell"
},
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_256k"
}
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/portable_fluid_cell_4k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:portable_fluid_cell_4k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:chest"
},
{
"count": 1,
"id": "ae2:energy_cell"
},
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_4k"
}
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/ae2/recipe/upgrade/portable_fluid_cell_64k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "ae2:storage_cell_disassembly",
"cell": "ae2:portable_fluid_cell_64k",
"cell_disassembly_items": [
{
"count": 1,
"id": "ae2:chest"
},
{
"count": 1,
"id": "ae2:energy_cell"
},
{
"count": 1,
"id": "ae2:fluid_cell_housing"
},
{
"count": 1,
"id": "ae2:cell_component_64k"
}
]
}
Loading