Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ protected void registerStatesAndModels() {
}

cell(MEGAItems.BULK_ITEM_CELL);
cell(MEGAItems.BULK_FLUID_CELL);
cell(MEGAItems.RADIOACTIVE_CHEMICAL_CELL);

MEGAItems.getTieredCells().forEach(this::driveCell);
driveCell(MEGAItems.BULK_ITEM_CELL, 0);
driveCell(MEGAItems.BULK_FLUID_CELL, 0);
driveCell(MEGAItems.RADIOACTIVE_CHEMICAL_CELL, 2);

simpleBlockWithItem(MEGABlocks.SKY_STEEL_BLOCK.block(), cubeAll(MEGABlocks.SKY_STEEL_BLOCK.block()));
Expand Down
11 changes: 11 additions & 0 deletions src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,17 @@ protected void buildRecipes(@NotNull RecipeOutput output) {
.define('d', Items.NETHERITE_INGOT)
.unlockedBy("has_bulk_cell_component", has(MEGAItems.BULK_CELL_COMPONENT))
.save(output, MEGACells.makeId("cells/standard/bulk_item_cell"));

ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAItems.BULK_FLUID_CELL)
.pattern("aba")
.pattern("bcb")
.pattern("ddd")
.define('a', AEBlocks.QUARTZ_VIBRANT_GLASS)
.define('b', AEItems.SKY_DUST)
.define('c', MEGAItems.BULK_CELL_COMPONENT)
.define('d', MEGAItems.SKY_BRONZE_INGOT)
.unlockedBy("has_bulk_cell_component", has(MEGAItems.BULK_CELL_COMPONENT))
.save(output, MEGACells.makeId("cells/standard/bulk_fluid_cell"));

ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGABlocks.MEGA_ENERGY_CELL)
.pattern("aaa")
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/assets/megacells/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"item.megacells.accumulation_processor": "Accumulation Processor",
"item.megacells.accumulation_processor_press": "Inscriber Accumulation Press",
"item.megacells.bulk_cell_component": "MEGA Bulk Storage Component",
"item.megacells.bulk_fluid_cell": "MEGA Bulk Bottomless Storage Well",
"item.megacells.bulk_item_cell": "MEGA Bulk Item Storage Cell",
"item.megacells.cable_mega_emc_interface": "MEGA Transmutation Interface",
"item.megacells.cable_mega_interface": "MEGA Interface",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
0.0,
6.0,
2.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
}
],
"textures": {
"cell": "megacells:block/drive/cells/misc_cell",
"particle": "megacells:block/drive/cells/misc_cell"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "megacells:item/bulk_fluid_cell",
"layer1": "ae2:item/storage_cell_led"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_bulk_cell_component": {
"conditions": {
"items": [
{
"items": "megacells:bulk_cell_component"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "megacells:cells/standard/bulk_fluid_cell"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_bulk_cell_component"
]
],
"rewards": {
"recipes": [
"megacells:cells/standard/bulk_fluid_cell"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"a": {
"item": "ae2:quartz_vibrant_glass"
},
"b": {
"item": "ae2:sky_dust"
},
"c": {
"item": "megacells:bulk_cell_component"
},
"d": {
"item": "megacells:sky_bronze_ingot"
}
},
"pattern": [
"aba",
"bcb",
"ddd"
],
"result": {
"count": 1,
"id": "megacells:bulk_fluid_cell"
}
}
5 changes: 5 additions & 0 deletions src/main/java/gripe/_90/megacells/client/MEGACellsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ private static void initStorageCellModels(FMLCommonSetupEvent event) {
StorageCellModels.registerModel(
MEGAItems.BULK_ITEM_CELL,
MEGACells.makeId(modelPrefix + MEGAItems.BULK_ITEM_CELL.id().getPath()));

StorageCellModels.registerModel(
MEGAItems.BULK_FLUID_CELL,
MEGACells.makeId(modelPrefix + MEGAItems.BULK_FLUID_CELL.id().getPath()));

StorageCellModels.registerModel(
MEGAItems.RADIOACTIVE_CHEMICAL_CELL,
Expand All @@ -146,6 +150,7 @@ private static void initItemColours(RegisterColorHandlersEvent.Item event) {
}

standardCells.add(MEGAItems.BULK_ITEM_CELL);
standardCells.add(MEGAItems.BULK_FLUID_CELL);
standardCells.add(MEGAItems.RADIOACTIVE_CHEMICAL_CELL);

event.register(
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/gripe/_90/megacells/definition/MEGAItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import appeng.api.parts.IPart;
import appeng.api.parts.IPartItem;
import appeng.api.parts.PartModels;
import appeng.api.stacks.AEItemKey;
import appeng.api.stacks.AEKeyType;
import appeng.core.definitions.ItemDefinition;
import appeng.items.materials.EnergyCardItem;
Expand Down Expand Up @@ -103,7 +104,8 @@ public static List<CellDefinition> getTieredCells() {
public static final ItemDefinition<EnergyCardItem> GREATER_ENERGY_CARD = item("Greater Energy Card", "greater_energy_card", p -> new EnergyCardItem(p, 8));

public static final ItemDefinition<MaterialItem> BULK_CELL_COMPONENT = item("MEGA Bulk Storage Component", "bulk_cell_component", MaterialItem::new);
public static final ItemDefinition<BulkCellItem> BULK_ITEM_CELL = item("MEGA Bulk Item Storage Cell", "bulk_item_cell", BulkCellItem::new);
public static final ItemDefinition<BulkCellItem> BULK_ITEM_CELL = item("MEGA Bulk Item Storage Cell", "bulk_item_cell", prop -> new BulkCellItem(prop, AEKeyType.items()));
public static final ItemDefinition<BulkCellItem> BULK_FLUID_CELL = item("MEGA Bulk Bottomless Storage Well", "bulk_fluid_cell", prop -> new BulkCellItem(prop, AEKeyType.fluids()));
public static final ItemDefinition<UpgradeCardItem> COMPRESSION_CARD = item("Compression Card", "compression_card", UpgradeCardItem::new);
public static final ItemDefinition<PartItem<DecompressionModulePart>> DECOMPRESSION_MODULE = part("MEGA Decompression Module", "decompression_module", DecompressionModulePart.class, DecompressionModulePart::new);

Expand Down
Loading