Skip to content

Commit e5b5a16

Browse files
GhostipediaGhostipedia
committed
The Datagen now that it doesn't suck or nuke my structure pattern
1 parent 82c877b commit e5b5a16

9 files changed

Lines changed: 69 additions & 45 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ org.gradle.caching = true
66
# Mod Properties
77
mod_id = cosmiccore
88
mod_name = Cosmic Core
9-
mod_version = 0.9.9
9+
mod_version = 0.10.0
1010
mod_description = The Core of Cosmic Frontiers!
1111
mod_authors = Ghostipedia
1212
mod_license = Code : LGPL-3.0 , Assets: Refer to Github.

‎src/generated/resources/assets/cosmiccore/lang/en_ud.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"block.cosmiccore.arcane_crucible": "ǝןqıɔnɹƆ ǝuɐɔɹⱯ",
4444
"block.cosmiccore.arcane_distillery": "ʎɹǝןןıʇsıᗡ ǝuɐɔɹⱯ9§",
4545
"block.cosmiccore.atmo_pump": "uoɥdıS ɔıɹǝɥdsoɯʇⱯ9§",
46-
"block.cosmiccore.atomic_reconstructor": "ɹoʇɔɐǝᴚ uoıssıℲ ʇןɐS pǝɥɔnoʇpıoΛϛ§",
46+
"block.cosmiccore.atomic_reconstructor": "ɹoʇɔnɹʇsuoɔǝᴚ ɔıɯoʇⱯ ʇןoqpɐᴚ9§",
4747
"block.cosmiccore.bee_holder": "ɹǝpןoH ǝǝᗺ",
4848
"block.cosmiccore.bichromal_nevramite_casing": "buısɐƆ ǝʇıɯɐɹʌǝN ןɐɯoɹɥɔıᗺ",
4949
"block.cosmiccore.biovat": "ʇɐʌoıᗺ",

‎src/generated/resources/assets/cosmiccore/lang/en_us.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"block.cosmiccore.arcane_crucible": "Arcane Crucible",
4444
"block.cosmiccore.arcane_distillery": "§6Arcane Distillery",
4545
"block.cosmiccore.atmo_pump": "§6Atmospheric Siphon",
46-
"block.cosmiccore.atomic_reconstructor": "§5Voidtouched Salt Fission Reactor",
46+
"block.cosmiccore.atomic_reconstructor": "§6Radbolt Atomic Reconstructor",
4747
"block.cosmiccore.bee_holder": "Bee Holder",
4848
"block.cosmiccore.bichromal_nevramite_casing": "Bichromal Nevramite Casing",
4949
"block.cosmiccore.biovat": "Biovat",

