Skip to content

Commit

Permalink
Merge pull request #467 from MuteTiefling/e9e-tweaking
Browse files Browse the repository at this point in the history
E9E - Feedback improvements
  • Loading branch information
MuteTiefling authored Jul 8, 2023
2 parents 8e51066 + 2c030ca commit ba0b8bb
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 51 deletions.
2 changes: 2 additions & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### 🌟 Improvements

- Fiery Metal and Liquid Blaze Burners may now be used for PNC heat [\#467](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/467) ([MuteTiefling](https://github.com/MuteTiefling))

### 🐛 Fixed Bugs

- Fix Some Assembly Required sawing recipes [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling))
Expand Down
78 changes: 41 additions & 37 deletions kubejs/assets/pneumaticcraft/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,44 @@
{
"block.pneumaticcraft.compressed_iron_block": "Block of Compressed Iron",
"block.pneumaticcraft.creative_compressed_iron_block": "Creative Compressed Iron Block",
"gui.tooltip.block.pneumaticcraft.heat_pipe": "An insulated core of compressed iron which can transfer heat without losing any to adjacent air or fluid blocks. A more compact alternative to Compressed Iron Blocks. This block can be camouflaged with the Camouflage Applicator tool.",
"gui.tooltip.block.pneumaticcraft.pressure_chamber_valve": "This multi-block structure can be used as air storage. Its primary usage, however, is to compress various materials into other materials. Like Iron into Compressed Iron. Or Coal into Diamonds.",
"block.pneumaticcraft.compressed_iron_block": "Block of Spellbound Invar",
"block.pneumaticcraft.creative_compressed_iron_block": "Creative Spellbound Invar Block",
"gui.tooltip.block.pneumaticcraft.heat_pipe": "An insulated core of compressed iron which can transfer heat without losing any to adjacent air or fluid blocks. A more compact alternative to Spellbound Invar Blocks. This block can be camouflaged with the Camouflage Applicator tool.",
"gui.tooltip.block.pneumaticcraft.pressure_chamber_valve": "This multi-block structure can be used as air storage. Its primary usage, however, is to compress various materials into other materials. Like Invar into Spellbound Invar. Or Coal into Diamonds.",
"gui.tooltip.item.pneumaticcraft.drill_bit_iron": "Cheap, but basic${br}Dig Modes: 1x1",
"gui.tooltip.item.pneumaticcraft.drill_bit_compressed_iron": "Faster than Iron Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3",
"gui.tooltip.item.pneumaticcraft.drill_bit_diamond": "Faster than Compressed Iron Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3, 3x3(+), vein(ores+logs)",
"gui.tooltip.item.pneumaticcraft.drill_bit_netherite": "Faster than Diamond Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3, 3x3(+), vein(ores+logs), 3x3(full), vein(all blocks)",
"item.pneumaticcraft.compressed_iron_boots": "Compressed Iron Boots",
"item.pneumaticcraft.compressed_iron_chestplate": "Compressed Iron Chestplate",
"item.pneumaticcraft.compressed_iron_helmet": "Compressed Iron Helmet",
"item.pneumaticcraft.compressed_iron_gear": "Compressed Iron Gear",
"item.pneumaticcraft.compressed_iron_leggings": "Compressed Iron Leggings",
"item.pneumaticcraft.ingot_iron_compressed": "Compressed Iron Ingot",
"item.pneumaticcraft.drill_bit_compressed_iron": "Compressed Iron Drill Bit",
"item.pneumaticcraft.drill_bit_diamond": "Diamond Drill Bit",
"item.pneumaticcraft.drill_bit_iron": "Iron Drill Bit",
"item.pneumaticcraft.drill_bit_netherite": "Netherite Drill Bit",
"block.pneumaticcraft.flux_compressor": "Flux Compressor",
"pneumaticcraft.advancement.flux_compressor.desc": "Make a Flux Compressor so you can use Forge Energy from other mods for your compression needs.",
"item.pneumaticcraft.module_expansion_card": "Module Expansion Card",
"entity.minecraft.villager.pneumaticcraft.mechanic": "Pressure Mechanic",
"gui.tooltip.item.pneumaticcraft.air_grate_module": "§9Formula: Range(blocks) = 4.0 x pressure(bar), or -16 x pressure(bar) if vacuum${br}${br}§bThis module will repel or attract any entity within range dependent on whether pressure is positive or negative, respectively, and will attempt to insert items into any adjacent inventory. Can also be used to cool Heat Sinks.${br}${br}When upgraded with a Module Expansion Card, the entities affected can be configured via GUI.",
"gui.tooltip.item.pneumaticcraft.charging_module": "This module (de)pressurizes any pressurizable items in the inventory it points at. Note: air can flow both to and from items in the inventory, depending on their pressure and pressure in the tube!${br}${br}When upgraded with a Module Expansion Card, air flows much more quickly.",
"gui.tooltip.item.pneumaticcraft.pressure_gauge_module": "§9Formula: Redstone = 2.0 x pressure(bar)${br}${br}§bThis module emits a redstone signal, the strength of which depends on the tube's pressure.${br}${br}When upgraded with a Module Expansion Card, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.redstone_module": "§bThis module transmits redstone signals to other Redstone Modules on connected tubes. Right-click with any dye to set the channel; right-click with a wrench to toggle between input and output.${br}${br}Upgrade with a Module Expansion Card for extra signal processing operations.",
"gui.tooltip.item.pneumaticcraft.regulator_tube_module": "§bThis module limits the pressure allowed on its low side based on the redstone signal it receives. No signal = 4.9 bar (19.9 for Advanced Pressure Tubes), a full signal = 0 bar (no air allowed through), and other signal levels are interpolated. Air is always allowed to travel \"backwards\" through the Regulator, making it usable as a one-way valve.${br}When upgraded with a Module Expansion Card, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.safety_tube_module": "§bThis module will vent high pressure air if the tube pressure reaches 4.9 bar (19.9 for Advanced Pressure Tubes). Although this prevents explosions, released air is energy loss and wastes fuel.${br}${br}When upgraded with a Module Expansion Card, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.vacuum_module": "§bActs just like a Vacuum Pump, but as a module. Takes pressure at the wide (green) end, and removes it at the narrow (red) end. Install a Module Expansion Card to increase operation speed. Apply a Redstone Signal to prevent operation.",
"pneumaticcraft.gui.redstoneModule.addAdvancedPCB": "Apply a Module Expansion Card to enable more features.",
"item.pneumaticcraft.jet_boots_upgrade_3": "Jet Boots Upgrade: Tier III",
"item.pneumaticcraft.jet_boots_upgrade_5": "Jet Boots Upgrade: Tier V",
"item.pneumaticcraft.jet_boots_upgrade_4": "Jet Boots Upgrade: Tier IV",
"item.pneumaticcraft.jumping_upgrade_2": "Jumping Upgrade: Tier II",
"item.pneumaticcraft.jumping_upgrade_3": "Jumping Upgrade: Tier III",
"item.pneumaticcraft.jumping_upgrade_4": "Jumping Upgrade: Tier IV",
"item.pneumaticcraft.printed_circuit_board": "Finished PCB",
"item.pneumaticcraft.unassembled_netherite_drill_bit": "Unassembled Netherite Drill Bit"
"gui.tooltip.item.pneumaticcraft.drill_bit_compressed_iron": "Faster than Compressed Stone Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3",
"gui.tooltip.item.pneumaticcraft.drill_bit_diamond": "Faster than Botanist's Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3, 3x3(+), vein(ores+logs)",
"gui.tooltip.item.pneumaticcraft.drill_bit_netherite": "Faster than Skyseeker's Drill Bit${br}Dig Modes: 1x1, 1x2, 1x3, 3x3(+), vein(ores+logs), 3x3(full), vein(all blocks)",
"item.pneumaticcraft.compressed_iron_boots": "Spellbound Invar Boots",
"item.pneumaticcraft.compressed_iron_chestplate": "Spellbound Invar Chestplate",
"item.pneumaticcraft.compressed_iron_helmet": "Spellbound Invar Helmet",
"item.pneumaticcraft.compressed_iron_gear": "Spellbound Invar Gear",
"item.pneumaticcraft.compressed_iron_leggings": "Spellbound Invar Leggings",
"item.pneumaticcraft.ingot_iron_compressed": "Spellbound Invar Ingot",
"item.pneumaticcraft.drill_bit_compressed_iron": "Botanist's Drill Bit",
"item.pneumaticcraft.drill_bit_diamond": "Skyseeker's Drill Bit",
"item.pneumaticcraft.drill_bit_iron": "Compressed Stone Drill Bit",
"item.pneumaticcraft.drill_bit_netherite": "Soulstrider's Drill Bit",
"block.pneumaticcraft.flux_compressor": "Arcane Compressor",
"pneumaticcraft.advancement.flux_compressor.desc": "Make a Arcane Compressor so you can use Forge Energy from other mods for your compression needs.",
"item.pneumaticcraft.module_expansion_card": "Module Expansion Crystal",
"entity.minecraft.villager.pneumaticcraft.mechanic": "Magitek Researcher",
"gui.tooltip.item.pneumaticcraft.air_grate_module": "§9Formula: Range(blocks) = 4.0 x pressure(bar), or -16 x pressure(bar) if vacuum${br}${br}§bThis module will repel or attract any entity within range dependent on whether pressure is positive or negative, respectively, and will attempt to insert items into any adjacent inventory. Can also be used to cool Heat Sinks.${br}${br}When upgraded with a Module Expansion Crystal, the entities affected can be configured via GUI.",
"gui.tooltip.item.pneumaticcraft.charging_module": "This module (de)pressurizes any pressurizable items in the inventory it points at. Note: air can flow both to and from items in the inventory, depending on their pressure and pressure in the tube!${br}${br}When upgraded with a Module Expansion Crystal, air flows much more quickly.",
"gui.tooltip.item.pneumaticcraft.pressure_gauge_module": "§9Formula: Redstone = 2.0 x pressure(bar)${br}${br}§bThis module emits a redstone signal, the strength of which depends on the tube's pressure.${br}${br}When upgraded with a Module Expansion Crystal, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.redstone_module": "§bThis module transmits redstone signals to other Redstone Modules on connected tubes. Right-click with any dye to set the channel; right-click with a wrench to toggle between input and output.${br}${br}Upgrade with a Module Expansion Crystal for extra signal processing operations.",
"gui.tooltip.item.pneumaticcraft.regulator_tube_module": "§bThis module limits the pressure allowed on its low side based on the redstone signal it receives. No signal = 4.9 bar (19.9 for Advanced Pressure Tubes), a full signal = 0 bar (no air allowed through), and other signal levels are interpolated. Air is always allowed to travel \"backwards\" through the Regulator, making it usable as a one-way valve.${br}When upgraded with a Module Expansion Crystal, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.safety_tube_module": "§bThis module will vent high pressure air if the tube pressure reaches 4.9 bar (19.9 for Advanced Pressure Tubes). Although this prevents explosions, released air is energy loss and wastes fuel.${br}${br}When upgraded with a Module Expansion Crystal, the threshold can be configured precisely via GUI.",
"gui.tooltip.item.pneumaticcraft.vacuum_module": "§bActs just like a Vacuum Pump, but as a module. Takes pressure at the wide (green) end, and removes it at the narrow (red) end. Install a Module Expansion Crystal to increase operation speed. Apply a Redstone Signal to prevent operation.",
"pneumaticcraft.gui.redstoneModule.addAdvancedPCB": "Apply a Module Expansion Crystal to enable more features.",
"item.pneumaticcraft.jet_boots_upgrade_3": "Jet Boots Upgrade: Tier I",
"item.pneumaticcraft.jet_boots_upgrade_5": "Jet Boots Upgrade: Tier III",
"item.pneumaticcraft.jet_boots_upgrade_4": "Jet Boots Upgrade: Tier II",
"item.pneumaticcraft.jumping_upgrade_2": "Jumping Upgrade: Tier I",
"item.pneumaticcraft.jumping_upgrade_3": "Jumping Upgrade: Tier II",
"item.pneumaticcraft.jumping_upgrade_4": "Jumping Upgrade: Tier III",
"item.pneumaticcraft.printed_circuit_board": "Runic Tensor-Field Matrix",
"item.pneumaticcraft.unassembled_netherite_drill_bit": "Unassembled Soulstrider's Drill Bit",
"pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.smouldering": "Liquid - Smouldering",
"pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.fading": "Liquid - Fading",
"pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.kindled": "Liquid - Kindled",
"pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.seething": "Liquid - Seething"
}
7 changes: 7 additions & 0 deletions kubejs/client_scripts/lang_modifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ const entries = {
}
],
create: [
{
key: 'block.create.brass_block',
value: {
normal: 'Block of Brass',
expert: 'Block of Orichalcum'
}
},
{
key: 'block.create.andesite_bars',
value: {
Expand Down
10 changes: 2 additions & 8 deletions kubejs/server_scripts/base/recipes/gateways/gateways.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,6 @@ ServerEvents.highPriorityData((event) => {
waves: [
{
entities: [
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
Expand All @@ -384,14 +381,11 @@ ServerEvents.highPriorityData((event) => {
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 750,
max_wave_time: 2400,
setup_time: 50
},
{
entities: [
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
{ entity: 'twilightforest:wraith' },
Expand All @@ -405,7 +399,7 @@ ServerEvents.highPriorityData((event) => {
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
}
],
max_wave_time: 1500,
max_wave_time: 2400,
setup_time: 50
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:base/pneumaticcraft/heat_properties/';

const recipes = [
{
description: 'pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.smouldering',
block: 'createaddition:liquid_blaze_burner',
statePredicate: { blaze: 'smouldering' },
temperature: 1700,
thermalResistance: 100000,
id: `${id_prefix}blaze_burner/smouldering`
},
{
description: 'pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.fading',
block: 'createaddition:liquid_blaze_burner',
statePredicate: { blaze: 'fading' },
temperature: 1700,
thermalResistance: 1000,
id: `${id_prefix}blaze_burner/fading`
},
{
description: 'pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.kindled',
block: 'createaddition:liquid_blaze_burner',
statePredicate: { blaze: 'kindled' },
temperature: 1700,
thermalResistance: 500,
id: `${id_prefix}blaze_burner/kindled`
},
{
description: 'pneumaticcraft.gui.jei.description.createaddition_liquid_blaze_burner.seething',
block: 'createaddition:liquid_blaze_burner',
statePredicate: { blaze: 'seething' },
temperature: 1700,
thermalResistance: 50,
id: `${id_prefix}blaze_burner/seething`
}
];

recipes.forEach((recipe) => {
recipe.type = 'pneumaticcraft:heat_properties';
event.custom(recipe).id(recipe.id);
});
});
8 changes: 4 additions & 4 deletions kubejs/server_scripts/expert/recipes/occultism/ritual.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ServerEvents.recipes((event) => {
ritual_dummy: 'occultism:ritual_dummy/summon_foliot_crusher',
ritual_type: 'occultism:summon_spirit_with_job',
pentacle_id: 'occultism:summon_foliot',
duration: 60,
duration: 20,
id: 'occultism:ritual/summon_foliot_crusher'
},
{
Expand All @@ -40,7 +40,7 @@ ServerEvents.recipes((event) => {
ritual_dummy: 'occultism:ritual_dummy/summon_djinni_crusher',
ritual_type: 'occultism:summon_spirit_with_job',
pentacle_id: 'occultism:summon_djinni',
duration: 90,
duration: 20,
id: 'occultism:ritual/summon_djinni_crusher'
},
{
Expand All @@ -59,7 +59,7 @@ ServerEvents.recipes((event) => {
ritual_dummy: 'occultism:ritual_dummy/summon_afrit_crusher',
ritual_type: 'occultism:summon_spirit_with_job',
pentacle_id: 'occultism:summon_afrit',
duration: 120,
duration: 20,
id: 'occultism:ritual/summon_afrit_crusher'
},
{
Expand All @@ -78,7 +78,7 @@ ServerEvents.recipes((event) => {
ritual_dummy: 'occultism:ritual_dummy/summon_marid_crusher',
ritual_type: 'occultism:summon_spirit_with_job',
pentacle_id: 'occultism:summon_marid',
duration: 150,
duration: 20,
id: 'occultism:ritual/summon_marid_crusher'
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ServerEvents.recipes((event) => {
if (global.isExpertMode == false) {
return;
}
const id_prefix = 'enigmatica:expert/pneumaticcraft/heat_properties/';

const recipes = [
{
block: 'twilightforest:fiery_block',
temperature: 1700,
thermalResistance: 250,
heatCapacity: 10000,
transformCold: { block: 'emendatusenigmatica:source_block' },
id: `${id_prefix}fiery_block`
}
];

recipes.forEach((recipe) => {
recipe.type = 'pneumaticcraft:heat_properties';
event.custom(recipe).id(recipe.id);
});
});
4 changes: 2 additions & 2 deletions kubejs/server_scripts/expert/recipes/spirit/soul_engulfing.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ServerEvents.recipes((event) => {
['ABA', 'B&B', 'ABA']
],
keys: {
A: { block: '#forge:storage_blocks/brass' },
A: { block: 'ars_nouveau:arcane_core' },
B: { block: '#forge:storage_blocks/source' },
C: { block: 'minecraft:wither_skeleton_skull' }
}
Expand All @@ -38,7 +38,7 @@ ServerEvents.recipes((event) => {
['ABA', 'B&B', 'ABA']
],
keys: {
A: { block: '#forge:storage_blocks/brass' },
A: { block: 'ars_nouveau:arcane_core' },
B: { block: '#forge:storage_blocks/source' },
C: { block: 'minecraft:wither_skeleton_skull' }
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ServerEvents.recipes((event) => {
if (global.isNormalMode == false) {
return;
}
const id_prefix = 'enigmatica:normal/pneumaticcraft/heat_properties/';

const recipes = [
{
block: 'twilightforest:fiery_block',
temperature: 1700,
thermalResistance: 250,
heatCapacity: 10000,
transformCold: { block: 'minecraft:iron_block' },
id: `${id_prefix}fiery_block`
}
];

recipes.forEach((recipe) => {
recipe.type = 'pneumaticcraft:heat_properties';
event.custom(recipe).id(recipe.id);
});
});

0 comments on commit ba0b8bb

Please sign in to comment.