Skip to content

Commit

Permalink
Merge pull request #479 from MuteTiefling/e9e-feedback-changes
Browse files Browse the repository at this point in the history
E9E Feedback Changes
  • Loading branch information
MuteTiefling authored Jul 12, 2023
2 parents 0485490 + d7eeb2f commit 7537bd1
Show file tree
Hide file tree
Showing 22 changed files with 578 additions and 12 deletions.
4 changes: 4 additions & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
### 🌟 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))
- Added Conversion between Limestone from Quark and Create [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([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))
- Reduce spawn range for Spirit spawners [\#460](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/460) ([MuteTiefling](https://github.com/MuteTiefling))
- Osmium and Tin Raw Ore Blocks now craft down into Raw Ore properly [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling))
- Emeraldite Ore renamed to Emerald Ore and drops adjusted. [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling))
- Budding Dimensional Crystals now spawn in place of Ametrine in Viscal Isles [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling))

---

Expand Down
36 changes: 34 additions & 2 deletions config/ftbquests/quests/chapters/ars_nouveau.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
type: "item"
}
]
x: 1.5d
x: 2.5d
y: -6.0d
}
{
Expand Down Expand Up @@ -902,6 +902,8 @@
"A Warp Scroll may be bound to a location via Right-Click and then used again later to return the player to that exact spot. The Scroll is consumed on use, however."
""
"Alternatively, a portal may be built using any type of Sourcestone in a rectangular shape. Place a filled Source Jar nearby and toss a bound Warp Scroll through the frame to ignite it, linking it to the coordinates from the scroll. Items, mobs, even spells may pass through these portals, though they are incapable of crossing between dimensions. "
""
"Ghostweave, Mirrorweave, and Falseweave may all be used for portal frames as well, allowing for endless customization!"
]
id: "19C9AC76B4E2B19D"
rewards: [{
Expand Down Expand Up @@ -1015,7 +1017,7 @@
type: "item"
}]
title: "Warp Portals"
x: 2.5d
x: 1.5d
y: -6.0d
}
{
Expand Down Expand Up @@ -2315,6 +2317,36 @@
x: -2.0d
y: -1.0d
}
{
dependencies: ["19C9AC76B4E2B19D"]
description: [
"Much like standard Warp Scrolls, Stabilized Warp Scrolls may be used to great portals. They offer two advantages, however. "
""
"First, the scroll may be used to bind to coordinates in other dimensions, allowing cross-dimensional transportation."
""
"Second, it may be used on a block at any time to generate a temporary portal to the bound coordinates. This does not consume the scroll."
]
id: "506FD0059E6BA5F2"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/ars_nouveau/rare"
icon: "kubejs:rare_lootbox"
id: "65B241E708BDD124"
player_command: false
title: "Rare Ars Nouveau Loot Box"
type: "command"
}]
tasks: [{
id: "6AB01F1B52E5A89C"
item: {
Count: 1b
id: "ars_nouveau:stable_warp_scroll"
tag: { }
}
type: "item"
}]
x: 0.5d
y: -5.0d
}
]
title: "Ars Nouveau"
}
36 changes: 34 additions & 2 deletions config/ftbquests/quests/chapters/ars_nouveau_expert.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
type: "item"
}
]
x: 1.5d
x: 2.5d
y: -6.0d
}
{
Expand Down Expand Up @@ -919,6 +919,8 @@
"A Warp Scroll may be bound to a location via Right-Click and then used again later to return the player to that exact spot. The Scroll is consumed on use, however."
""
"Alternatively, a portal may be built using any type of Sourcestone in a rectangular shape. Place a filled Source Jar nearby and toss a bound Warp Scroll through the frame to ignite it, linking it to the coordinates from the scroll. Items, mobs, even spells may pass through these portals, though they are incapable of crossing between dimensions. "
""
"Ghostweave, Mirrorweave, and Falseweave may all be used for portal frames as well, allowing for endless customization!"
]
hide_dependency_lines: true
id: "524A6B28242AA5B8"
Expand Down Expand Up @@ -1033,7 +1035,7 @@
type: "item"
}]
title: "Warp Portals"
x: 2.5d
x: 1.5d
y: -6.0d
}
{
Expand Down Expand Up @@ -2311,6 +2313,36 @@
x: -2.0d
y: -1.0d
}
{
dependencies: ["524A6B28242AA5B8"]
description: [
"Much like standard Warp Scrolls, Stabilized Warp Scrolls may be used to great portals. They offer two advantages, however. "
""
"First, the scroll may be used to bind to coordinates in other dimensions, allowing cross-dimensional transportation."
""
"Second, it may be used on a block at any time to generate a temporary portal to the bound coordinates. This does not consume the scroll."
]
id: "613C01C04BF4A979"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/ars_nouveau/rare"
icon: "kubejs:rare_lootbox"
id: "1F5953E382A8C9C2"
player_command: false
title: "Rare Ars Nouveau Loot Box"
type: "command"
}]
tasks: [{
id: "5633FB2A086B9E68"
item: {
Count: 1b
id: "ars_nouveau:stable_warp_scroll"
tag: { }
}
type: "item"
}]
x: 0.5d
y: -5.0d
}
]
title: "Ars Nouveau"
}
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/chapter_two.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
""
"Earn the boon of the Queen by completing the tasks they require, or by returning to them that which is rightfully theirs."
""
"================================="
"=================================="
""
"Essence of the Bees is a very rare reward, indeed, so do not squander it!"
"Use it to first craft the Gloaming Catalyst before consuming it to receive the rest of the permanent rewards it grants. "
Expand Down
3 changes: 3 additions & 0 deletions kubejs/assets/byg/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"block.byg.emeraldite_ore": "Emerald Ore"
}
11 changes: 9 additions & 2 deletions kubejs/assets/kubejs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@
"ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.interrupted": "Ritual of Calling interrupted.",
"ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.conditions": "Not all requirements for this ritual are met.",

