Merge remote-tracking branch 'original/master'

This commit is contained in:
LordMZTE 2020-08-21 23:48:36 +02:00
commit eb6e9e9996
6 changed files with 18 additions and 15 deletions

View file

@ -4,7 +4,7 @@ item.contenttweaker.cluster_aether.name=Aether Cluster
item.contenttweaker.cluster_erebus.name=Erebus Cluster
item.contenttweaker.cluster_advent.name=Advent of Ascension Cluster
item.contenttweaker.cluster_mob.name=Mob Cluster
item.contenttweaker.cluster_boss.name=Boss Cluster
item.contenttweaker.cluster_overworld.name=Overworld Cluster
item.contenttweaker.cluster_midnight.name=Midnight Cluster
item.contenttweaker.cluster_twilight.name=Twilight Forest Cluster
item.contenttweaker.cluster_between.name=Betweenlands Cluster

View file

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "contenttweaker:items/cluster_boss"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "contenttweaker:items/cluster_overworld"
}
}

View file

@ -116,10 +116,11 @@ mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "thebetweenla
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "dimdoors:mob_monolith"}));
mob.build();
var boss = mods.modularmachinery.RecipeBuilder.newBuilder("boss", "dimextractor", 60);
boss.addItemOutput(<contenttweaker:cluster_boss>);
boss.addItemInput(<dimdoors:world_thread> * 5);
boss.addItemInput(<botania:manaresource:5>);
boss.addItemInput(<iceandfire:hydra_heart>);
boss.addItemInput(<iceandfire:gorgon_head>);
boss.build();
var overworld = mods.modularmachinery.RecipeBuilder.newBuilder("overworld", "dimextractor", 60);
overworld.addItemOutput(<contenttweaker:cluster_overworld>);
overworld.addItemInput(<dimdoors:world_thread> * 5);
overworld.addItemInput(<botania:manaresource:5>);
overworld.addItemInput(<iceandfire:hydra_heart>);
overworld.addItemInput(<iceandfire:gorgon_head>);
overworld.addDimensionRequirement([0]);
overworld.build();

View file

@ -59,7 +59,7 @@ mobCluster.maxStackSize = 1;
mobCluster.rarity = "rare";
mobCluster.register();
var bossCluster = VanillaFactory.createItem("cluster_boss");
var bossCluster = VanillaFactory.createItem("cluster_overworld");
bossCluster.maxStackSize = 1;
bossCluster.rarity = "rare";
bossCluster.register();

View file

@ -101,3 +101,5 @@ mods.extendedcrafting.EnderCrafting.addShaped(<ageofminecraft:heromaker>, [
recipes.addShaped(<minecraft:barrier>, [[null, <avaritia:resource:6>, null],[null, <minecraft:glass>, null], [null, <avaritia:resource:6>, null]]);
recipes.addShaped(<projecte:item.pe_tome>, [[null, <avaritia:resource:6>, null],[<projecte:item.pe_klein_star:5>, <minecraft:book>, <projecte:item.pe_klein_star:5>], [null, <avaritia:resource:6>, null]]);
recipes.addShaped(<deepmoblearning:machine_casing>, [[<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>],[<deepmoblearning:soot_covered_plate>, <enderio:item_material:53>, <deepmoblearning:soot_covered_plate>], [<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>]]);
mods.projecte.WorldTransmutation.add(<extendedcrafting:storage:2>, <nyx:star_block>);
mods.extrautils2.Resonator.add(<minecraft:ender_pearl> * 4, <nyx:fallen_star>, 5000);