‎src/generated/resources/assets/cosmiccore/models/block/machine/atomic_reconstructor.json‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,96 @@
11
{
22
"parent": "minecraft:block/block",
3+
"dynamic_renders": [
4+
{
5+
"type": "cosmiccore:hellfire_foundry_parts",
6+
"casing_block": {
7+
"Name": "cosmiccore:highly_conductive_fission_casing"
8+
}
9+
}
10+
],
311
"loader": "gtceu:machine",
412
"machine": "cosmiccore:atomic_reconstructor",
513
"texture_overrides": {
6-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing"
14+
"all": "cosmiccore:block/casings/solid/ethersteel_plated_ash_tiles"
715
},
816
"variants": {
917
"is_formed=false,recipe_logic_status=idle": {
1018
"model": {
1119
"parent": "gtceu:block/machine/template/cube_all/sided",
1220
"textures": {
13-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
14-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
21+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
22+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front",
23+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_emissive"
1524
}
1625
}
1726
},
1827
"is_formed=false,recipe_logic_status=suspend": {
1928
"model": {
2029
"parent": "gtceu:block/machine/template/cube_all/sided",
2130
"textures": {
22-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
23-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
31+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
32+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front",
33+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_emissive"
2434
}
2535
}
2636
},
2737
"is_formed=false,recipe_logic_status=waiting": {
2838
"model": {
2939
"parent": "gtceu:block/machine/template/cube_all/sided",
3040
"textures": {
31-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
32-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
41+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
42+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front_active",
43+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_active_emissive"
3344
}
3445
}
3546
},
3647
"is_formed=false,recipe_logic_status=working": {
3748
"model": {
3849
"parent": "gtceu:block/machine/template/cube_all/sided",
3950
"textures": {
40-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
41-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
51+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
52+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front_active",
53+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_active_emissive"
4254
}
4355
}
4456
},
4557
"is_formed=true,recipe_logic_status=idle": {
4658
"model": {
4759
"parent": "gtceu:block/machine/template/cube_all/sided",
4860
"textures": {
49-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
50-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
61+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
62+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front",
63+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_emissive"
5164
}
5265
}
5366
},
5467
"is_formed=true,recipe_logic_status=suspend": {
5568
"model": {
5669
"parent": "gtceu:block/machine/template/cube_all/sided",
5770
"textures": {
58-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
59-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
71+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
72+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front",
73+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_emissive"
6074
}
6175
}
6276
},
6377
"is_formed=true,recipe_logic_status=waiting": {
6478
"model": {
6579
"parent": "gtceu:block/machine/template/cube_all/sided",
6680
"textures": {
67-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
68-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
81+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
82+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front_active",
83+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_active_emissive"
6984
}
7085
}
7186
},
7287
"is_formed=true,recipe_logic_status=working": {
7388
"model": {
7489
"parent": "gtceu:block/machine/template/cube_all/sided",
7590
"textures": {
76-
"all": "cosmiccore:block/casings/solid/high_temperature_fission_casing",
77-
"overlay_front": "cosmiccore:block/overlay/machine/roaster/overlay_front"
91+
"all": "cosmiccore:block/casings/solid/soul_stained_steel_aluminium_plated_casing",
92+
"overlay_front": "gtceu:block/multiblock/network_switch/overlay_front_active",
93+
"overlay_front_emissive": "gtceu:block/multiblock/network_switch/overlay_front_active_emissive"
7894
}
7995
}
8096
}

‎src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicItems.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,6 @@ public boolean isFoil(ItemStack stack) {
13771377
.defaultModel()
13781378
.register();
13791379

1380-
13811380
// Harmonic (ZPM-UEV)
13821381
public static final ItemEntry<ComponentItem> SONAR_PROCESSOR = REGISTRATE
13831382
.item("harmonic_processor", ComponentItem::create)
@@ -2527,6 +2526,7 @@ public boolean isFoil(ItemStack stack) {
25272526
.properties(p -> p.stacksTo(1))
25282527
.defaultModel()
25292528
.register();
2529+
25302530
public static ICustomDescriptionId cellName() {
25312531
return new ICustomDescriptionId() {
25322532

‎src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@ public static void register() {
198198

199199
VibrantAlloy = new Material.Builder(CosmicCore.id("vibrant_alloy"))
200200
.ingot()
201-
.formula("Au((CuAu4)(ZnCu3)Fe2(Ni(AuAgCu3)Fe3)4)?4(Ma2FeMnNi(Si(Fe2S2)5(Cr2(ZiAbAl)Hg3)(Ti2LPt)(BeK4N5)(CS)",true)
201+
.formula(
202+
"Au((CuAu4)(ZnCu3)Fe2(Ni(AuAgCu3)Fe3)4)?4(Ma2FeMnNi(Si(Fe2S2)5(Cr2(ZiAbAl)Hg3)(Ti2LPt)(BeK4N5)(CS)",
203+
true)
202204
.liquid(new FluidBuilder().temperature(1100))
203205
.color(0xa4ff70).secondaryColor(0x24e048).iconSet(MaterialIconSet.METALLIC)
204206
.flags(GENERATE_BOLT_SCREW, GENERATE_ROUND, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING,
@@ -212,7 +214,7 @@ public static void register() {
212214
.color(0xc48aff).secondaryColor(0x6A3CBF).iconSet(MaterialIconSet.METALLIC)
213215
.flags(GENERATE_BOLT_SCREW, GENERATE_ROUND, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING,
214216
GENERATE_FRAME, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_DENSE)
215-
.components(BlackSteel, 2, Moondrop, 4, EnderPearl, 2, Hafnium,3)
217+
.components(BlackSteel, 2, Moondrop, 4, EnderPearl, 2, Hafnium, 3)
216218
.blastTemp(4500, BlastProperty.GasTier.HIGHER, GTValues.VA[GTValues.IV], 2430)
217219
.buildAndRegister();
218220

‎src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/AtomicReconstructor.java‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
21
package com.ghostipedia.cosmiccore.common.machine.multiblock.multi;
32

43
import com.ghostipedia.cosmiccore.CosmicCore;
4+
import com.ghostipedia.cosmiccore.client.renderer.machine.CosmicDynamicRenderHelpers;
55
import com.ghostipedia.cosmiccore.common.data.CosmicBlocks;
66
import com.ghostipedia.cosmiccore.gtbridge.CosmicRecipeTypes;
7+
8+
import com.gregtechceu.gtceu.GTCEu;
79
import com.gregtechceu.gtceu.api.data.RotationState;
810
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
911
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
@@ -12,26 +14,30 @@
1214
import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
1315
import com.gregtechceu.gtceu.common.data.GTBlocks;
1416
import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;
17+
1518
import com.sammy.malum.registry.common.block.BlockRegistry;
19+
import wayoftime.bloodmagic.BloodMagic;
1620

1721
import static com.ghostipedia.cosmiccore.api.registries.CosmicRegistration.REGISTRATE;
22+
import static com.ghostipedia.cosmiccore.common.data.CosmicBlocks.ETHERSTEEL_PLATED_ASH_TILES;
1823
import static com.ghostipedia.cosmiccore.common.data.CosmicBlocks.HIGH_TEMP_FISSION_CASING;
24+
import static com.ghostipedia.cosmiccore.common.data.datagen.CosmicMachineModels.createSeparateControllerCasingMachineModel;
1925
import static com.gregtechceu.gtceu.api.pattern.Predicates.*;
2026

2127
public class AtomicReconstructor {
2228

2329
public final static MultiblockMachineDefinition ATOMIC_RECONSTRUCTOR = REGISTRATE
2430
.multiblock("atomic_reconstructor",
2531
WorkableElectricMultiblockMachine::new)
26-
.langValue("§5Voidtouched Salt Fission Reactor")
32+
.langValue("§6Radbolt Atomic Reconstructor")
2733
.rotationState(RotationState.NON_Y_AXIS)
2834
.recipeType(CosmicRecipeTypes.VILE_FISSION)
29-
.appearanceBlock(HIGH_TEMP_FISSION_CASING)
30-
.partAppearance((controller, part, side) -> HIGH_TEMP_FISSION_CASING.getDefaultState())
35+
.appearanceBlock(ETHERSTEEL_PLATED_ASH_TILES)
36+
.partAppearance((controller, part, side) -> ETHERSTEEL_PLATED_ASH_TILES.getDefaultState())
3137
.recipeModifiers(
3238
GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK_SUBTICK),
3339
GTRecipeModifiers.BATCH_MODE)
34-
// spotless: off
40+
// spotless:off
3541
.pattern(definition -> FactoryBlockPattern.start()
3642
.aisle(" AAAAAAA ", " DAAAAAD ", " DA AD ", " DA AD ", " D D ", " D D ", " D D ", " D D ", " D D ", " DA AD ", " DA AD ", " DAAAAAD ", " AAAAAAA ", " ")
3743
.aisle("AAAAA ADAAADA DDD ", "A A ADDDDDA GGG ", "A A A A DDD ", "A A A A GGG ", "A A DDD ", "A A A ", "A A A ", "A A A ", "A A ", "A A A A ", "AAAAA A A ", " ADDDDDA ", " ADAAADA ", " AAAAA ")
@@ -43,20 +49,23 @@ public class AtomicReconstructor {
4349

4450
.where(' ', any())
4551
.where('Q', controller(blocks(definition.getBlock())))
46-
.where('A', blocks(HIGH_TEMP_FISSION_CASING.get())
52+
.where('A', blocks(CosmicBlocks.SOUL_STAINED_STEEL_ALU_CASING.get()))
53+
.where('B', blocks(ETHERSTEEL_PLATED_ASH_TILES.get())
4754
.or(autoAbilities(CosmicRecipeTypes.VOID_SALT_FISSION))
4855
.or(abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2,2))
4956
.or(abilities(PartAbility.MAINTENANCE).setExactLimit(1)))
50-
.where('B', blocks(BlockRegistry.BLOCK_OF_SOULSTONE.get()))
51-
.where('C', blocks(CosmicBlocks.HIGHLY_CONDUCTIVE_FISSION_CASING.get()))
52-
.where('D', blocks(GTBlocks.CASING_LAMINATED_GLASS.get()))
53-
.where('E', blocks(BlockRegistry.BLOCK_OF_VOID_SALTS.get()))
54-
.where('F', blocks(BlockRegistry.BLOCK_OF_MALIGNANT_LEAD.get()))
55-
.where('G', blocks(BlockRegistry.BLOCK_OF_MALIGNANT_PEWTER.get()))
57+
.where('C', blocks(GTBlocks.CASING_STAINLESS_CLEAN.get()))
58+
.where('D', blocks(ETHERSTEEL_PLATED_ASH_TILES.get()))
59+
.where('F', blocks(GTBlocks.COIL_CUPRONICKEL.get()))
60+
.where('G', blocks(GTBlocks.CASING_LAMINATED_GLASS.get()))
5661
.build())
57-
// spotless: on
58-
.workableCasingModel(CosmicCore.id("block/casings/solid/high_temperature_fission_casing"),
59-
CosmicCore.id("block/overlay/machine/roaster"))
62+
// spotless:on
63+
.model(createSeparateControllerCasingMachineModel(
64+
CosmicCore.id("block/casings/solid/soul_stained_steel_aluminium_plated_casing"),
65+
CosmicCore.id("block/casings/solid/ethersteel_plated_ash_tiles"),
66+
GTCEu.id("block/multiblock/network_switch"))
67+
.andThen(model -> model
68+
.addDynamicRenderer(CosmicDynamicRenderHelpers::createHellfireFoundryPartRender)))
6069
.register();
6170

6271
public static void init() {}

‎src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/VileFissionReactor.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
21
package com.ghostipedia.cosmiccore.common.machine.multiblock.multi;
32

43
import com.ghostipedia.cosmiccore.CosmicCore;
54
import com.ghostipedia.cosmiccore.api.machine.part.CosmicPartAbility;
65
import com.ghostipedia.cosmiccore.common.data.CosmicBlocks;
76
import com.ghostipedia.cosmiccore.gtbridge.CosmicRecipeTypes;
8-
import com.gregtechceu.gtceu.GTCEu;
7+
98
import com.gregtechceu.gtceu.api.data.RotationState;
109
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
1110
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
1211
import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
1312
import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern;
1413
import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
1514
import com.gregtechceu.gtceu.common.data.GTBlocks;
16-
import com.gregtechceu.gtceu.common.data.GTMaterials;
1715
import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;
16+
1817
import com.sammy.malum.registry.common.block.BlockRegistry;
19-
import net.minecraftforge.common.Tags;
2018

2119
import static com.ghostipedia.cosmiccore.api.registries.CosmicRegistration.REGISTRATE;
2220
import static com.ghostipedia.cosmiccore.common.data.CosmicBlocks.HIGH_TEMP_FISSION_CASING;
2321
import static com.gregtechceu.gtceu.api.pattern.Predicates.*;
24-
import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_INVAR_HEATPROOF;
2522

2623
public class VileFissionReactor {
2724

‎src/main/java/com/ghostipedia/cosmiccore/common/machine/multiblock/multi/VoidSaltReactor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
package com.ghostipedia.cosmiccore.common.machine.multiblock.multi;
32

43
import com.ghostipedia.cosmiccore.CosmicCore;
5-
import com.ghostipedia.cosmiccore.api.machine.part.CosmicPartAbility;
64
import com.ghostipedia.cosmiccore.common.data.CosmicBlocks;
75
import com.ghostipedia.cosmiccore.gtbridge.CosmicRecipeTypes;
6+
87
import com.gregtechceu.gtceu.api.data.RotationState;
98
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
109
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
@@ -13,6 +12,7 @@
1312
import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
1413
import com.gregtechceu.gtceu.common.data.GTBlocks;
1514
import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;
15+
1616
import com.sammy.malum.registry.common.block.BlockRegistry;
1717

1818
import static com.ghostipedia.cosmiccore.api.registries.CosmicRegistration.REGISTRATE;

0 commit comments

Comments
 (0)