"item.kubejs.ritual_summon_firenando_from_shards": "Ritual: Summon Firenando",
"item.kubejs.ritual_summon_firenando_from_shards.tooltip": "Summon a Firenando",
"item.kubejs.ritual_summon_firenando_from_shards": "Ritual: Summon Flarecannon",
"item.kubejs.ritual_summon_firenando_from_shards.tooltip": "Summon a Flarecannon",
"ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.started": "Ritual of Calling started.",
"ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.finished": "Ritual of Calling completed.",
"ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.interrupted": "Ritual of Calling interrupted.",
Expand Down Expand Up @@ -254,6 +254,13 @@
"ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.interrupted": "Ritual of Binding interrupted.",
"ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.conditions": "Not all requirements for this ritual are met.",

"item.kubejs.ritual_craft_market": "Ritual: Craft Market Stand",
"item.kubejs.ritual_craft_market.tooltip": "Bind a fae to a Market Stand to obtain rare plants.",
"ritual.enigmatica.occultism/ritual/ritual_craft_market.started": "Ritual of Binding started.",
"ritual.enigmatica.occultism/ritual/ritual_craft_market.finished": "Ritual of Binding completed.",
"ritual.enigmatica.occultism/ritual/ritual_craft_market.interrupted": "Ritual of Binding interrupted.",
"ritual.enigmatica.occultism/ritual/ritual_craft_market.conditions": "Not all requirements for this ritual are met.",

"item.kubejs.ritual_craft_module_expansion_card": "Ritual: Craft Module Expansion Card",
"item.kubejs.ritual_craft_module_expansion_card.tooltip": "Bind an Air Elemental to control Tube Modules.",
"ritual.enigmatica.occultism/ritual/ritual_craft_module_expansion_card.started": "Ritual of Binding started.",
Expand Down
3 changes: 2 additions & 1 deletion kubejs/client_scripts/constants/jei_hidden_disabled.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ jei.base.items.disabled = [
/emendatusenigmatica:.*_cluster_shard\b/,

/pendorite/,
/emeraldite/,
/ametrine/,

/theoneprobe/,

/create:crushed_raw_.*/,

'byg:emeraldite_shards',

'createaddition:copper_spool',
'createaddition:spool',
'createaddition:festive_spool',
Expand Down
73 changes: 73 additions & 0 deletions kubejs/data/byg/worldgen/configured_feature/floating_island1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"config": {
"block_provider": {
"entries": [
{
"data": {
"Name": "byg:ether_stone"
},
"weight": 25
},
{
"data": {
"Name": "emendatusenigmatica:budding_dimensional"
},
"weight": 1
},
{
"data": {
"Name": "emendatusenigmatica:dimensional_cluster_shard_block"
},
"weight": 4
}
],
"type": "minecraft:weighted_state_provider"
},
"island_features": [
{
"feature": "byg:island_ametrine_clusters",
"placement": [
{
"heightmap": "MOTION_BLOCKING",
"type": "minecraft:heightmap"
}
]
},
{
"feature": "byg:island_sculk_plants",
"placement": [
{
"heightmap": "MOTION_BLOCKING",
"type": "minecraft:heightmap"
}
]
}
],
"max_radius": 13,
"min_radius": 11,
"top_block_provider": {
"entries": [
{
"data": {
"Name": "byg:vermilion_sculk"
},
"weight": 25
},
{
"data": {
"Name": "emendatusenigmatica:budding_dimensional"
},
"weight": 1
},
{
"data": {
"Name": "emendatusenigmatica:dimensional_cluster_shard_block"
},
"weight": 4
}
],
"type": "minecraft:weighted_state_provider"
}
},
"type": "byg:floating_island1"
}
73 changes: 73 additions & 0 deletions kubejs/data/byg/worldgen/configured_feature/floating_island2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"config": {
"block_provider": {
"entries": [
{
"data": {
"Name": "byg:ether_stone"
},
"weight": 25
},
{
"data": {
"Name": "emendatusenigmatica:budding_dimensional"
},
"weight": 1
},
{
"data": {
"Name": "emendatusenigmatica:dimensional_cluster_shard_block"
},
"weight": 4
}
],
"type": "minecraft:weighted_state_provider"
},
"island_features": [
{
"feature": "byg:island_ametrine_clusters",
"placement": [
{
"heightmap": "MOTION_BLOCKING",
"type": "minecraft:heightmap"
}
]
},
{
"feature": "byg:island_sculk_plants",
"placement": [
{
"heightmap": "MOTION_BLOCKING",
"type": "minecraft:heightmap"
}
]
}
],
"max_radius": 13,
"min_radius": 11,
"top_block_provider": {
"entries": [
{
"data": {
"Name": "byg:vermilion_sculk"
},
"weight": 25
},
{
"data": {
"Name": "emendatusenigmatica:budding_dimensional"
},
"weight": 1
},
{
"data": {
"Name": "emendatusenigmatica:dimensional_cluster_shard_block"
},
"weight": 4
}
],
"type": "minecraft:weighted_state_provider"
}
},
"type": "byg:floating_island2"
}
Loading

0 comments on commit 7537bd1

Please sign in to comment.