Compare commits

...

6 Commits

8 changed files with 36 additions and 39 deletions

View File

@@ -120,8 +120,6 @@ bosses {
# Valid rules are visible here https://github.com/Shadows-of-Fire/Apotheosis/blob/1.19/src/main/java/shadows/apotheosis/adventure/boss/BossEvents.java#L174C27-L174C27
# Default: [minecraft:overworld|0.018|NEEDS_SKY], [minecraft:the_nether|0.025|ANY], [minecraft:the_end|0.018|SURFACE_OUTER_END], [twilightforest:twilight_forest|0.05|NEEDS_SURFACE]
S:"Boss Spawn Dimensions" <
minecraft:overworld|0.018|NEEDS_SKY
minecraft:the_nether|0.025|ANY
minecraft:the_end|0.018|SURFACE_OUTER_END
twilightforest:twilight_forest|0.05|NEEDS_SURFACE
>

View File

@@ -18,7 +18,7 @@ hash = "8c51d8df836f7175aa64f92141df3e3a3113f080511420b4ae34ad0acb8d3c21"
[[files]]
file = "config/apotheosis/adventure.cfg"
hash = "85cf60f2c53f2f8fa56fe7025b61791e853e12ad1cb796670240cf7e1c6211d9"
hash = "448992019164aad00ec58a3f72f83acb5be39e0e62cc4ee9403121601a174203"
[[files]]
file = "config/apotheosis/apotheosis.cfg"
@@ -595,7 +595,7 @@ hash = "815fc6329edd3a9445c7b6be55ecc83f1d4b98de5474d84a5316bc915dde8a46"
[[files]]
file = "kubejs/server_scripts/mods/arsnoveau.js"
hash = "f25c7a0fd694135d3de66db51519c14377f96a836dbd59081a9f22860fb1878d"
hash = "c0f4eefc4fac51cfb1bfa3a72b405e2386337160dbd056880de13717c6e4621f"
[[files]]
file = "kubejs/server_scripts/mods/bakery.js"
@@ -627,7 +627,7 @@ hash = "4717847a6d54f56ed6919a1e2c3591fc73780973708e818a563753132bc7c15e"
[[files]]
file = "kubejs/server_scripts/mods/create.js"
hash = "ca595f7141708157fe469666f5f2309bfcbda3d9c4e052abd55ae256726a0d0a"
hash = "b885c3ddf38f6bbac8279af47f6c7d4769822ac88fcd0e644272972c7762a90a"
[[files]]
file = "kubejs/server_scripts/mods/create_jetpack.js"
@@ -743,7 +743,7 @@ hash = "bace606c88cff3079285ad8932eeebccdcea1e73dab04168591a888ee5c5278b"
[[files]]
file = "kubejs/server_scripts/mods/vinery.js"
hash = "b24325803c78a586a2516a593456c43156b4e7b5d63a9388a3d7476fe06f5417"
hash = "51dc00f0cbdb2959f1eddf66e8c54fe0f51565689ad492050a875ef80823f8a4"
[[files]]
file = "kubejs/server_scripts/mods/waystones.js"
@@ -779,7 +779,7 @@ hash = "d851746c6e7ae1c679f576b984662289c10e4195c0f52b459fd1ce3a83666ed4"
[[files]]
file = "kubejs/startup_scripts/init.js"
hash = "80483290133f2ab1a969008335c29758884b20e4611ffbfb4e4253f3207ef74a"
hash = "ef0e9d5bfb86dd216696b99254bc626e4f8001a4bb6cd34fc302613f86cd3d65"
[[files]]
file = "kubejs/startup_scripts/progression-items.js"
@@ -904,11 +904,6 @@ file = "mods/ato.pw.toml"
hash = "d64d02d240575e58a4b2ee8794a60f67f053d1fd675dfbd280b2bb8c3438fb93"
metafile = true
[[files]]
file = "mods/attract-to-sound.pw.toml"
hash = "8701257b0340cf7ef4f623f3f691e267b959e5ba200e72988ba4dd12658c9fbc"
metafile = true
[[files]]
file = "mods/balm.pw.toml"
hash = "e02edad65b21bdaa914dce1237d99e4a4d2d80e497e817e0cd77be87043c80be"

View File

@@ -1,4 +1,13 @@
ServerEvents.recipes(event => {
global.replaceInputs(
event,
{id: 'ars_nouveau:enchanting_apparatus'},
[
['minecraft:diamond', 'kubejs:grist_intelligent_basic_block'],
['minecraft:gold_nugget', '#kubejs:grist/primordeal/basic']
]
);
event.replaceInput(
{id: 'ars_nouveau:enchanting_apparatus'},
'minecraft:diamond',

View File

@@ -122,4 +122,6 @@ ServerEvents.recipes(event => {
event.recipes.create.mixing(`minecraft:${color}_wool`, [`minecraft:${color}_dye`, '#minecraft:wool']);
event.recipes.create.mixing(`minecraft:${color}_stained_glass`, [`minecraft:${color}_dye`, '8x #forge:glass/colorless']).heated();
});
// FIXME: create electrical wires are impossible to craft beyond copper
});

View File

@@ -21,7 +21,7 @@ ServerEvents.recipes(event => {
event.recipes.create.mixing('candlelight:tomato_soup', [
'#forge:tomato_sauces',
'minecraft:sugar',
'#candellight:all_effects'
'#candlelight:all_effects'
]).heated();
event.recipes.create.mixing('candlelight:tomato_soup', [
Fluid.of('create_central_kitchen:tomato_sauce', 250),
@@ -34,3 +34,5 @@ ServerEvents.recipes(event => {
'candlelight:tomato_soup'
]).heated();
});
// FIXME: The gobber rings need nerfed / gated

View File

@@ -39,6 +39,10 @@ Tier.prototype.toString = function() {
function Element(name, hue) {
this.name = name;
this.hue = hue;
this.basic = new Grist(this, Grist.Tiers.basic);
this.improved = new Grist(this, Grist.Tiers.basic);
this.radiant = new Grist(this, Grist.Tiers.basic);
};
Element.prototype.displayName = function() {
@@ -59,6 +63,17 @@ function Grist(element, tier) {
Grist.Tier = Tier;
Grist.Element = Element;
// Color values are 0-1 floats
Grist.Tiers = {
basic: new Tier('basic', 0.5, 'uncommon'),
improved: new Tier('improved', 0.75, 'rare'),
radiant: new Tier('radiant', 1.0, 'epic')
};
Grist.Tiers.forEach = function(f) {
[Grist.Tiers.basic, Grist.Tiers.improved, Grist.Tiers.radiant].forEach(f);
}
// Hues are 0-255
// -1 means white, as special case
Grist.Types = {
@@ -82,17 +97,6 @@ Grist.Primitives = [
Grist.Types.universal
];
// Color values are 0-1 floats
Grist.Tiers = {
basic: new Tier('basic', 0.5, 'uncommon'),
improved: new Tier('improved', 0.75, 'rare'),
radiant: new Tier('radiant', 1.0, 'epic')
};
Grist.Tiers.forEach = function(f) {
[Grist.Tiers.basic, Grist.Tiers.improved, Grist.Tiers.radiant].forEach(f);
}
Grist.forEach = function(f) {
Grist.Tiers.forEach(tier => {
Grist.Elements.forEach(element => {

View File

@@ -1,13 +0,0 @@
name = "Attract to Sound (Forge/Fabric): Sound & Stealth."
filename = "forge_soundattract_1.20.1-3.0.1.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/zZluixcp/versions/IdivdtXt/forge_soundattract_1.20.1-3.0.1.jar"
hash-format = "sha512"
hash = "07f2cffc46258ed2ecccb7b20cd8645cbcc4631f83a7cb54f94cdf974a579ec36e574465a834e0beb84ba6fae7a13e6e3770fa705278c5373c0eaced32131c15"
[update]
[update.modrinth]
mod-id = "zZluixcp"
version = "IdivdtXt"

View File

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "1dd880f1c10551b36cebddd84aa98bb16650128750b7b1cdcf9f454cf07b1290"
hash = "7c8841d0ffacfa6f0c0490e7c295f81683253dc34c637c6b2557102c057f5a2a"
[versions]
forge = "47.4.0"