Compare commits

...

12 Commits

  1. 61
      config/multimine.cfg
  2. 2
      config/quark-common.toml
  3. 2
      config/reliquary-common.toml
  4. 1
      defaultconfigs/carryon-server.toml
  5. 2
      docs/MODS.md
  6. 227
      kubejs/data/adorn/advancements/everything.json
  7. 0
      kubejs/server_scripts/loot_tables/creeper_overhaul.js
  8. 0
      kubejs/server_scripts/recipes/create/crushing_dust.js
  9. 6
      kubejs/server_scripts/recipes/create/mixing_treated_wood.js
  10. 4
      kubejs/server_scripts/recipes/storage_drawers.js
  11. 45
      kubejs/server_scripts/unification/plates.js
  12. 23
      kubejs/server_scripts/unification/storage_blocks.js
  13. 11
      kubejs/startup_scripts/unification/brass.js
  14. 12
      kubejs/startup_scripts/unification/bronze.js
  15. 12
      kubejs/startup_scripts/unification/enderium.js
  16. 2
      kubejs/startup_scripts/unification/gold.js
  17. 12
      kubejs/startup_scripts/unification/invar.js
  18. 12
      kubejs/startup_scripts/unification/lumium.js
  19. 12
      kubejs/startup_scripts/unification/rose_gold.js
  20. 12
      kubejs/startup_scripts/unification/signalum.js
  21. 19
      kubejs/startup_scripts/unification/uranium.js
  22. 13
      mods/chicken-drop-feathers.pw.toml

@ -0,0 +1,61 @@
{
"blockRegenerationEnabled": true,
"initialBlockRegenDelayMillis": 5000,
"blockRegenIntervalMillis": 1000,
"debugMode": false,
"bannedBlocks": {
"minecraft:note_block": true,
"storagedrawers:oak_full_drawers_1": true,
"storagedrawers:oak_full_drawers_2": true,
"storagedrawers:oak_full_drawers_4": true,
"storagedrawers:oak_half_drawers_1": true,
"storagedrawers:oak_half_drawers_2": true,
"storagedrawers:oak_half_drawers_4": true,
"storagedrawers:spruce_full_drawers_1": true,
"storagedrawers:spruce_full_drawers_2": true,
"storagedrawers:spruce_full_drawers_4": true,
"storagedrawers:spruce_half_drawers_1": true,
"storagedrawers:spruce_half_drawers_2": true,
"storagedrawers:spruce_half_drawers_4": true,
"storagedrawers:birch_full_drawers_1": true,
"storagedrawers:birch_full_drawers_2": true,
"storagedrawers:birch_full_drawers_4": true,
"storagedrawers:birch_half_drawers_1": true,
"storagedrawers:birch_half_drawers_2": true,
"storagedrawers:birch_half_drawers_4": true,
"storagedrawers:jungle_full_drawers_1": true,
"storagedrawers:jungle_full_drawers_2": true,
"storagedrawers:jungle_full_drawers_4": true,
"storagedrawers:jungle_half_drawers_1": true,
"storagedrawers:jungle_half_drawers_2": true,
"storagedrawers:jungle_half_drawers_4": true,
"storagedrawers:acacia_full_drawers_1": true,
"storagedrawers:acacia_full_drawers_2": true,
"storagedrawers:acacia_full_drawers_4": true,
"storagedrawers:acacia_half_drawers_1": true,
"storagedrawers:acacia_half_drawers_2": true,
"storagedrawers:acacia_half_drawers_4": true,
"storagedrawers:dark_oak_full_drawers_1": true,
"storagedrawers:dark_oak_full_drawers_2": true,
"storagedrawers:dark_oak_full_drawers_4": true,
"storagedrawers:dark_oak_half_drawers_1": true,
"storagedrawers:dark_oak_half_drawers_2": true,
"storagedrawers:dark_oak_half_drawers_4": true,
"storagedrawers:crimson_full_drawers_1": true,
"storagedrawers:crimson_full_drawers_2": true,
"storagedrawers:crimson_full_drawers_4": true,
"storagedrawers:crimson_half_drawers_1": true,
"storagedrawers:crimson_half_drawers_2": true,
"storagedrawers:crimson_half_drawers_4": true,
"storagedrawers:warped_full_drawers_1": true,
"storagedrawers:warped_full_drawers_2": true,
"storagedrawers:warped_full_drawers_4": true,
"storagedrawers:warped_half_drawers_1": true,
"storagedrawers:warped_half_drawers_2": true,
"storagedrawers:warped_half_drawers_4": true,
"storagedrawers:compacting_drawers_3": true
},
"bannedItems": {
},
"disableForAllTileEntities": false
}

