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 20, 2024
2 parents 4bb1c71 + fe25b22 commit 0aa33f4
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 15 deletions.
18 changes: 10 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- Custom flight potion no longer available. Switched to superior potion of flying from Apotheosis [(\#213)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/213)
- Occultism chalk has been made unbreakable due to inability to see how damaged it is in a ritual bag [(\#213)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/213)
- Structory tower and arcane library loot has been buffed [(\#213)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/213)
- Theurgy Calcination and Distillation sped up to reduce number of machines needed [(\#217)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/217)
- Dragons in drygmy farms will now drop eggs, heads, and breath at a reduced rate [(\#218)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/218)

#### 🦟 Bugs Fixed

Expand All @@ -18,17 +20,17 @@ NeoForge-1.21.1-21.1.74 | [Mod Updates](https://github.com/EnigmaticaModpacks/En

#### ✔️ Added Mods

* [Ars Nouveau's Flavors & Delight](https://www.curseforge.com/minecraft/mc-mods/ars-nouveaus-flavors-delight) (by [lcy0x1](https://www.curseforge.com/members/lcy0x1/projects))
* [Client Sort](https://www.curseforge.com/minecraft/mc-mods/clientsort) (by [NotRyken](https://www.curseforge.com/members/NotRyken/projects))
* [Enigmatic Unity](https://www.curseforge.com/minecraft/mc-mods/enigmatic-unity) (by [Darkere](https://www.curseforge.com/members/Darkere/projects))
* [Glassential Renewed (Fabric/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/glassential-renewed) (by [big_energy](https://www.curseforge.com/members/big_energy/projects))
* [libIPN](https://www.curseforge.com/minecraft/mc-mods/libipn) (by [mirinimi](https://www.curseforge.com/members/mirinimi/projects))
* [Smithing Template Viewer for JEI/EMI](https://www.curseforge.com/minecraft/mc-mods/smithing-template-viewer) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects))
- [Ars Nouveau's Flavors & Delight](https://www.curseforge.com/minecraft/mc-mods/ars-nouveaus-flavors-delight) (by [lcy0x1](https://www.curseforge.com/members/lcy0x1/projects))
- [Client Sort](https://www.curseforge.com/minecraft/mc-mods/clientsort) (by [NotRyken](https://www.curseforge.com/members/NotRyken/projects))
- [Enigmatic Unity](https://www.curseforge.com/minecraft/mc-mods/enigmatic-unity) (by [Darkere](https://www.curseforge.com/members/Darkere/projects))
- [Glassential Renewed (Fabric/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/glassential-renewed) (by [big_energy](https://www.curseforge.com/members/big_energy/projects))
- [libIPN](https://www.curseforge.com/minecraft/mc-mods/libipn) (by [mirinimi](https://www.curseforge.com/members/mirinimi/projects))
- [Smithing Template Viewer for JEI/EMI](https://www.curseforge.com/minecraft/mc-mods/smithing-template-viewer) (by [Buuz135](https://www.curseforge.com/members/Buuz135/projects))

#### ❌ Removed Mods

* [Curios API (Forge/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/curios) (by [TheIllusiveC4](https://www.curseforge.com/members/TheIllusiveC4/projects))
* [Inventory Sorter](https://www.curseforge.com/minecraft/mc-mods/inventory-sorter) (by [cpw](https://www.curseforge.com/members/cpw/projects))
- [Curios API (Forge/NeoForge)](https://www.curseforge.com/minecraft/mc-mods/curios) (by [TheIllusiveC4](https://www.curseforge.com/members/TheIllusiveC4/projects))
- [Inventory Sorter](https://www.curseforge.com/minecraft/mc-mods/inventory-sorter) (by [cpw](https://www.curseforge.com/members/cpw/projects))

#### ⭐ Improvements

Expand Down
4 changes: 4 additions & 0 deletions kubejs/server_scripts/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ function onlyDrygmy(event, entity) {
return event.addEntityModifier(entity).matchAttackerCustom((attacker) => attacker.uuid.toString() == DRYGMY_UUID);
}

function notDrygmy(event, entity) {
return event.addEntityModifier(entity).matchAttackerCustom((attacker) => attacker.uuid.toString() != DRYGMY_UUID);
}

function generatePentacleEntry(ritual_name, x_placement, y_placement, parents) {
let entry = {
name: ritual_name,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// https://docs.almostreliable.com/lootjs/
LootJS.lootTables((event) => {
event.getLootTable('minecraft:entities/ender_dragon').createPool((pool) => {
pool.addEntry(LootEntry.of('minecraft:dragon_egg').setCount(1));
});
});

LootJS.modifiers((event) => {
onlyDrygmy(event, 'minecraft:ender_dragon').addLoot('minecraft:dragon_head');
onlyDrygmy(event, 'minecraft:ender_dragon').setCount([1, 8]).addLoot('minecraft:dragon_breath');
notDrygmy(event, 'minecraft:ender_dragon').addLoot('minecraft:dragon_egg');

onlyDrygmy(event, 'minecraft:ender_dragon').randomChance(0.25).addLoot('minecraft:dragon_head');
onlyDrygmy(event, 'minecraft:ender_dragon').randomChance(0.25).addLoot('minecraft:dragon_egg');
onlyDrygmy(event, 'minecraft:ender_dragon').randomChance(0.5).setCount([1, 8]).addLoot('minecraft:dragon_breath');
});
18 changes: 18 additions & 0 deletions kubejs/server_scripts/recipes/theurgy/calcination.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:theurgy/calcination/';
const recipes = [];

event.forEachRecipe({ type: 'theurgy:calcination' }, (r) => {
let recipe = JSON.parse(r.json);
let recipe_id = r.getId();

recipe.time = 20;
recipe.id = recipe_id;
recipes.push(recipe);
});

recipes.forEach((recipe) => {
recipe.type = 'theurgy:calcination';
event.custom(recipe).id(recipe.id);
});
});
18 changes: 18 additions & 0 deletions kubejs/server_scripts/recipes/theurgy/distillation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ServerEvents.recipes((event) => {
const id_prefix = 'enigmatica:theurgy/distillation/';
const recipes = [];

event.forEachRecipe({ type: 'theurgy:distillation' }, (r) => {
let recipe = JSON.parse(r.json);
let recipe_id = r.getId();

recipe.time = 20;
recipe.id = recipe_id;
recipes.push(recipe);
});

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

0 comments on commit 0aa33f4

Please sign in to comment.