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.

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

E9E Feedback #460

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
### Enigmatica 9 v1.9.0

🚀 Forge-1.19.2-43.2.13 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.8.0.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.8.0.md)

### 🎁 New Mods Added

### 🌟 Improvements

### 🐛 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))

---

### Enigmatica 9 v1.8.1

🚀 Forge-1.19.2-43.2.13 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.8.1.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.8.1.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
enabled = true
#Cost
#Range: > -2147483648
cost = 70
cost = 10
#Is Starter Glyph?
starter = false
#The maximum number of times this glyph may appear in a single spell
#Range: > 1
per_spell_limit = 2147483647
#The tier of the glyph
#Range: 1 ~ 99
glyph_tier = 2
glyph_tier = 1
#Limits the number of times a given augment may be applied to a given effect
#Example entry: "glyph_amplify=5"
augment_limits = []
Expand Down
20 changes: 10 additions & 10 deletions config/ftbquests/quests/chapters/chapter_one.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
{
dependencies: ["69D302194D4262C6"]
description: [
"Right-Click the Gold Leaves on any Log to transform it into the Wooden Stands required for the Ritual of the Forest. "
"Sneak Right-Click the Gold Leaves on any Log to transform it into the Wooden Stands required for the Ritual of the Forest. "
""
"Refer to the Book of Natural Aura for a visual representation of this structure and an explanation on its use. "
]
Expand Down Expand Up @@ -269,14 +269,6 @@
]
id: "4830632A0E6E9651"
rewards: [
{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight"
icon: "kubejs:alchemists_delight"
id: "552050622E3679AC"
player_command: false
title: "Alchemist's Delight"
type: "command"
}
{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight"
icon: "kubejs:sorcerers_delight"
Expand All @@ -285,6 +277,12 @@
title: "Sorcerer's Delight"
type: "command"
}
{
count: 3
id: "643EF395119756CD"
item: "ars_nouveau:arcane_platform"
type: "item"
}
]
tasks: [{
icon: "ars_nouveau:imbuement_chamber"
Expand Down Expand Up @@ -1209,7 +1207,7 @@
description: [
"More finely crafted apparatus will need more delicately formed metals."
""
"These tough mechanical machines, the Mechanical Press and Rolling Mill are up to the task of properly pounding out plates or forming wires and rods, respectively. "
"These tough mechanical machines, the Mechanical Press and Rolling Mill, are up to the task of properly pounding out plates or forming wires and rods, respectively. "
""
"================================="
""
Expand Down Expand Up @@ -1266,6 +1264,8 @@
"With a bit of effort, simpler materials may be harvested from ore, however. Craft a Pestle and Mortar to begin grinding them and a Blast Furnace to smelt it down into a useful form. "
""
"The Pestle and Mortar is easily automated with just a hopper, no manual effort is required. "
""
"To begin, simple metals such as Copper may be worked into an ingot by crushing, blasting, crushing, and blasting one final time. Better methods will become available later. "
]
id: "438EA01F776992AD"
rewards: [
Expand Down
1 change: 1 addition & 0 deletions config/ftbquests/quests/chapters/chapter_three.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@
{
dependencies: ["606F79DAEB15E85B"]
description: ["With greater knowledge of spatial dimensions, the Afrit is capable of carving out an even greater internal volume for use by the spirits running this apparatus, allowing them to perform mor complex tasks. "]
hide: true
id: "7633AE65F02DCD1A"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight"
Expand Down
44 changes: 31 additions & 13 deletions config/ftbquests/quests/chapters/chapter_two.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -213,20 +213,37 @@
}
{
dependencies: ["00B21E64DEFACB40"]
description: ["Capable of imparting a number of enchantments on items, this Enchanting Apparatus will no doubt be of enormous value in the endeavors to come. "]
icon: "ars_nouveau:enchanting_apparatus"
id: "31E4C2A162D7497C"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight"
icon: "kubejs:alchemists_delight"
id: "4C9ACBB578AFC307"
player_command: false
title: "Alchemist's Delight"
type: "command"
}]
tasks: [{
id: "2D56C518D77625DD"
item: "ars_nouveau:enchanting_apparatus"
type: "item"
}]
rewards: [
{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight"
icon: "kubejs:alchemists_delight"
id: "4C9ACBB578AFC307"
player_command: false
title: "Alchemist's Delight"
type: "command"
}
{
count: 3
id: "3EA016A20F0AE7FA"
item: "ars_nouveau:arcane_platform"
type: "item"
}
]
tasks: [
{
id: "2D56C518D77625DD"
item: "ars_nouveau:enchanting_apparatus"
type: "item"
}
{
id: "0C24097F0058189C"
item: "ars_nouveau:arcane_core"
type: "item"
}
]
x: 2.5d
y: -0.5d
}
Expand Down Expand Up @@ -828,6 +845,7 @@
}
{
dependencies: ["60324503ED7AC4C1"]
description: ["Known to the ancients as mountain copper, this unique alloy is of particular use in advanced enchanting as an amplifier. "]
id: "00B21E64DEFACB40"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/scavengers_delight"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1246,14 +1246,6 @@
description: ["Bricks, Treated Wood, and Steel; these are what an Immersive Factory is built from, and the focus of early efforts in the mod. "]
hide_dependency_lines: true
id: "2BE93580D70ADF20"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/immersive_engineering/rare"
icon: "kubejs:rare_lootbox"
id: "7AFEEC7724D63B67"
player_command: false
title: "Rare Immersive Engineering Loot Box"
type: "command"
}]
shape: "hexagon"
tasks: [{
icon: "minecraft:raw_iron"
Expand Down
14 changes: 0 additions & 14 deletions config/ftbquests/quests/chapters/industrial_foregoing_expert.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,6 @@
hide_dependency_lines: true
icon: "minecraft:wheat"
id: "10C9F0F84BF69D0A"
rewards: [{
count: 8
id: "3E0930B1DC35B819"
item: "minecraft:wheat_seeds"
type: "item"
}]
shape: "hexagon"
tasks: [{
icon: "minecraft:wheat_seeds"
Expand All @@ -382,14 +376,6 @@
hide_dependency_lines: true
icon: "industrialforegoing:meat_feeder"
id: "3A4F484FD23B29BA"
rewards: [{
command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/industrial_foregoing/rare"
icon: "kubejs:rare_lootbox"
id: "3858A904658B1C03"
player_command: false
title: "Rare Industrial Foregoing Loot Box"
type: "command"
}]
shape: "hexagon"
tasks: [{
icon: "minecraft:raw_copper"
Expand Down
1 change: 1 addition & 0 deletions kubejs/client_scripts/constants/jei_hidden_disabled.js
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ jei.expert.recipes.hidden = [
'naturesaura:depth_ingot_creation',
'naturesaura:projectile_generator',
'naturesaura:firework_generator',
'naturesaura:gold_powder',
'ars_nouveau:imbuement_chamber',
'ars_nouveau:mycelial_sourcelink',
'ars_nouveau:vitalic_sourcelink',
Expand Down
99 changes: 80 additions & 19 deletions kubejs/server_scripts/base/recipes/create/cutting.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,82 @@ ServerEvents.recipes((event) => {

const recipes = [
{
input: [Item.of('naturesaura:ancient_log')],
outputs: [Item.of('naturesaura:ancient_planks', 6)],
input: ['naturesaura:ancient_log'],
outputs: ['6x naturesaura:ancient_planks'],
processingTime: 50,
id: `${id_prefix}ancient_planks_from_ancient_log`
},
{
input: [Item.of('naturesaura:ancient_bark')],
outputs: [Item.of('naturesaura:ancient_planks', 6)],
input: ['naturesaura:ancient_bark'],
outputs: ['6x naturesaura:ancient_planks'],
processingTime: 50,
id: `${id_prefix}ancient_planks_from_ancient_bark`
},
{
input: ['minecraft:apple'],
outputs: ['2x some_assembly_required:apple_slices'],
processingTime: 30,
id: `${id_prefix}apple_slices`
},
{
input: ['minecraft:bread'],
outputs: ['4x some_assembly_required:bread_slice'],
processingTime: 30,
id: `${id_prefix}bread_slice`
},
{
input: ['some_assembly_required:burger_bun'],
outputs: ['some_assembly_required:burger_bun_bottom', 'some_assembly_required:burger_bun_top'],
processingTime: 30,
id: `${id_prefix}sliced_burger_bun`
},
{
input: ['minecraft:beetroot'],
outputs: ['2x some_assembly_required:chopped_beetroot'],
processingTime: 30,
id: `${id_prefix}chopped_beetroot`
},
{
input: ['minecraft:carrot'],
outputs: ['2x some_assembly_required:chopped_carrot'],
processingTime: 30,
id: `${id_prefix}chopped_carrot`
},
{
input: ['minecraft:golden_carrot'],
outputs: ['2x some_assembly_required:chopped_golden_carrot'],
processingTime: 30,
id: `${id_prefix}chopped_golden_carrot`
},
{
input: ['minecraft:enchanted_golden_apple'],
outputs: ['2x some_assembly_required:enchanted_golden_apple_slices'],
processingTime: 30,
id: `${id_prefix}enchanted_golden_apple_slices`
},
{
input: ['minecraft:golden_apple'],
outputs: ['2x some_assembly_required:golden_apple_slices'],
processingTime: 30,
id: `${id_prefix}golden_apple_slices`
},
{
input: ['#forge:crops/tomato'],
outputs: ['2x some_assembly_required:tomato_slices'],
processingTime: 30,
id: `${id_prefix}tomato_slices`
},
{
input: ['minecraft:pumpkin'],
outputs: ['4x farmersdelight:pumpkin_slice'],
processingTime: 30,
id: `${id_prefix}pumpkin_slice`
},
{
input: ['minecraft:melon'],
outputs: ['8x minecraft:melon_slice'],
processingTime: 30,
id: `${id_prefix}melon_slice`
}
];

Expand All @@ -21,8 +87,8 @@ ServerEvents.recipes((event) => {
let input = material.log.block,
output = material.log.stripped;
recipes.push({
input: [Item.of(input)],
outputs: [Item.of(output)],
input: [input],
outputs: [output],
processingTime: 50,
id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}`
});
Expand All @@ -31,8 +97,8 @@ ServerEvents.recipes((event) => {
input = material.wood.block;
output = material.wood.stripped;
recipes.push({
input: [Item.of(input)],
outputs: [Item.of(output)],
input: [input],
outputs: [output],
processingTime: 50,
id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}`
});
Expand All @@ -41,30 +107,25 @@ ServerEvents.recipes((event) => {
input = material.log.stripped;
output = material.plank.block;
recipes.push({
input: [Item.of(input)],
outputs: [Item.of(output, 6)],
input: [input],
outputs: [`6x ${output}`],
processingTime: 50,
id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}`
});

input = material.wood.stripped;
recipes.push({
input: [Item.of(input)],
outputs: [Item.of(output, 6)],
input: [input],
outputs: [`6x ${output}`],
processingTime: 50,
id: `${id_prefix}${output.replace(':', '_')}_from_${input.replace(':', '_')}`
});
});

recipes.forEach((recipe) => {
recipe.type = 'create:cutting';

// ingredients: [{ item: 'minecraft:oak_log' }],
recipe.ingredients = recipe.input.map((input) => input.toJson());

// results: [{ count: 6, item: 'minecraft:oak_planks' }]
recipe.results = recipe.outputs.map((output) => output.toJson());

recipe.ingredients = recipe.input.map((input) => Ingredient.of(input).toJson());
recipe.results = recipe.outputs.map((output) => Item.of(output).toJson());
event.custom(recipe).id(recipe.id);
});
});
6 changes: 6 additions & 0 deletions kubejs/server_scripts/base/recipes/farmersdelight/cutting.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ ServerEvents.recipes((event) => {
action: 'pickaxe_dig'
},
id: `${id_prefix}nautilus_shell`
},
{
ingredients: [{ item: 'minecraft:melon' }],
result: [{ item: 'minecraft:melon_slice', count: 8 }],
tool: { tag: 'forge:tools/knives' },
id: `farmersdelight:cutting/melon`
}
];

Expand Down
16 changes: 14 additions & 2 deletions kubejs/server_scripts/base/recipes/gateways/gateways.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ ServerEvents.highPriorityData((event) => {
{
type: 'stack',
stack: Item.of('kubejs:aura_leaf', '{aura_amount:20000.0d,aura_max:1500000.0d}')
},
{
type: 'loot_table',
loot_table: 'enigmatica:apotheosis_gem_cache',
rolls: 5,
desc: 'Apotheosis Gems'
},
{
type: 'loot_table',
loot_table: 'enigmatica:loot_boxes/miners_delight',
rolls: 1,
desc: `Miner's Delight Gems`
}
],
completion_xp: 250,
Expand Down Expand Up @@ -61,8 +73,8 @@ ServerEvents.highPriorityData((event) => {
{ entity: 'minecraft:cave_spider' },
{ entity: 'minecraft:cave_spider' },
{ entity: 'minecraft:cave_spider' },
{ entity: 'minecraft:cave_spider' },
{ entity: 'minecraft:cave_spider' },
{ entity: 'twilightforest:slime_beetle' },
{ entity: 'twilightforest:slime_beetle' },
{ entity: 'twilightforest:fire_beetle' },
{ entity: 'twilightforest:fire_beetle' }
],
Expand Down
Loading