@ -1743,7 +1743,7 @@
#Set this to true to allow the backpacks to be unequipped even with items in them #Set this to true to allow the backpacks to be unequipped even with items in them
"Super Op Mode" = false "Super Op Mode" = false
"Enable Ravager Hide" = false "Enable Ravager Hide" = false
"Items In Backpack Tick" = true "Items In Backpack Tick" = false
"Base Ravager Hide Drop" = 1 "Base Ravager Hide Drop" = 1
"Extra Chance Per Looting" = 0.5 "Extra Chance Per Looting" = 0.5

@ -389,7 +389,7 @@ mobDropsEnabled = true
#Whether entities get angry at player if stealing fails #Whether entities get angry at player if stealing fails
angerOnStealFailure = true angerOnStealFailure = true
#Allows switching stealing from player on and off #Allows switching stealing from player on and off
stealFromPlayers = true stealFromPlayers = false
#Seeker Shot settings #Seeker Shot settings
[items.seekerShot] [items.seekerShot]

@ -64,6 +64,7 @@
"create:*", "create:*",
"supplementaries:book_pile", "supplementaries:book_pile",
"supplementaries:book_pile_horizontal", "supplementaries:book_pile_horizontal",
"untamedwilds:trap_cage",
] ]
#Entities that cannot be picked up #Entities that cannot be picked up
forbiddenEntities = [ forbiddenEntities = [

@ -142,6 +142,7 @@
### Mobs ### Mobs
- ![](icon/cf.png) [Alex's Mobs] - Adds lots of mobs, both real and fictional - ![](icon/cf.png) [Alex's Mobs] - Adds lots of mobs, both real and fictional
- ![](icon/mr.png) [Chicken Drop Feathers] - Adult chickens drop feathers from time to time
- ![](icon/cf.png) [Creeper Overhaul] - Unique creepers for different biomes - ![](icon/cf.png) [Creeper Overhaul] - Unique creepers for different biomes
- ![](icon/cf.png) [Domestication Innovation] - Pet related items and enchantments - ![](icon/cf.png) [Domestication Innovation] - Pet related items and enchantments
- ![](icon/cf.png) [Guard Villagers] - Villages have guards and other defense improving changes - ![](icon/cf.png) [Guard Villagers] - Villages have guards and other defense improving changes
@ -151,6 +152,7 @@
- ![](icon/cf.png) [Villager Names] - Gives villagers random names - ![](icon/cf.png) [Villager Names] - Gives villagers random names
[Alex's Mobs]: https://www.curseforge.com/minecraft/mc-mods/alexs-mobs [Alex's Mobs]: https://www.curseforge.com/minecraft/mc-mods/alexs-mobs
[Chicken Drop Feathers]: https://modrinth.com/mod/chicken-drop-feathers
[Creeper Overhaul]: https://www.curseforge.com/minecraft/mc-mods/creeper-overhaul [Creeper Overhaul]: https://www.curseforge.com/minecraft/mc-mods/creeper-overhaul
[Domestication Innovation]: https://www.curseforge.com/minecraft/mc-mods/domestication-innovation [Domestication Innovation]: https://www.curseforge.com/minecraft/mc-mods/domestication-innovation
[Guard Villagers]: https://www.curseforge.com/minecraft/mc-mods/guard-villagers [Guard Villagers]: https://www.curseforge.com/minecraft/mc-mods/guard-villagers

@ -0,0 +1,227 @@
{
"display": {
"icon": {
"item": "adorn:guide_book"
},
"title": {
"translate": "advancements.adorn.everything.title"
},
"description": {
"translate": "advancements.adorn.everything.description"
},
"frame": "challenge"
},
"parent": "adorn:root",
"criteria": {
"has_bench": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:benches"
}
]
}
},
"has_chain_link_fence": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": ["adorn:chain_link_fence"]
}
]
}
},
"has_chair": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:chairs"
}
]
}
},
"has_chimney": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{ "tag": "adorn:regular_chimneys" }
]
}
},
"has_crate": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:crates"
}
]
}
},
"has_coffee_table": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{ "tag": "adorn:coffee_tables" }
]
}
},
"has_drawer": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:drawers"
}
]
}
},
"has_kitchen_counter": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:kitchen_counters"
}
]
}
},
"has_kitchen_cupboard": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:kitchen_cupboards"
}
]
}
},
"has_kitchen_sink": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:kitchen_sinks"
}
]
}
},
"has_picket_fence": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": ["adorn:picket_fence"]
}
]
}
},
"has_platform": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:platforms"
}
]
}
},
"has_post": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:posts"
}
]
}
},
"has_prismarine_chimney": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{ "tag": "adorn:prismarine_chimneys" }
]
}
},
"has_shelf": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:shelves"
}
]
}
},
"has_sofa": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:sofas"
}
]
}
},
"has_step": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "adorn:steps"
}
]
}
},
"has_stone_ladder": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": ["adorn:stone_ladder"]
}
]
}
},
"has_stone_torch": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": ["adorn:stone_torch"]
}
]
}
},
"has_table": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{ "tag": "adorn:tables" }
]
}
},
"has_table_lamp": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{ "tag": "adorn:table_lamps" }
]
}
},
"has_trading_station": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": ["adorn:trading_station"]
}
]
}
}
}
}

