Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…atica10 into develop
  • Loading branch information
NielsPilgaard committed Nov 5, 2024
2 parents 77eb25e + c3f435b commit 89c1356
Show file tree
Hide file tree
Showing 32 changed files with 590 additions and 37 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
### Enigmatica 10 1.12.1
### Enigmatica 10 1.13.0

#### ⭐ Improvements

- Rice Slime Balls now count as slime balls for more recipes [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- Expanded fuel support for AA, allowing it to burn more coal like substances [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- Added more cross mod crushing compatibility [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- AA Lasers no longer lose power during transmission [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- Tiny TNT no longer breaks blocks, making it safer for crafting [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- Glow Berries are now a source for yellow dye [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- The Market has dropped their prices once again! Rejoice! [\#196](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/196)
- Ronaza's Contact no longer uses Sculk Catalyst on account of it eating the ritual. Nom. [\#202](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/202)
- Add missing blocks to Eldritch Miner [\#204](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/204)

#### 🦟 Bugs Fixed

- Fixed broken logistics quests and a missing icon in genetics quests [(\#195)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/195)
- Unbound Marid no longer blacklisted from spawners [(\#195)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/195)
- Add missing Tin processing recipes [(\#196)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/196)
- Fix missing Lignite crushing recipes [(\#205)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/205)

---

Expand Down
2 changes: 1 addition & 1 deletion config/actuallyadditions-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#Range: > 1
minerLensEnergy = 60000
#If Energy Laser Relays should have energy loss.
laserRelayLoss = true
laserRelayLoss = false
#The cooldown between two generation cycles of the Leaf Generator, in ticks
#Range: > 1
leafGeneratorCooldown = 5
Expand Down
2 changes: 1 addition & 1 deletion config/ae2-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#Enables the ability of the Matter Cannon to break blocks.
matterCannonBlockDamage = true
#Enables the ability of Tiny TNT to break blocks.
tinyTntBlockDamage = true
tinyTntBlockDamage = false
#Changes the channel capacity that cables provide in AE2.
#Allowed Values: INFINITE, DEFAULT, X2, X3, X4
channels = "DEFAULT"
Expand Down
17 changes: 17 additions & 0 deletions config/ftbquests/quests/chapters/0095002B3E34FD9A.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -902,5 +902,22 @@
x: 5.5d
y: 4.0d
}
{
dependencies: ["5BD04F0109CB6704"]
id: "586D65D7CC2B8FCF"
rewards: [{
exclude_from_claim_all: true
id: "62443C7DB450BAB0"
table_id: 2884263910044023563L
type: "loot"
}]
tasks: [{
id: "72396A76EEA759CF"
item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(occultism:books/books_of_binding)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
type: "item"
}]
x: 2.5d
y: -2.0d
}
]
}
12 changes: 12 additions & 0 deletions config/ftbquests/quests/lang/en_us.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -2906,6 +2906,17 @@
"There should be plenty of these inside the Maze to help you keep the buff up while you explore. "
]
quest.5859B0217F1C837A.quest_desc: ["With an Aura Attraction Cart, Aura may be pulled from a centralized Generator and dispersed throughout an area to power machines that might be too far away to otherwise benefit from the Generator. "]
quest.586D65D7CC2B8FCF.quest_desc: [
"As you get into the intricacies of spirit summoning, you may decide that you wish to automate some of these rituals. Since names on books are random, this can make things slightly incompatible with AE2."
""
"By renaming the Dictionary of Spirits in an Anvil, all books bound with it will take on that name, resolving this small issue. So AE2 should have no issue with crafting bound books. "
""
"&6⚠ Note: Job spirits summoned in this "
"&6 way will be owned by the AE2 "
"&6 system’s fake player, making them "
"&6 uncontrollable. This is best used "
"&6 for crafting items."
]
quest.59293885E5C9E8A3.quest_desc: [
"A simple machine used for crushing ores and other materials. "
""
Expand Down Expand Up @@ -4296,6 +4307,7 @@
task.6F72D2074543BF23.title: "Bins"
task.700A9968FA0DA65E.title: "Player Transmitters"
task.70531464F6943384.title: "Pattern Terminals"
task.72396A76EEA759CF.title: "Books of Binding"
task.73C57E2AF9A1F920.title: "Any Chipped Tool"
task.73D7073169A23821.title: "WIP"
task.741114ACD8AABEF6.title: "Demon's Dream"
Expand Down
20 changes: 18 additions & 2 deletions config/ftbquests/quests/reward_tables/2806F6BEA4A73B0B.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,28 @@
random_bonus: 4
}
{
count: 8
count: 4
item: {
count: 1
id: "occultism:book_of_binding_empty"
}
random_bonus: 8
random_bonus: 4
}
{
count: 2
item: {
count: 1
id: "occultism:spirit_attuned_gem"
}
random_bonus: 2
}
{
count: 16
item: {
count: 1
id: "occultism:otherworld_log"
}
random_bonus: 32
}
]
use_title: true
Expand Down
26 changes: 26 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/crushing.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,31 @@ ServerEvents.recipes((event) => {
ingredient: { tag: `c:gems/fluix` },
result: [{ result: { id: 'ae2:fluix_dust', count: 1 } }],
id: `${id_prefix}fluix_dust`
},
{
ingredient: { tag: `c:gems/coal` },
result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/coal`).getId(), count: 1 } }],
id: `${id_prefix}coal_dust`
},
{
ingredient: { tag: `c:gems/lignite_coal` },
result: [{ result: { id: 'modern_industrialization:lignite_coal_dust', count: 1 } }],
id: `${id_prefix}lignite_coal_dust`
},
{
ingredient: { item: 'minecraft:glow_berries' },
result: [{ result: { id: 'minecraft:yellow_dye', count: 2 } }],
id: `${id_prefix}yellow_dye_from_glow_berries`
},
{
ingredient: { item: 'minecraft:ender_pearl' },
result: [{ result: { id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), count: 1 } }],
id: `${id_prefix}ender_pearl_dust`
},
{
ingredient: { item: 'ae2:sky_stone_block' },
result: [{ result: { id: 'ae2:sky_dust', count: 1 } }],
id: `${id_prefix}sky_dust`
}
];

Expand All @@ -35,6 +60,7 @@ ServerEvents.recipes((event) => {
{ primary: 'lead', secondary: 'silver' },
{ primary: 'silver', secondary: 'lead' },
{ primary: 'nickel', secondary: 'iron' },
{ primary: 'tin', secondary: 'iron' },
{ primary: 'uranium', secondary: 'lead' }
];
materials.forEach((material) => {
Expand Down
33 changes: 33 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/liquid_fuel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:actuallyadditions/liquid_fuel/';

const recipes = [
{
fuel: 'justdirethings:refined_t2_fluid_source',
fe_per_mb: 450,
fe_per_tick: 100,
id: `${id_prefix}refined_t2_fluid_source`
},
{
fuel: 'justdirethings:refined_t3_fluid_source',
fe_per_mb: 1300,
fe_per_tick: 130,
id: `${id_prefix}refined_t3_fluid_source`
},
{
fuel: 'justdirethings:refined_t4_fluid_source',
fe_per_mb: 4000,
fe_per_tick: 160,
id: `${id_prefix}refined_t4_fluid_source`
}
];

recipes.forEach((recipe) => {
recipe.type = 'actuallyadditions:liquid_fuel';
let burn_amount = 50;
recipe.fuel = { id: recipe.fuel, amount: burn_amount };
recipe.total_energy = recipe.fe_per_mb * burn_amount;
recipe.burn_time = recipe.total_energy / recipe.fe_per_tick;
event.custom(recipe).id(recipe.id);
});
});
17 changes: 17 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/shapeless.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:actuallyadditions/shapeless/';

const recipes = [
{
output: '4x actuallyadditions:black_quartz',
inputs: ['#c:storage_blocks/black_quartz'],
id: `${id_prefix}black_quartz`
}
];

recipes.forEach((recipe) => {
let r = event.shapeless(recipe.output, recipe.inputs).id(recipe.id);
if (recipe.damage) r.damageIngredient(recipe.damage.item, recipe.damage.amount);
if (recipe.replace) r.replaceIngredient(recipe.replace.item, recipe.replace.replacement);
});
});
100 changes: 100 additions & 0 deletions kubejs/server_scripts/recipes/actuallyadditions/solid_fuel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:actuallyadditions/solid_fuel/';

const recipes = [
{
item: { tag: 'c:gems/lignite_coal' },
fuel_quality: 8,
id: `${id_prefix}lignite_coal`
},
{
item: { tag: 'c:storage_blocks/charcoal' },
fuel_quality: 80,
id: `${id_prefix}charcoal_block`
},
{
item: { tag: 'c:storage_blocks/lignite_coal' },
fuel_quality: 80,
id: `${id_prefix}lignite_coal_block`
},
{
item: { tag: 'c:dusts/charcoal' },
fuel_quality: 8,
id: `${id_prefix}charcoal_dust`
},
{
item: { tag: 'c:dusts/coal' },
fuel_quality: 8,
id: `${id_prefix}coal_dust`
},
{
item: { tag: 'c:dusts/lignite_coal' },
fuel_quality: 8,
id: `${id_prefix}lignite_coal_dust`
},
{
item: { tag: 'c:tiny_dusts/coal' },
fuel_quality: 0.8,
id: `${id_prefix}coal_tiny_dust`
},
{
item: { tag: 'c:tiny_dusts/lignite_coal' },
fuel_quality: 0.8,
id: `${id_prefix}lignite_coal_tiny_dust`
},
{
item: { item: 'evilcraft:blood_waxed_coal' },
fuel_quality: 16,
id: `${id_prefix}blood_waxed_coal`
},
{
item: { tag: 'c:gems/primal_coal' },
fuel_quality: 24,
id: `${id_prefix}primal_coal`
},
{
item: { tag: 'c:gems/blaze_ember' },
fuel_quality: 72,
id: `${id_prefix}blaze_ember`
},
{
item: { tag: 'c:gems/voidflame' },
fuel_quality: 216,
id: `${id_prefix}voidflame`
},
{
item: { tag: 'c:gems/eclipse_ember' },
fuel_quality: 648,
id: `${id_prefix}eclipse_ember`
},
{
item: { tag: 'c:storage_blocks/primal_coal' },
fuel_quality: 240,
id: `${id_prefix}primal_coal_block`
},
{
item: { tag: 'c:storage_blocks/blaze_ember' },
fuel_quality: 720,
id: `${id_prefix}blaze_ember_block`
},
{
item: { tag: 'c:storage_blocks/voidflame' },
fuel_quality: 2160,
id: `${id_prefix}voidflame_block`
},
{
item: { tag: 'c:storage_blocks/eclipse_ember' },
fuel_quality: 6480,
id: `${id_prefix}eclipse_ember_block`
}
];

recipes.forEach((recipe) => {
recipe.type = 'actuallyadditions:solid_fuel';
if (recipe.fuel_quality) {
recipe.burn_time = recipe.fuel_quality * 200;
recipe.total_energy = recipe.fuel_quality * 4000;
}
event.custom(recipe).id(recipe.id);
});
});
56 changes: 56 additions & 0 deletions kubejs/server_scripts/recipes/ars_nouveau/crushing.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,61 @@ ServerEvents.recipes((event) => {
}
],
id: `${id_prefix}fluix_dust`
},
{
input: { tag: `c:gems/coal` },
output: [
{
stack: { id: AlmostUnified.getTagTargetItem(`c:dusts/coal`).getId(), count: 1 },
chance: 1.0,
maxRange: 1
}
],
id: `${id_prefix}coal_dust`
},
{
input: { tag: `c:gems/lignite_coal` },
output: [
{
stack: { id: 'modern_industrialization:lignite_coal_dust', count: 1 },
chance: 1.0,
maxRange: 1
}
],
id: `${id_prefix}lignite_coal_dust`
},
{
input: { item: 'minecraft:glow_berries' },
output: [
{
stack: { id: 'minecraft:yellow_dye', count: 2 },
chance: 1.0,
maxRange: 1
}
],
id: `${id_prefix}yellow_dye_from_glow_berries`
},
{
input: { item: 'minecraft:ender_pearl' },
output: [
{
stack: { id: AlmostUnified.getTagTargetItem(`c:dusts/ender_pearl`).getId(), count: 1 },
chance: 1.0,
maxRange: 1
}
],
id: `${id_prefix}ender_pearl_dust`
},
{
input: { item: 'ae2:sky_stone_block' },
output: [
{
stack: { id: 'ae2:sky_dust', count: 1 },
chance: 1.0,
maxRange: 1
}
],
id: `${id_prefix}sky_dust`
}
];

Expand All @@ -36,6 +91,7 @@ ServerEvents.recipes((event) => {
{ primary: 'lead', secondary: 'silver' },
{ primary: 'silver', secondary: 'lead' },
{ primary: 'nickel', secondary: 'iron' },
{ primary: 'tin', secondary: 'iron' },
{ primary: 'uranium', secondary: 'lead' }
];
materials.forEach((material) => {
Expand Down
Loading

0 comments on commit 89c1356

Please sign in to comment.