diff --git a/kubejs/assets/gtceu/models/block/machine/active_transformer.json b/kubejs/assets/gtceu/models/block/machine/active_transformer.json new file mode 100644 index 000000000..852f3edb9 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/active_transformer.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:active_transformer", + "texture_overrides": { + "all": "tfg:item/deprecated" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/active_power_transformer.json b/kubejs/assets/tfg/blockstates/active_power_transformer.json new file mode 100644 index 000000000..9a0e2d7bb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/active_power_transformer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/active_power_transformer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/active_power_transformer" + }, + "facing=south": { + "model": "tfg:block/machines/active_power_transformer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/active_power_transformer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json new file mode 100644 index 000000000..4d1dfb56f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/machine_casing_power_casing" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json new file mode 100644 index 000000000..18d68ef40 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_power_casing"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/active_power_transformer.json b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json new file mode 100644 index 000000000..c2960ee1c --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:active_power_transformer", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_power_casing" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/active_power_transformer.json b/kubejs/assets/tfg/models/item/active_power_transformer.json new file mode 100644 index 000000000..b3073fdff --- /dev/null +++ b/kubejs/assets/tfg/models/item/active_power_transformer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/active_power_transformer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/machine_casing_power_casing.json b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json new file mode 100644 index 000000000..a77205b25 --- /dev/null +++ b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/machine_casing_power_casing" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png new file mode 100644 index 000000000..651e8d468 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta new file mode 100644 index 000000000..eaf3aa63d --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_power_casing_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png new file mode 100644 index 000000000..65abe574f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png new file mode 100644 index 000000000..f618836e2 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png new file mode 100644 index 000000000..caa8b7323 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png new file mode 100644 index 000000000..17163a5b1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png new file mode 100644 index 000000000..a9472dbe1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png differ diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index 08dcf5c8a..ecdc8cdaa 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -178,5 +178,12 @@ function registerTFGCasingRecipes(event) { .EUt(GTValues.VH[GTValues.LV]) .circuit(2) - + event.recipes.gtceu.assembler('tfg:casings/machine_casing_power_casing') + .itemInputs('gtceu:ostrum_frame', '4x #forge:plates/titanium_tungsten_carbide', '16x #forge:fine_wires/copper', + '16x #forge:fine_wires/tungsten_bismuth_oxide_composite') + .inputFluids(Fluid.of('gtceu:reinforced_epoxy_resin', 288)) + .itemOutputs('2x tfg:machine_casing_power_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 2d6a21215..29dc5e567 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -187,4 +187,15 @@ function registerTFGMultiblockRecipes(event) { F: 'gtceu:mv_electric_piston' }).addMaterialInfo().id('gtceu:shaped/coal_liquefaction_tower') + event.remove({output: 'gtceu:active_transformer'}) + + event.recipes.gtceu.assembler('tfg:active_power_transformer') + .itemInputs('1x gtceu:iv_transformer_1a', '1x #gtceu:circuits/iv', '8x gtceu:uranium_triplatinum_single_wire', + '2x gtceu:hpic_chip') + .inputFluids(Fluid.of('gtceu:ostrum_iodide', 288)) + .itemOutputs('tfg:active_power_transformer') + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 0362ce7d9..e9344dd39 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -123,6 +123,7 @@ const registerTFGBlockTags = (event) => { event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator') event.add('forge:mineable/wrench', 'tfg:reflector') event.add('forge:mineable/wrench', 'tfg:machine_casing_aluminium_plated_steel') + event.add('forge:mineable/wrench', 'tfg:machine_casing_power_casing') event.add('minecraft:mineable/pickaxe', 'tfg:mars_ice') event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index e03e5dc76..58eeab18a 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -96,6 +96,7 @@ function registerTFGMarsMaterials(event) { event.create("ostrum_iodide") .ingot() + .liquid() .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) .iconSet(GTMaterialIconSet.BRIGHT) diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 107407e83..47c0f10df 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -113,7 +113,9 @@ const registerTFGMaterials = (event) => { GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_BOLT_SCREW, GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, - GTMaterialFlags.GENERATE_GEAR + GTMaterialFlags.GENERATE_GEAR, + GTMaterialFlags.GENERATE_FOIL, + GTMaterialFlags.GENERATE_FINE_WIRE ) .fluidPipeProperties(4250, 1700, true, false, false, false) diff --git a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js index fdb862127..ca75d5ef3 100644 --- a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js @@ -51,10 +51,10 @@ function registerTFGNuclearBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_black') .speedFactor(1.1) - .activeOffset(3.5, 2, 3.5) + .activeOffset(2, 2, 2) .activeVelocity(0.0, 0.0, 0.0) .activeParticle('tfg:cooling_steam') - .activeBase(0.0, 12.5, 0.0) + .activeBase(0.0, 13.5, 0.0) .activeCount(2) .activeForced(false) .hasTicker(true)