@ -0,0 +1,6 @@
// priority: 0
onEvent("recipes", event => {
event.recipes.createMixing("immersiveengineering:treated_wood_horizontal",
[ "#minecraft:planks", Fluid.of("immersiveengineering:creosote", 125) ]);
});

@ -85,6 +85,6 @@ onEvent("recipes", event => {
R: "minecraft:redstone", R: "minecraft:redstone",
}); });
event.smithing("storagedrawers:controller" , "storagedrawers:controller_slave", "minecraft:piston"); event.smithing("storagedrawers:controller" , "storagedrawers:controller_slave", "create:electron_tube");
event.smithing("storagedrawers:compacting_drawers_3", "storagedrawers:controller_slave", "create:electron_tube"); event.smithing("storagedrawers:compacting_drawers_3", "storagedrawers:controller_slave", "minecraft:piston");
}); });

@ -0,0 +1,45 @@
// priority: 0
onEvent("recipes", event => {
const toHammer = [
// Vanilla
"netherite",
// Create
"brass",
// Thermal Integration
"rose_gold",
// Thermal Foundation
"tin", "bronze", "invar",
"signalum", "lumium", "enderium",
];
const toMetalPress = [ "netherite", "signalum", "lumium", "enderium", ];
const toMultiservoPress = [ "brass", "gold" ];
const toMechanicalPress = [
// Vanilla
"netherite",
// Immersive Engineering
"aluminum", "uranium", "steel",
// Thermal Integration
"rose_gold",
// Thermal Foundation
"tin", "lead", "silver", "nickel",
"bronze", "electrum", "invar", "constantan",
"signalum", "lumium", "enderium",
];
function get(material, shape) { return global.unification[material][shape][0]; }
for (let material of toHammer)
event.shapeless(get(material, "plate"),
[ get(material, "ingot"), "immersiveengineering:hammer" ]);
for (let material of toMetalPress)
event.recipes.immersiveengineeringMetalPress(get(material, "plate"),
get(material, "ingot"), "immersiveengineering:mold_plate");
for (let material of toMultiservoPress)
event.recipes.thermal.press(get(material, "plate"), get(material, "ingot"));
for (let material of toMechanicalPress)
event.recipes.createPressing(get(material, "plate"), get(material, "ingot"));
});

