Merge remote-tracking branch 'original/master'

This commit is contained in:
LordMZTE 2020-08-19 16:45:34 +02:00
commit 406e80aac7
3 changed files with 140 additions and 41 deletions

View file

@ -16,6 +16,51 @@
}
],
"relations": [
{
"id": "chiselandbits",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:231095:2720655",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"server",
"included"
]
},
{
"id": "chisel",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:235279:2915375",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"server",
"included"
]
},
{
"id": "bhc",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:282947:2682612",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"server",
"included"
]
},
{
"id": "ftbguides",
"file": {
@ -1546,21 +1591,6 @@
"included"
]
},
{
"id": "233040",
"file": {
"installer": "internal.dir:mods",
"artifact": "curse.maven:233040:2477850",
"repository": "curse"
},
"type": "mod",
"options": [
"required",
"client",
"server",
"included"
]
},
{
"id": "349214",
"file": {

View file

@ -250,7 +250,7 @@ hardcore {
B:ExplosiveRecipes=true
# Gives Armor weight values that effect movement. Changes Entity armor spawning: Zombies only spawn with Iron armor, Skeletons never wear armor.
B:HCArmor=true
B:HCArmor=false
# Change baby zombies to be a more reasonable addition; Slightly slower and do less damage than adults
B:HCBabyZombies=true
@ -268,7 +268,7 @@ hardcore {
B:HCBonemeal=false
# Modifies and rebalances vanilla brewing recipes and makes potions stack up to 8.
B:HCBrewing=true
B:HCBrewing=false
# Makes it so water buckets cannot move an entire source block, making water a more valuable resource
B:HCBuckets=false
@ -280,22 +280,22 @@ hardcore {
B:HCChickens=true
# Makes stone variants drop into cobblestone.
B:HCCobblestone=true
B:HCCobblestone=false
# Changes the recipes for baked goods to require the Kiln and changes soups to require the Cauldron.
B:HCCooking=true
B:HCCooking=false
# Disables the vanilla Anvil
B:HCDeadweight=false
# Makes it so diamonds have to be made into an ingot alloy to be used in certain recipes
B:HCDiamond=true
B:HCDiamond=false
# Adds Arcane Scroll drops to specific mobs, used for enchanting with the Infernal Enchanter
B:HCEnchanting=false
# Makes Endermen agro in groups and make a thunder noise when they teleport
B:HCEndermen=true
B:HCEndermen=false
# Disable knockback when no weapon is used
B:HCFighting=true
@ -304,20 +304,29 @@ hardcore {
B:HCFishing=true
# Overrides the vanilla furnace to allow for some changes: Allows varying item cook times, changes fuel values and a tweak to make the furnace visually show whether it has content
B:HCFurnace=true
B:HCFurnace=false
# Be afraid of the dark...
B:HCGloom=false
# Makes a raw resource drop that must be crafted to make useful gunpowder
B:HCGunpowder=true
B:HCGunpowder=false
# Makes certain block hardness more "realistic"
B:HCHardness=true
B:HCHardness=false
# Completely disable the abilities of the vanilla Hopper to transfer items, as to make BWM tech the primary form of item transport
B:HCHopper=false
# This Feature REQUIRES AppleCore!!!.
# Completely revamps the hunger system of Minecraft.
# The Saturation value is replaced with Fat.
# Fat will accumulate if too much food is consumed then need to fill the bar.
# Fat will only be burned once the entire hunger bar is emptied
# The more fat the slower you will walk.
# Food Items values are also changed, while a ton of new foods are add.
B:HCHunger=true
# Makes it so Mobs hunt other animals too. Zombies attack herd animals, Spiders eat Chickens, Wolves will eat anything
B:HCHunting=true
@ -352,22 +361,22 @@ hardcore {
B:HCOres=false
# Makes soils drop 75% of their content if not broken with a shovel to incentivize the use of shovels
B:HCPiles=true
B:HCPiles=false
# Changes the recipes for Redstone devices to be more complex
B:HCRedstone=true
# Change saplings to grow in stages before becoming a tree
B:HCSapling=true
B:HCSapling=false
# Makes the Saw required to get complex wooden blocks, including Fences, Doors, Etc.
B:HCSaw=true
B:HCSaw=false
# Requires Tilling the ground with a hoe to get seeds.
B:HCSeeds=false
# Sheep can mutate, shearing them resets their wool color to their natural color, breeding them can produce all colors
B:HCSheep=true
B:HCSheep=false
# Makes it so death is an actual issue as you will spawn randomly within a 2000 block radius of your original spawn. Compasses still point to original spawn.
B:HCSpawn=false
@ -442,6 +451,9 @@ hardcore {
S:"Strata Configs" <
0=42,21
>
S:"Strata Stones" <
minecraft:stone:*
>
}
hctools {
@ -538,7 +550,6 @@ hardcore {
}
hcstructures {
# Enables custom recipes provided by this feature
B:"Custom Recipes"=true
# Disable Recipes for blocks that generate only in structures, including Enchanting Tables and Brewing Stands
@ -549,7 +560,6 @@ hardcore {
}
hcdiamond {
# Enables custom recipes provided by this feature
B:"Custom Recipes"=true
}
@ -558,13 +568,22 @@ hardcore {
B:"Shield Rebalance"=false
penalties {
# Set this to true to allow more granular configs to generate and make the penalties work as you please. Requires the game to be started to generate more configs.
B:Customized=false
}
}
hcfishing {
S:Bait <
minecraft:spider_eye
betterwithmods:creeper_oyster
minecraft:fish:2
minecraft:fish:3
betterwithmods:bat_wing
betterwithmods:cooked_bat_wing
minecraft:rotten_flesh
>
# Starting time for which fishing events are calculated in minutes
D:"Base Time"=1.0
@ -636,8 +655,6 @@ hardcore {
blood
purpleslime
>
# Blacklist itemstacks from being effected by HCBuckets
S:"Fluid container blacklist" <
thermalcultivation:watering_can
>
@ -702,8 +719,6 @@ hardcore {
# Default number of ticks for an item to smelt in the furnace (vanilla is 200)
I:"Default Furnace Timing"=200
# Overrides the fuel time for inputted items or oredict, see Furnace Timing for entry format
S:"Furnace Fuel Timing Overrides" <
minecraft:boat=750
minecraft:log:0=1600
@ -721,8 +736,6 @@ hardcore {
minecraft:planks:5=300
minecart:sapling=25
>
# example recipes minecraft:iron_ore=1000 or ore:oreIron=1000
S:"Furnace Timing Recipes" <
ore:oreIron=1600
ore:oreGold=1600
@ -735,11 +748,20 @@ hardcore {
}
hcboating {
S:"Boat List" <
minecraft:boat
>
# Make boat recipe require a wooden shovel for the oars
B:"Boat Requires Oar"=true
# Enables custom recipes provided by this feature
B:"Custom Recipes"=true
I:"Default Speed modifier"=50
S:"Speed Items" <
betterwithmods:material:11=100
minecraft:banner:*=100
>
}
hcpiles {
@ -859,7 +881,6 @@ hardcore {
>
penalties {
# Set this to true to allow more granular configs to generate and make the penalties work as you please. Requires the game to be started to generate more configs.
B:Customized=false
}
@ -868,7 +889,6 @@ hardcore {
hcinjury {
penalties {
# Set this to true to allow more granular configs to generate and make the penalties work as you please. Requires the game to be started to generate more configs.
B:Customized=false
}
@ -883,6 +903,46 @@ hardcore {
B:"Override Equipment for minecraft:zombie_villager"=true
}
hchunger {
# Set Exhaustion from breaking a block
D:"Block Breaking Exhaustion"=0.1
# Override Mushrooms to be edible, be careful with the red one ;)
B:"Edible Mushrooms"=true
# Override Pumpkin Seeds to be edible
B:"Edible Pumpkin Seeds"=true
# Allow modifying food values with hchunger, format with each value after the ; being optional, item=hunger;fat;alwaysEdible
S:"Food hunger overrides" <
>
# Passive Exhaustion value
D:"Passive Exhaustion"=3.0
# Passive exhaustion tick time
I:"Passive Exhaustion Tick"=900
penalties {
hunger {
# Set this to true to allow more granular configs to generate and make the penalties work as you please. Requires the game to be started to generate more configs.
B:Customized=false
}
}
hungerpenalties {
fat {
# Set this to true to allow more granular configs to generate and make the penalties work as you please. Requires the game to be started to generate more configs.
B:Customized=false
}
}
}
}

View file

@ -105,12 +105,21 @@ advent.build();
var mob = mods.modularmachinery.RecipeBuilder.newBuilder("mob", "dimextractor", 60);
mob.addItemOutput(<contenttweaker:cluster_mob>);
mob.addItemInput(<dimdoors:world_thread> * 5);
//TODO Add items
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:creeper"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:blaze"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:enderman"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "morecreeps:lawyer_from_hell"})); //To be replaced with "Jens Faymann"
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "erebus:erebus.wasp"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "midnight:nova"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "iceandfire:myrmex_royal"}));
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "thebetweenlands:dark_druid"}));
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>);
//TODO Add items
boss.addItemInput(<iceandfire:hydra_heart>);
boss.addItemInput(<iceandfire:gorgon_head>);
boss.build();