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

General improvements #548

Merged
merged 9 commits into from
Jul 29, 2023
Merged

General improvements #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86c87cb
Add likeables for whirli, add wave to spawner rift
MuteTiefling Jul 28, 2023
20aa3ec
Allow Shub Niggurath in the Twilight Forest
MuteTiefling Jul 28, 2023
a5e5e45
chain
MuteTiefling Jul 28, 2023
eeaf9e9
Delete quark-common-1.toml.bak
MuteTiefling Jul 28, 2023
7be952b
improve powah crafting
MuteTiefling Jul 28, 2023
4a2d6ce
Merge branch 'wilden-gateway' of https://github.com/MuteTiefling/Enig…
MuteTiefling Jul 28, 2023
335188a
Update CHANGELOG.md
MuteTiefling Jul 28, 2023
ece4bf4
Update CHANGELOG.md
MuteTiefling Jul 28, 2023
790011c
quest
MuteTiefling Jul 28, 2023
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
7 changes: 7 additions & 0 deletions changelogs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@
- Crystal Cluster blocks may now be converted to Budding via Right Click Interaction. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling))
- Cooldown for Right Click Interactions has been reduced. [\#534](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/534) ([MuteTiefling](https://github.com/MuteTiefling))
- Allow Therium and Subzero blocks to be broken down into the crystals. [\#538](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/538) ([MuteTiefling](https://github.com/MuteTiefling))
- Shub Niggurath may now be summoned in the Twilight Forest. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))
- Whirlisprigs now love Fireflies and Cicadas to help give a boost to their environment. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))
- Chainmail is now cheaper to craft. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))
- Powah Capacitors are now cheaper to craft. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))
- Powah Energy Cables are cheaper to upgrade. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))
- Spawner Rifts will now spawn Wilden as part of the waves. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))

### 🐛 Fixed Bugs

- Removed faulty drawer recipes [\#536](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/536) ([MuteTiefling](https://github.com/MuteTiefling))
- Fix broken ore processing recipes [\#540](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/540) ([MuteTiefling](https://github.com/MuteTiefling))
- Hide visible Expert Storage quest. [\#548](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/548) ([MuteTiefling](https://github.com/MuteTiefling))

### Removed Mods

Expand Down
1 change: 1 addition & 0 deletions config/ftbquests/quests/chapters/storage_expert.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"● $containers/gas"
"● $containers/liquid"
]
hide: true
icon: "minecraft:chest"
id: "49596454693937AC"
rewards: [{
Expand Down
9 changes: 9 additions & 0 deletions kubejs/server_scripts/base/recipes/byg/shaped.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ ServerEvents.recipes((event) => {
A: '#forge:storage_blocks/therium'
},
id: 'byg:chiseled_therium'
},
{
output: '8x byg:chain_plating',
pattern: ['ABA', 'B B', 'ABA'],
key: {
A: '#forge:nuggets/iron',
B: '#forge:ingots/iron'
},
id: 'byg:chain_plating'
}
];

Expand Down
73 changes: 46 additions & 27 deletions kubejs/server_scripts/base/recipes/gateways/gateways.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
},
{
type: 'loot_table',
Expand All @@ -23,7 +23,7 @@ ServerEvents.highPriorityData((event) => {
type: 'loot_table',
loot_table: 'enigmatica:loot_boxes/miners_delight',
rolls: 1,
desc: `Miner's Delight Gems`
desc: `Miner's Delight`
}
],
completion_xp: 250,
Expand All @@ -43,7 +43,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -62,7 +62,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -81,7 +81,26 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
setup_time: 50
},
{
entities: [
{ entity: 'ars_nouveau:wilden_stalker' },
{ entity: 'ars_nouveau:wilden_stalker' },
{ entity: 'ars_nouveau:wilden_stalker' },
{ entity: 'ars_nouveau:wilden_hunter' },
{ entity: 'ars_nouveau:wilden_hunter' },
{ entity: 'ars_nouveau:wilden_guardian' },
{ entity: 'ars_nouveau:wilden_guardian' }
],
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -101,7 +120,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -121,7 +140,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -138,7 +157,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
},
{
type: 'apotheosis:affix',
Expand Down Expand Up @@ -169,7 +188,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 1500,
Expand All @@ -190,7 +209,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 750,
Expand All @@ -201,7 +220,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 1500,
Expand All @@ -222,7 +241,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 1500,
Expand All @@ -239,7 +258,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
},
{
type: 'apotheosis:affix',
Expand Down Expand Up @@ -268,7 +287,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 800,
Expand All @@ -292,7 +311,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 800,
Expand All @@ -316,7 +335,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 800,
Expand All @@ -334,7 +353,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -350,7 +369,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
},
{
type: 'apotheosis:affix',
Expand Down Expand Up @@ -378,7 +397,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -396,7 +415,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -417,7 +436,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -438,7 +457,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -454,7 +473,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
},
{
type: 'apotheosis:affix',
Expand All @@ -479,7 +498,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -497,7 +516,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -518,7 +537,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand All @@ -542,7 +561,7 @@ ServerEvents.highPriorityData((event) => {
rewards: [
{
type: 'stack',
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 20000.0, aura_max: 1500000.0 } }
stack: { item: 'kubejs:aura_leaf', nbt: { aura_amount: 40000.0, aura_max: 2000000.0 } }
}
],
max_wave_time: 2400,
Expand Down
15 changes: 15 additions & 0 deletions kubejs/server_scripts/base/tags/biome/occultism/allows_shub_niggurath_transformation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ServerEvents.tags('worldgen/biome', (event) => {
event.add('occultism:allows_shub_niggurath_transformation', [
'twilightforest:dense_forest',
'twilightforest:dense_mushroom_forest',
'twilightforest:firefly_forest',
'twilightforest:forest',
'twilightforest:mushroom_forest',
'twilightforest:spooky_forest',
'twilightforest:enchanted_forest',
'twilightforest:dense_mushroom_forest',
'twilightforest:dark_forest',
'twilightforest:dark_forest_center',
'twilightforest:snowy_forest'
]);
});
6 changes: 5 additions & 1 deletion kubejs/server_scripts/base/tags/blocks/ars_nouveau/whirlisprig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ServerEvents.tags('block', (event) => {
event.add('ars_nouveau:whirlisprig/greatly_likes', ['twilightforest:liveroot_block']);
event.add('ars_nouveau:whirlisprig/greatly_likes', [
'twilightforest:liveroot_block',
'twilightforest:firefly',
'twilightforest:cicada'
]);

event.add('ars_nouveau:whirlisprig/kinda_likes', ['minecraft:cactus']);
});
1 change: 1 addition & 0 deletions kubejs/server_scripts/normal/recipes/enigmatica/remove.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ServerEvents.recipes((event) => {
}

const recipes = [
{ id: /powah:crafting\/cable_(hardened|blazing|niotic|spirited|nitro)$/ },
// Emendatus Enigmatica Related Stuff for Normal Mode
// Ore Processing Rework Related stuff

Expand Down
Loading