@ -1,16 +1,21 @@
// priority: 0 // priority: 0
onEvent("recipes", event => { onEvent("recipes", event => {
event.remove({ output: "thermal:apple_block" }); function removeInputAndOutput(item) {
event.remove({ output: "thermal:carrot_block" }); event.remove({ input: item });
event.remove({ output: "thermal:potato_block" }); event.remove({ output: item });
event.remove({ output: "thermal:beetroot_block" }); }
event.remove({ output: "thermal:gunpowder_block" });
event.remove({ output: "quark:carrot_crate" }); removeInputAndOutput("thermal:apple_block");
event.remove({ output: "quark:potato_crate" }); removeInputAndOutput("thermal:carrot_block");
event.remove({ output: "quark:beetroot_crate" }); removeInputAndOutput("thermal:potato_block");
event.remove({ output: "quark:sugar_cane_block" }); removeInputAndOutput("thermal:beetroot_block");
removeInputAndOutput("thermal:gunpowder_block");
removeInputAndOutput("quark:carrot_crate");
removeInputAndOutput("quark:potato_crate");
removeInputAndOutput("quark:beetroot_crate");
removeInputAndOutput("quark:sugar_cane_block");
event.remove({ output: "quark:bamboo_block" }); event.remove({ output: "quark:bamboo_block" });
event.shaped("quark:bamboo_block", [ "BB", "BB" ], { B: "minecraft:bamboo" }); event.shaped("quark:bamboo_block", [ "BB", "BB" ], { B: "minecraft:bamboo" });

@ -0,0 +1,11 @@
// priority: 200
global.unification = global.unification || { };
global.unification.brass = {
nugget: [ "create:brass_nugget" ],
ingot: [ "create:brass_ingot" ],
block: [ "create:brass_block" ],
plate: [ "create:brass_sheet" ],
fluid: [ "tconstruct:molten_brass" ],
};

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.bronze = {
nugget: [ "thermal:bronze_nugget" ],
ingot: [ "thermal:bronze_ingot" ],
block: [ "thermal:bronze_block" ],
dust: [ "thermal:bronze_dust" ],
plate: [ "thermal:bronze_plate" ],
fluid: [ "tconstruct:molten_bronze" ],
};

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.enderium = {
nugget: [ "thermal:enderium_nugget" ],
ingot: [ "thermal:enderium_ingot" ],
block: [ "thermal:enderium_block" ],
dust: [ "thermal:enderium_dust" ],
plate: [ "thermal:enderium_plate" ],
fluid: [ "tconstruct:molten_enderium" ],
};

@ -14,6 +14,6 @@ global.unification.gold = {
crushed: [ "create:crushed_gold_ore" ], crushed: [ "create:crushed_gold_ore" ],
dust: [ "thermal:gold_dust", "immersiveengineering:dust_gold" ], dust: [ "thermal:gold_dust", "immersiveengineering:dust_gold" ],
plate: [ "create:gold_sheet", "thermal:gold_plate", "immersiveengineering:plate_gold" ], plate: [ "create:golden_sheet", "thermal:gold_plate", "immersiveengineering:plate_gold" ],
fluid: [ "tconstruct:molten_gold" ], fluid: [ "tconstruct:molten_gold" ],
}; };

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.invar = {
nugget: [ "thermal:invar_nugget" ],
ingot: [ "thermal:invar_ingot" ],
block: [ "thermal:invar_block" ],
dust: [ "thermal:invar_dust" ],
plate: [ "thermal:invar_plate" ],
fluid: [ "tconstruct:molten_invar" ],
};

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.lumium = {
nugget: [ "thermal:lumium_nugget" ],
ingot: [ "thermal:lumium_ingot" ],
block: [ "thermal:lumium_block" ],
dust: [ "thermal:lumium_dust" ],
plate: [ "thermal:lumium_plate" ],
fluid: [ "tconstruct:molten_lumium" ],
};

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.rose_gold = {
nugget: [ "thermal:rose_gold_nugget", "tconstruct:rose_gold_nugget" ],
ingot: [ "thermal:rose_gold_ingot", "tconstruct:rose_gold_ingot" ],
block: [ "thermal:rose_gold_block", "tconstruct:rose_gold_block" ],
dust: [ "thermal:rose_gold_dust" ],
plate: [ "thermal:rose_gold_plate" ],
fluid: [ "tconstruct:molten_rose_gold" ],
};

@ -0,0 +1,12 @@
// priority: 200
global.unification = global.unification || { };
global.unification.signalum = {
nugget: [ "thermal:signalum_nugget" ],
ingot: [ "thermal:signalum_ingot" ],
block: [ "thermal:signalum_block" ],
dust: [ "thermal:signalum_dust" ],
plate: [ "thermal:signalum_plate" ],
fluid: [ "tconstruct:molten_signalum" ],
};

@ -0,0 +1,19 @@
// priority: 200
global.unification = global.unification || { };
global.unification.uranium = {
nugget: [ "immersiveengineering:nugget_uranium" ],
ingot: [ "immersiveengineering:ingot_uranium" ],
block: [ "immersiveengineering:storage_uranium" ],
ore: [ "immersiveengineering:ore_uranium" ],
deep_ore: [ "immersiveengineering:deepslate_ore_uranium" ],
raw: [ "immersiveengineering:raw_uranium" ],
raw_block: [ "immersiveengineering:raw_block_uranium" ],
crushed: [ "create:crushed_uranium_ore" ],
dust: [ "immersiveengineering:dust_uranium" ],
plate: [ "immersiveengineering:plate_uranium" ],
fluid: [ "tconstruct:molten_uranium" ],
};

@ -0,0 +1,13 @@
name = "Chicken Drop Feathers"
filename = "ChickenDropFeathers-1.0-fabric-0.46.2+1.18.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/cmvYMLYd/versions/1.18/ChickenDropFeathers-1.0-fabric-0.46.2+1.18.jar"
hash-format = "sha1"
hash = "f2265f40cb281461cf4903c62446c74d19d75427"
[update]
[update.modrinth]
mod-id = "cmvYMLYd"
version = "FjxOiAaG"
Loading…
Cancel
Save